From f35be99c66165cd84e60865d5bc46bf708b29069 Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Sun, 24 May 2020 16:25:07 +0100 Subject: [PATCH 001/143] ayatana-ido: init at 0.4.90 --- .../libraries/ayatana-ido/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/development/libraries/ayatana-ido/default.nix diff --git a/pkgs/development/libraries/ayatana-ido/default.nix b/pkgs/development/libraries/ayatana-ido/default.nix new file mode 100644 index 000000000000..41e4c92e56b6 --- /dev/null +++ b/pkgs/development/libraries/ayatana-ido/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchFromGitHub +, pkgconfig, autoreconfHook +, gtk3, gobject-introspection, gtk-doc, vala +}: + +stdenv.mkDerivation rec { + pname = "ayatana-ido"; + version = "0.4.90"; + + src = fetchFromGitHub { + owner = "AyatanaIndicators"; + repo = pname; + rev = version; + sha256 = "02vqjryni96zzrpkq5d7kvgw7nf252d2fm2xq8fklvvb2vz3fa0w"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc vala ]; + + buildInputs = [ gtk3 gobject-introspection ]; + + meta = with stdenv.lib; { + description = "Ayatana Display Indicator Objects"; + homepage = "https://github.com/AyatanaIndicators/ayatana-ido"; + changelog = "https://github.com/AyatanaIndicators/ayatana-ido/blob/${version}/ChangeLog"; + license = [ licenses.gpl3 licenses.lgpl21 ]; + maintainers = [ maintainers.nickhu ]; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 553dc51b3362..8dc5b4e71e3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11261,6 +11261,8 @@ in inherit (darwin.apple_sdk.frameworks) CoreAudio AudioToolbox; }; + ayatana-ido = callPackage ../development/libraries/ayatana-ido { }; + babl = callPackage ../development/libraries/babl { }; backward-cpp = callPackage ../development/libraries/backward-cpp { }; From 628c8ddc909e19b64a52c6f6e7a84ba7680217c8 Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Sun, 24 May 2020 16:25:38 +0100 Subject: [PATCH 002/143] libayatana-indicator: init at 0.6.3 --- .../libayatana-indicator/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/development/libraries/libayatana-indicator/default.nix diff --git a/pkgs/development/libraries/libayatana-indicator/default.nix b/pkgs/development/libraries/libayatana-indicator/default.nix new file mode 100644 index 000000000000..778e06aa95ce --- /dev/null +++ b/pkgs/development/libraries/libayatana-indicator/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, lib +, pkgconfig, autoreconfHook +, gtkVersion ? "3" +, gtk2 +, gtk3 +, ayatana-ido +}: + +stdenv.mkDerivation rec { + pname = "libayatana-indicator-gtk${gtkVersion}"; + version = "0.6.3"; + + src = fetchFromGitHub { + owner = "AyatanaIndicators"; + repo = "libayatana-indicator"; + rev = version; + sha256 = "1q9wmaw6pckwyrv0s7wkqzm1yrk031pbz4xbr8cwn75ixqyfcb28"; + }; + + nativeBuildInputs = [ pkgconfig autoreconfHook ]; + + buildInputs = [ ayatana-ido ] + ++ lib.lists.optionals (gtkVersion == "2") [ gtk2 ] + ++ lib.lists.optionals (gtkVersion == "3") [ gtk3 ]; + + configureFlags = [ "--with-gtk=${gtkVersion}" ]; + + meta = with stdenv.lib; { + description = "Ayatana Indicators Shared Library"; + homepage = "https://github.com/AyatanaIndicators/libayatana-indicator"; + changelog = "https://github.com/AyatanaIndicators/libayatana-indicator/blob/${version}/ChangeLog"; + license = licenses.gpl3; + maintainers = [ maintainers.nickhu ]; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8dc5b4e71e3c..cc5d394338d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13010,6 +13010,10 @@ in libindicator-gtk3 = libindicator.override { gtkVersion = "3"; }; libindicator = callPackage ../development/libraries/libindicator { }; + libayatana-indicator-gtk2 = libayatana-indicator.override { gtkVersion = "2"; }; + libayatana-indicator-gtk3 = libayatana-indicator.override { gtkVersion = "3"; }; + libayatana-indicator = callPackage ../development/libraries/libayatana-indicator { }; + libinotify-kqueue = callPackage ../development/libraries/libinotify-kqueue { }; libiodbc = callPackage ../development/libraries/libiodbc { From 0f5317a7e0d26e39546f26693f0d83e3a82f4e71 Mon Sep 17 00:00:00 2001 From: Nick Hu Date: Sun, 24 May 2020 16:26:04 +0100 Subject: [PATCH 003/143] libayatana-appindicator: init at 0.5.4 --- .../libayatana-appindicator/default.nix | 49 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/libraries/libayatana-appindicator/default.nix diff --git a/pkgs/development/libraries/libayatana-appindicator/default.nix b/pkgs/development/libraries/libayatana-appindicator/default.nix new file mode 100644 index 000000000000..84ecbc81ca57 --- /dev/null +++ b/pkgs/development/libraries/libayatana-appindicator/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchFromGitHub, lib +, pkgconfig, autoreconfHook , gtk-doc +, gtkVersion ? "3" +, gtk2, libayatana-indicator-gtk2, libdbusmenu-gtk2 +, gtk3, libayatana-indicator-gtk3, libdbusmenu-gtk3 +, dbus-glib, python2, python2Packages +}: + +stdenv.mkDerivation rec { + pname = "libayatana-appindicator-gtk${gtkVersion}"; + version = "0.5.4"; + + src = fetchFromGitHub { + owner = "AyatanaIndicators"; + repo = "libayatana-appindicator"; + rev = version; + sha256 = "0bqjqb7gabdk7mifk8azi630qw39z978f973fx2ylgdgr4a66j1v"; + }; + + patchPhase = '' + substituteInPlace configure.ac \ + --replace "codegendir pygtk-2.0" "codegendir pygobject-2.0" + ''; + + nativeBuildInputs = [ pkgconfig autoreconfHook gtk-doc ]; + + buildInputs = [ dbus-glib python2 python2Packages.pygtk ] + ++ lib.lists.optional (gtkVersion == "2") libayatana-indicator-gtk2 + ++ lib.lists.optional (gtkVersion == "3") libayatana-indicator-gtk3; + + propagatedBuildInputs = + lib.lists.optionals (gtkVersion == "2") [ gtk2 libdbusmenu-gtk2 ] + ++ lib.lists.optionals (gtkVersion == "3") [ gtk3 libdbusmenu-gtk3 ]; + + preAutoreconf = '' + gtkdocize + ''; + + configureFlags = [ "--with-gtk=${gtkVersion}" ]; + + meta = with stdenv.lib; { + description = "Ayatana Application Indicators Shared Library"; + homepage = "https://github.com/AyatanaIndicators/libayatana-appindicator"; + changelog = "https://github.com/AyatanaIndicators/libayatana-appindicator/blob/${version}/ChangeLog"; + license = [ licenses.gpl3 licenses.lgpl21 ]; + maintainers = [ maintainers.nickhu ]; + platforms = platforms.x86_64; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cc5d394338d7..c37efb78d570 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12575,6 +12575,10 @@ in libappindicator-gtk3 = libappindicator.override { gtkVersion = "3"; }; libappindicator = callPackage ../development/libraries/libappindicator { }; + libayatana-appindicator-gtk2 = libayatana-appindicator.override { gtkVersion = "2"; }; + libayatana-appindicator-gtk3 = libayatana-appindicator.override { gtkVersion = "3"; }; + libayatana-appindicator = callPackage ../development/libraries/libayatana-appindicator { }; + libarchive = callPackage ../development/libraries/libarchive { }; libasr = callPackage ../development/libraries/libasr { }; From a9e1ff312cc1351455c3b9b4dcecedff25a6b1ba Mon Sep 17 00:00:00 2001 From: fps Date: Thu, 2 Jul 2020 07:31:19 +0200 Subject: [PATCH 004/143] a2jmidid: fix compilation on aarch64-linux --- pkgs/applications/audio/a2jmidid/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/a2jmidid/default.nix b/pkgs/applications/audio/a2jmidid/default.nix index 64468bddc852..f4a9383c29c1 100644 --- a/pkgs/applications/audio/a2jmidid/default.nix +++ b/pkgs/applications/audio/a2jmidid/default.nix @@ -9,7 +9,7 @@ in stdenv.mkDerivation { version = "8"; src = fetchurl { - url = "https://repo.or.cz/a2jmidid.git/snapshot/7383d268c4bfe85df9f10df6351677659211d1ca.tar.gz"; + url = "https://github.com/linuxaudio/a2jmidid/archive/7383d268c4bfe85df9f10df6351677659211d1ca.tar.gz"; sha256 = "06dgf5655znbvrd7fhrv8msv6zw8vk0hjqglcqkh90960mnnmwz7"; }; @@ -18,13 +18,17 @@ in stdenv.mkDerivation { patches = [ (fetchpatch { - url = "https://repo.or.cz/a2jmidid.git/patch/24e3b8e543256ae8fdfb4b75eb9fd775f07c46e2"; + url = "https://github.com/linuxaudio/a2jmidid/commit/24e3b8e543256ae8fdfb4b75eb9fd775f07c46e2.diff"; sha256 = "1nxrvnhxlgqc9wbxnp1gnpw4wjyzxvymwcg1gh2nqzmssgfykfkc"; }) (fetchpatch { - url = "https://repo.or.cz/a2jmidid.git/patch/7f82da7eb2f540a94db23331be98d42a58ddc269"; + url = "https://github.com/linuxaudio/a2jmidid/commit/7f82da7eb2f540a94db23331be98d42a58ddc269.diff"; sha256 = "1nab9zf0agbcj5pvhl90pz0cx1d204d4janqflc5ymjhy8jyrsdv"; }) + (fetchpatch { + url = "https://github.com/linuxaudio/a2jmidid/commit/c07775d021a71cb91bf64ce1391cf525415cb060.diff"; + sha256 = "172v9hri03qdqi8a3zsg227k5qxldd8v5bj4jk7fyk5jf50fcxga"; + }) ]; postInstall = '' @@ -35,6 +39,6 @@ in stdenv.mkDerivation { description = "Daemon for exposing legacy ALSA sequencer applications in JACK MIDI system"; license = licenses.gpl2; maintainers = [ maintainers.goibhniu ]; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; }; } From c9daa81eff922d9f77d136cfcff0ea05d40024e0 Mon Sep 17 00:00:00 2001 From: Finn Behrens Date: Wed, 3 Jun 2020 16:33:32 +0200 Subject: [PATCH 005/143] nixos/autoUpgrade: add flake support --- nixos/modules/tasks/auto-upgrade.nix | 98 ++++++++++++++++++++-------- 1 file changed, 69 insertions(+), 29 deletions(-) diff --git a/nixos/modules/tasks/auto-upgrade.nix b/nixos/modules/tasks/auto-upgrade.nix index e70004e643e1..69385e5f2fe0 100644 --- a/nixos/modules/tasks/auto-upgrade.nix +++ b/nixos/modules/tasks/auto-upgrade.nix @@ -2,9 +2,9 @@ with lib; -let cfg = config.system.autoUpgrade; in +let cfg = config.system.autoUpgrade; -{ +in { options = { @@ -21,6 +21,16 @@ let cfg = config.system.autoUpgrade; in ''; }; + flake = mkOption { + type = types.nullOr types.str; + default = null; + example = "github:kloenk/nix"; + description = '' + The Flake URI of the NixOS configuration to build. + Disables the option . + ''; + }; + channel = mkOption { type = types.nullOr types.str; default = null; @@ -35,10 +45,20 @@ let cfg = config.system.autoUpgrade; in flags = mkOption { type = types.listOf types.str; - default = []; - example = [ "-I" "stuff=/home/alice/nixos-stuff" "--option" "extra-binary-caches" "http://my-cache.example.org/" ]; + default = [ ]; + example = [ + "-I" + "stuff=/home/alice/nixos-stuff" + "--option" + "extra-binary-caches" + "http://my-cache.example.org/" + ]; description = '' Any additional flags passed to nixos-rebuild. + + If you are using flakes and use a local repo you can add + [ "--update-input" "nixpkgs" "--commit-lock-file" ] + to update nixpkgs. ''; }; @@ -82,11 +102,23 @@ let cfg = config.system.autoUpgrade; in config = lib.mkIf cfg.enable { - system.autoUpgrade.flags = - [ "--no-build-output" ] - ++ (if cfg.channel == null - then [ "--upgrade" ] - else [ "-I" "nixpkgs=${cfg.channel}/nixexprs.tar.xz" ]); + assertions = [{ + assertion = !((cfg.channel != null) && (cfg.flake != null)); + message = '' + The options 'system.autoUpgrade.channels' and 'system.autoUpgrade.flake' cannot both be set. + ''; + }]; + + system.autoUpgrade.flags = [ "--no-build-output" ] + ++ (if cfg.flake == null then + (if cfg.channel == null then + [ "--upgrade" ] + else [ + "-I" + "nixpkgs=${cfg.channel}/nixexprs.tar.xz" + ]) + else + [ "--flake ${cfg.flake}" ]); systemd.services.nixos-upgrade = { description = "NixOS Upgrade"; @@ -96,33 +128,41 @@ let cfg = config.system.autoUpgrade; in serviceConfig.Type = "oneshot"; - environment = config.nix.envVars // - { inherit (config.environment.sessionVariables) NIX_PATH; - HOME = "/root"; - } // config.networking.proxy.envVars; + environment = config.nix.envVars // { + inherit (config.environment.sessionVariables) NIX_PATH; + HOME = "/root"; + } // config.networking.proxy.envVars; - path = with pkgs; [ coreutils gnutar xz.bin gzip gitMinimal config.nix.package.out ]; + path = with pkgs; [ + coreutils + gnutar + xz.bin + gzip + gitMinimal + config.nix.package.out + ]; script = let - nixos-rebuild = "${config.system.build.nixos-rebuild}/bin/nixos-rebuild"; - in - if cfg.allowReboot then '' - ${nixos-rebuild} boot ${toString cfg.flags} - booted="$(readlink /run/booted-system/{initrd,kernel,kernel-modules})" - built="$(readlink /nix/var/nix/profiles/system/{initrd,kernel,kernel-modules})" - if [ "$booted" = "$built" ]; then - ${nixos-rebuild} switch ${toString cfg.flags} - else - /run/current-system/sw/bin/shutdown -r +1 - fi - '' else '' - ${nixos-rebuild} switch ${toString cfg.flags} - ''; + nixos-rebuild = + "${config.system.build.nixos-rebuild}/bin/nixos-rebuild"; + in if cfg.allowReboot then '' + ${nixos-rebuild} boot ${toString cfg.flags} + booted="$(readlink /run/booted-system/{initrd,kernel,kernel-modules})" + built="$(readlink /nix/var/nix/profiles/system/{initrd,kernel,kernel-modules})" + if [ "$booted" = "$built" ]; then + ${nixos-rebuild} switch ${toString cfg.flags} + else + /run/current-system/sw/bin/shutdown -r +1 + fi + '' else '' + ${nixos-rebuild} switch ${toString cfg.flags} + ''; startAt = cfg.dates; }; - systemd.timers.nixos-upgrade.timerConfig.RandomizedDelaySec = cfg.randomizedDelaySec; + systemd.timers.nixos-upgrade.timerConfig.RandomizedDelaySec = + cfg.randomizedDelaySec; }; From 1f0371c650cb4d655f058a6fdd8347b69753af05 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Tue, 30 Jun 2020 10:13:37 +0200 Subject: [PATCH 006/143] nixos/networkd: reformat code with a single option per line Simplifies greatly the interpretation of commit differences. --- nixos/modules/system/boot/networkd.nix | 367 ++++++++++++++++++++----- 1 file changed, 302 insertions(+), 65 deletions(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 721080949e06..0fc2c6133b76 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -10,11 +10,29 @@ let checkLink = checkUnitConfig "Link" [ (assertOnlyFields [ - "Description" "Alias" "MACAddressPolicy" "MACAddress" "NamePolicy" "Name" "OriginalName" - "MTUBytes" "BitsPerSecond" "Duplex" "AutoNegotiation" "WakeOnLan" "Port" "Advertise" - "TCPSegmentationOffload" "TCP6SegmentationOffload" "GenericSegmentationOffload" - "GenericReceiveOffload" "LargeReceiveOffload" "RxChannels" "TxChannels" - "OtherChannels" "CombinedChannels" + "Description" + "Alias" + "MACAddressPolicy" + "MACAddress" + "NamePolicy" + "Name" + "OriginalName" + "MTUBytes" + "BitsPerSecond" + "Duplex" + "AutoNegotiation" + "WakeOnLan" + "Port" + "Advertise" + "TCPSegmentationOffload" + "TCP6SegmentationOffload" + "GenericSegmentationOffload" + "GenericReceiveOffload" + "LargeReceiveOffload" + "RxChannels" + "TxChannels" + "OtherChannels" + "CombinedChannels" ]) (assertValueOneOf "MACAddressPolicy" ["persistent" "random" "none"]) (assertMacAddress "MACAddress") @@ -42,21 +60,51 @@ let checkNetdev = checkUnitConfig "Netdev" [ (assertOnlyFields [ - "Description" "Name" "Kind" "MTUBytes" "MACAddress" + "Description" + "Name" + "Kind" + "MTUBytes" + "MACAddress" ]) (assertHasField "Name") (assertHasField "Kind") (assertValueOneOf "Kind" [ - "bond" "bridge" "dummy" "gre" "gretap" "ip6gre" "ip6tnl" "ip6gretap" "ipip" - "ipvlan" "macvlan" "macvtap" "sit" "tap" "tun" "veth" "vlan" "vti" "vti6" - "vxlan" "geneve" "vrf" "vcan" "vxcan" "wireguard" "netdevsim" "xfrm" + "bond" + "bridge" + "dummy" + "gre" + "gretap" + "ip6gre" + "ip6tnl" + "ip6gretap" + "ipip" + "ipvlan" + "macvlan" + "macvtap" + "sit" + "tap" + "tun" + "veth" + "vlan" + "vti" + "vti6" + "vxlan" + "geneve" + "vrf" + "vcan" + "vxcan" + "wireguard" + "netdevsim" + "xfrm" ]) (assertByteFormat "MTUBytes") (assertMacAddress "MACAddress") ]; checkVRF = checkUnitConfig "VRF" [ - (assertOnlyFields [ "Table" ]) + (assertOnlyFields [ + "Table" + ]) (assertMinimum "Table" 0) ]; @@ -65,7 +113,9 @@ let # refrain ourselves from providing a footgun. checkWireGuard = checkUnitConfig "WireGuard" [ (assertOnlyFields [ - "PrivateKeyFile" "ListenPort" "FwMark" + "PrivateKeyFile" + "ListenPort" + "FwMark" ]) # The following check won't work on nix <= 2.2 # see https://github.com/NixOS/nix/pull/2378 @@ -80,14 +130,23 @@ let # refrain ourselves from providing a footgun. checkWireGuardPeer = checkUnitConfig "WireGuardPeer" [ (assertOnlyFields [ - "PublicKey" "PresharedKeyFile" "AllowedIPs" - "Endpoint" "PersistentKeepalive" + "PublicKey" + "PresharedKeyFile" + "AllowedIPs" + "Endpoint" + "PersistentKeepalive" ]) (assertRange "PersistentKeepalive" 1 65535) ]; checkVlan = checkUnitConfig "VLAN" [ - (assertOnlyFields ["Id" "GVRP" "MVRP" "LooseBinding" "ReorderHeader"]) + (assertOnlyFields [ + "Id" + "GVRP" + "MVRP" + "LooseBinding" + "ReorderHeader" + ]) (assertRange "Id" 0 4094) (assertValueOneOf "GVRP" boolValues) (assertValueOneOf "MVRP" boolValues) @@ -96,17 +155,34 @@ let ]; checkMacvlan = checkUnitConfig "MACVLAN" [ - (assertOnlyFields ["Mode"]) + (assertOnlyFields [ + "Mode" + ]) (assertValueOneOf "Mode" ["private" "vepa" "bridge" "passthru"]) ]; checkVxlan = checkUnitConfig "VXLAN" [ (assertOnlyFields [ - "Id" "Remote" "Local" "TOS" "TTL" "MacLearning" "FDBAgeingSec" - "MaximumFDBEntries" "ReduceARPProxy" "L2MissNotification" - "L3MissNotification" "RouteShortCircuit" "UDPChecksum" - "UDP6ZeroChecksumTx" "UDP6ZeroChecksumRx" "RemoteChecksumTx" - "RemoteChecksumRx" "GroupPolicyExtension" "DestinationPort" "PortRange" + "Id" + "Remote" + "Local" + "TOS" + "TTL" + "MacLearning" + "FDBAgeingSec" + "MaximumFDBEntries" + "ReduceARPProxy" + "L2MissNotification" + "L3MissNotification" + "RouteShortCircuit" + "UDPChecksum" + "UDP6ZeroChecksumTx" + "UDP6ZeroChecksumRx" + "RemoteChecksumTx" + "RemoteChecksumRx" + "GroupPolicyExtension" + "DestinationPort" + "PortRange" "FlowLabel" ]) (assertRange "TTL" 0 255) @@ -126,8 +202,19 @@ let checkTunnel = checkUnitConfig "Tunnel" [ (assertOnlyFields [ - "Local" "Remote" "TOS" "TTL" "DiscoverPathMTU" "IPv6FlowLabel" "CopyDSCP" - "EncapsulationLimit" "Key" "InputKey" "OutputKey" "Mode" "Independent" + "Local" + "Remote" + "TOS" + "TTL" + "DiscoverPathMTU" + "IPv6FlowLabel" + "CopyDSCP" + "EncapsulationLimit" + "Key" + "InputKey" + "OutputKey" + "Mode" + "Independent" "AllowLocalRemote" ]) (assertRange "TTL" 0 255) @@ -139,12 +226,22 @@ let ]; checkPeer = checkUnitConfig "Peer" [ - (assertOnlyFields ["Name" "MACAddress"]) + (assertOnlyFields [ + "Name" + "MACAddress" + ]) (assertMacAddress "MACAddress") ]; tunTapChecks = [ - (assertOnlyFields ["OneQueue" "MultiQueue" "PacketInfo" "VNetHeader" "User" "Group"]) + (assertOnlyFields [ + "OneQueue" + "MultiQueue" + "PacketInfo" + "VNetHeader" + "User" + "Group" + ]) (assertValueOneOf "OneQueue" boolValues) (assertValueOneOf "MultiQueue" boolValues) (assertValueOneOf "PacketInfo" boolValues) @@ -157,18 +254,41 @@ let checkBond = checkUnitConfig "Bond" [ (assertOnlyFields [ - "Mode" "TransmitHashPolicy" "LACPTransmitRate" "MIIMonitorSec" - "UpDelaySec" "DownDelaySec" "LearnPacketIntervalSec" "AdSelect" - "FailOverMACPolicy" "ARPValidate" "ARPIntervalSec" "ARPIPTargets" - "ARPAllTargets" "PrimaryReselectPolicy" "ResendIGMP" "PacketsPerSlave" - "GratuitousARP" "AllSlavesActive" "MinLinks" + "Mode" + "TransmitHashPolicy" + "LACPTransmitRate" + "MIIMonitorSec" + "UpDelaySec" + "DownDelaySec" + "LearnPacketIntervalSec" + "AdSelect" + "FailOverMACPolicy" + "ARPValidate" + "ARPIntervalSec" + "ARPIPTargets" + "ARPAllTargets" + "PrimaryReselectPolicy" + "ResendIGMP" + "PacketsPerSlave" + "GratuitousARP" + "AllSlavesActive" + "MinLinks" ]) (assertValueOneOf "Mode" [ - "balance-rr" "active-backup" "balance-xor" - "broadcast" "802.3ad" "balance-tlb" "balance-alb" + "balance-rr" + "active-backup" + "balance-xor" + "broadcast" + "802.3ad" + "balance-tlb" + "balance-alb" ]) (assertValueOneOf "TransmitHashPolicy" [ - "layer2" "layer3+4" "layer2+3" "encap2+3" "encap3+4" + "layer2" + "layer3+4" + "layer2+3" + "encap2+3" + "encap3+4" ]) (assertValueOneOf "LACPTransmitRate" ["slow" "fast"]) (assertValueOneOf "AdSelect" ["stable" "bandwidth" "count"]) @@ -184,7 +304,8 @@ let checkXfrm = checkUnitConfig "Xfrm" [ (assertOnlyFields [ - "InterfaceId" "Independent" + "InterfaceId" + "Independent" ]) # The following check won't work on nix <= 2.2 # see https://github.com/NixOS/nix/pull/2378 @@ -197,15 +318,49 @@ let checkNetwork = checkUnitConfig "Network" [ (assertOnlyFields [ - "Description" "DHCP" "DHCPServer" "LinkLocalAddressing" "IPv4LLRoute" - "IPv6Token" "LLMNR" "MulticastDNS" "DNSOverTLS" "DNSSEC" - "DNSSECNegativeTrustAnchors" "LLDP" "EmitLLDP" "BindCarrier" "Address" - "Gateway" "DNS" "Domains" "NTP" "IPForward" "IPMasquerade" - "IPv6PrivacyExtensions" "IPv6AcceptRA" "IPv6DuplicateAddressDetection" - "IPv6HopLimit" "IPv4ProxyARP" "IPv6ProxyNDP" "IPv6ProxyNDPAddress" - "IPv6PrefixDelegation" "IPv6MTUBytes" "Bridge" "Bond" "VRF" "VLAN" - "IPVLAN" "MACVLAN" "VXLAN" "Tunnel" "ActiveSlave" "PrimarySlave" - "ConfigureWithoutCarrier" "Xfrm" "KeepConfiguration" + "Description" + "DHCP" + "DHCPServer" + "LinkLocalAddressing" + "IPv4LLRoute" + "IPv6Token" + "LLMNR" + "MulticastDNS" + "DNSOverTLS" + "DNSSEC" + "DNSSECNegativeTrustAnchors" + "LLDP" + "EmitLLDP" + "BindCarrier" + "Address" + "Gateway" + "DNS" + "Domains" + "NTP" + "IPForward" + "IPMasquerade" + "IPv6PrivacyExtensions" + "IPv6AcceptRA" + "IPv6DuplicateAddressDetection" + "IPv6HopLimit" + "IPv4ProxyARP" + "IPv6ProxyNDP" + "IPv6ProxyNDPAddress" + "IPv6PrefixDelegation" + "IPv6MTUBytes" + "Bridge" + "Bond" + "VRF" + "VLAN" + "IPVLAN" + "MACVLAN" + "VXLAN" + "Tunnel" + "ActiveSlave" + "PrimarySlave" + "ConfigureWithoutCarrier" + "Xfrm" + "KeepConfiguration" ]) # Note: For DHCP the values both, none, v4, v6 are deprecated (assertValueOneOf "DHCP" ["yes" "no" "ipv4" "ipv6" "both" "none" "v4" "v6"]) @@ -233,9 +388,17 @@ let checkAddress = checkUnitConfig "Address" [ (assertOnlyFields [ - "Address" "Peer" "Broadcast" "Label" "PreferredLifetime" "Scope" - "HomeAddress" "DuplicateAddressDetection" "ManageTemporaryAddress" - "PrefixRoute" "AutoJoin" + "Address" + "Peer" + "Broadcast" + "Label" + "PreferredLifetime" + "Scope" + "HomeAddress" + "DuplicateAddressDetection" + "ManageTemporaryAddress" + "PrefixRoute" + "AutoJoin" ]) (assertHasField "Address") (assertValueOneOf "PreferredLifetime" ["forever" "infinity" "0" 0]) @@ -248,9 +411,19 @@ let checkRoutingPolicyRule = checkUnitConfig "RoutingPolicyRule" [ (assertOnlyFields [ - "TypeOfService" "From" "To" "FirewallMark" "Table" "Priority" - "IncomingInterface" "OutgoingInterface" "SourcePort" "DestinationPort" - "IPProtocol" "InvertRule" "Family" + "TypeOfService" + "From" + "To" + "FirewallMark" + "Table" + "Priority" + "IncomingInterface" + "OutgoingInterface" + "SourcePort" + "DestinationPort" + "IPProtocol" + "InvertRule" + "Family" ]) (assertRange "TypeOfService" 0 255) # The following check won't work on nix <= 2.2 @@ -268,20 +441,49 @@ let checkRoute = checkUnitConfig "Route" [ (assertOnlyFields [ - "Gateway" "GatewayOnLink" "Destination" "Source" "Metric" - "IPv6Preference" "Scope" "PreferredSource" "Table" "Protocol" "Type" - "InitialCongestionWindow" "InitialAdvertisedReceiveWindow" "QuickAck" + "Gateway" + "GatewayOnLink" + "Destination" + "Source" + "Metric" + "IPv6Preference" + "Scope" + "PreferredSource" + "Table" + "Protocol" + "Type" + "InitialCongestionWindow" + "InitialAdvertisedReceiveWindow" + "QuickAck" "MTUBytes" ]) ]; checkDhcpV4 = checkUnitConfig "DHCPv4" [ (assertOnlyFields [ - "UseDNS" "RoutesToDNS" "UseNTP" "UseMTU" "Anonymize" "SendHostname" "UseHostname" - "Hostname" "UseDomains" "UseRoutes" "UseTimezone" - "ClientIdentifier" "VendorClassIdentifier" "UserClass" "MaxAttempts" - "DUIDType" "DUIDRawData" "IAID" "RequestBroadcast" "RouteMetric" "RouteTable" - "ListenPort" "SendRelease" + "UseDNS" + "RoutesToDNS" + "UseNTP" + "UseMTU" + "Anonymize" + "SendHostname" + "UseHostname" + "Hostname" + "UseDomains" + "UseRoutes" + "UseTimezone" + "ClientIdentifier" + "VendorClassIdentifier" + "UserClass" + "MaxAttempts" + "DUIDType" + "DUIDRawData" + "IAID" + "RequestBroadcast" + "RouteMetric" + "RouteTable" + "ListenPort" + "SendRelease" ]) (assertValueOneOf "UseDNS" boolValues) (assertValueOneOf "RoutesToDNS" boolValues) @@ -302,7 +504,10 @@ let checkDhcpV6 = checkUnitConfig "DHCPv6" [ (assertOnlyFields [ - "UseDNS" "UseNTP" "RapidCommit" "ForceDHCPv6PDOtherInformation" + "UseDNS" + "UseNTP" + "RapidCommit" + "ForceDHCPv6PDOtherInformation" "PrefixDelegationHint" ]) (assertValueOneOf "UseDNS" boolValues) @@ -313,8 +518,14 @@ let checkIpv6PrefixDelegation = checkUnitConfig "IPv6PrefixDelegation" [ (assertOnlyFields [ - "Managed" "OtherInformation" "RouterLifetimeSec" - "RouterPreference" "EmitDNS" "DNS" "EmitDomains" "Domains" + "Managed" + "OtherInformation" + "RouterLifetimeSec" + "RouterPreference" + "EmitDNS" + "DNS" + "EmitDomains" + "Domains" "DNSLifetimeSec" ]) (assertValueOneOf "Managed" boolValues) @@ -327,8 +538,11 @@ let checkIpv6Prefix = checkUnitConfig "IPv6Prefix" [ (assertOnlyFields [ - "AddressAutoconfiguration" "OnLink" "Prefix" - "PreferredLifetimeSec" "ValidLifetimeSec" + "AddressAutoconfiguration" + "OnLink" + "Prefix" + "PreferredLifetimeSec" + "ValidLifetimeSec" ]) (assertValueOneOf "AddressAutoconfiguration" boolValues) (assertValueOneOf "OnLink" boolValues) @@ -339,8 +553,17 @@ let checkDhcpServer = checkUnitConfig "DHCPServer" [ (assertOnlyFields [ - "PoolOffset" "PoolSize" "DefaultLeaseTimeSec" "MaxLeaseTimeSec" - "EmitDNS" "DNS" "EmitNTP" "NTP" "EmitRouter" "EmitTimezone" "Timezone" + "PoolOffset" + "PoolSize" + "DefaultLeaseTimeSec" + "MaxLeaseTimeSec" + "EmitDNS" + "DNS" + "EmitNTP" + "NTP" + "EmitRouter" + "EmitTimezone" + "Timezone" ]) (assertValueOneOf "EmitDNS" boolValues) (assertValueOneOf "EmitNTP" boolValues) @@ -351,14 +574,28 @@ let # .network files have a [Link] section with different options than in .netlink files checkNetworkLink = checkUnitConfig "Link" [ (assertOnlyFields [ - "MACAddress" "MTUBytes" "ARP" "Multicast" "Unmanaged" "RequiredForOnline" + "MACAddress" + "MTUBytes" + "ARP" + "Multicast" + "Unmanaged" + "RequiredForOnline" ]) (assertMacAddress "MACAddress") (assertByteFormat "MTUBytes") (assertValueOneOf "ARP" boolValues) (assertValueOneOf "Multicast" boolValues) (assertValueOneOf "Unmanaged" boolValues) - (assertValueOneOf "RequiredForOnline" (boolValues ++ ["off" "no-carrier" "dormant" "degraded-carrier" "carrier" "degraded" "enslaved" "routable"])) + (assertValueOneOf "RequiredForOnline" (boolValues ++ [ + "off" + "no-carrier" + "dormant" + "degraded-carrier" + "carrier" + "degraded" + "enslaved" + "routable" + ])) ]; From e9d13d37515cde47ec24410ca19866e68e5a7bd5 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Wed, 1 Jul 2020 12:37:15 +0200 Subject: [PATCH 007/143] nixos/networkd: update options for systemd 245 Fix #91761 --- nixos/modules/system/boot/networkd.nix | 183 ++++++++++++++++++++----- 1 file changed, 152 insertions(+), 31 deletions(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 0fc2c6133b76..2ccd0a38dab4 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -16,7 +16,8 @@ let "MACAddress" "NamePolicy" "Name" - "OriginalName" + "AlternativeNamesPolicy" + "AlternativeName" "MTUBytes" "BitsPerSecond" "Duplex" @@ -24,6 +25,8 @@ let "WakeOnLan" "Port" "Advertise" + "ReceiveChecksumOffload" + "TransmitChecksumOffload" "TCPSegmentationOffload" "TCP6SegmentationOffload" "GenericSegmentationOffload" @@ -33,6 +36,8 @@ let "TxChannels" "OtherChannels" "CombinedChannels" + "RxBufferSize" + "TxBufferSize" ]) (assertValueOneOf "MACAddressPolicy" ["persistent" "random" "none"]) (assertMacAddress "MACAddress") @@ -42,20 +47,32 @@ let (assertValueOneOf "AutoNegotiation" boolValues) (assertValueOneOf "WakeOnLan" ["phy" "unicast" "multicast" "broadcast" "arp" "magic" "secureon" "off"]) (assertValueOneOf "Port" ["tp" "aui" "bnc" "mii" "fibre"]) + (assertValueOneOf "ReceiveChecksumOffload" boolValues) + (assertValueOneOf "TransmitChecksumOffload" boolValues) (assertValueOneOf "TCPSegmentationOffload" boolValues) (assertValueOneOf "TCP6SegmentationOffload" boolValues) (assertValueOneOf "GenericSegmentationOffload" boolValues) - (assertValueOneOf "UDPSegmentationOffload" boolValues) (assertValueOneOf "GenericReceiveOffload" boolValues) (assertValueOneOf "LargeReceiveOffload" boolValues) (assertInt "RxChannels") + # The following checks won't work on nix <= 2.2 + # see https://github.com/NixOS/nix/pull/2378 + # + # Add this again when we'll have drop the + # nix < 2.2 support. + # (assertRange "RxChannels" 1 4294967295) (assertMinimum "RxChannels" 1) (assertInt "TxChannels") + # (assertRange "TxChannels" 1 4294967295) (assertMinimum "TxChannels" 1) (assertInt "OtherChannels") + # (assertRange "OtherChannels" 1 4294967295) (assertMinimum "OtherChannels" 1) (assertInt "CombinedChannels") + # (assertRange "CombinedChannels" 1 4294967295) (assertMinimum "CombinedChannels" 1) + (assertInt "RxBufferSize") + (assertInt "TxBufferSize") ]; checkNetdev = checkUnitConfig "Netdev" [ @@ -74,6 +91,7 @@ let "dummy" "gre" "gretap" + "erspan" "ip6gre" "ip6tnl" "ip6gretap" @@ -90,12 +108,17 @@ let "vti6" "vxlan" "geneve" + "l2tp" + "macsec" "vrf" "vcan" "vxcan" "wireguard" "netdevsim" + "nlmon" + "fou" "xfrm" + "ifb" ]) (assertByteFormat "MTUBytes") (assertMacAddress "MACAddress") @@ -105,6 +128,7 @@ let (assertOnlyFields [ "Table" ]) + (assertInt "Table") (assertMinimum "Table" 0) ]; @@ -115,14 +139,14 @@ let (assertOnlyFields [ "PrivateKeyFile" "ListenPort" - "FwMark" + "FirewallMark" ]) # The following check won't work on nix <= 2.2 # see https://github.com/NixOS/nix/pull/2378 # # Add this again when we'll have drop the # nix < 2.2 support. - # (assertRange "FwMark" 1 4294967295) + # (assertRange "FirewallMark" 1 4294967295) ]; # NOTE The PresharedKey directive is missing on purpose here, please @@ -136,7 +160,7 @@ let "Endpoint" "PersistentKeepalive" ]) - (assertRange "PersistentKeepalive" 1 65535) + (assertRange "PersistentKeepalive" 0 65535) ]; checkVlan = checkUnitConfig "VLAN" [ @@ -163,9 +187,10 @@ let checkVxlan = checkUnitConfig "VXLAN" [ (assertOnlyFields [ - "Id" + "VNI" "Remote" "Local" + "Group" "TOS" "TTL" "MacLearning" @@ -181,12 +206,15 @@ let "RemoteChecksumTx" "RemoteChecksumRx" "GroupPolicyExtension" + "GenericProtocolExtension" "DestinationPort" "PortRange" "FlowLabel" + "IPDoNotFragment" ]) - (assertRange "TTL" 0 255) + (assertRange "VNI" 1 16777215) (assertValueOneOf "MacLearning" boolValues) + (assertInt "MaximumFDBEntries") (assertValueOneOf "ReduceARPProxy" boolValues) (assertValueOneOf "L2MissNotification" boolValues) (assertValueOneOf "L3MissNotification" boolValues) @@ -197,7 +225,9 @@ let (assertValueOneOf "RemoteChecksumTx" boolValues) (assertValueOneOf "RemoteChecksumRx" boolValues) (assertValueOneOf "GroupPolicyExtension" boolValues) + (assertValueOneOf "GenericProtocolExtension" boolValues) (assertRange "FlowLabel" 0 1048575) + (assertValueOneOf "IPDoNotFragment" (boolValues + ["inherit"])) ]; checkTunnel = checkUnitConfig "Tunnel" [ @@ -215,14 +245,31 @@ let "OutputKey" "Mode" "Independent" + "AssignToLoopback" "AllowLocalRemote" + "FooOverUDP" + "FOUDestinationPort" + "FOUSourcePort" + "Encapsulation" + "IPv6RapidDeploymentPrefix" + "ISATAP" + "SerializeTunneledPackets" + "ERSPANIndex" ]) (assertRange "TTL" 0 255) (assertValueOneOf "DiscoverPathMTU" boolValues) (assertValueOneOf "CopyDSCP" boolValues) (assertValueOneOf "Mode" ["ip6ip6" "ipip6" "any"]) (assertValueOneOf "Independent" boolValues) + (assertValueOneOf "AssignToLoopback" boolValues) (assertValueOneOf "AllowLocalRemote" boolValues) + (assertValueOneOf "FooOverUDP" boolValues) + (assertPort "FOUDestinationPort") + (assertPort "FOUSourcePort") + (assertValueOneOf "Encapsulation" ["FooOverUDP" "GenericUDPEncapsulation"]) + (assertValueOneOf "ISATAP" boolValues) + (assertValueOneOf "SerializeTunneledPackets" boolValues) + (assertRange "ERSPANIndex" 1 1048575) ]; checkPeer = checkUnitConfig "Peer" [ @@ -235,14 +282,12 @@ let tunTapChecks = [ (assertOnlyFields [ - "OneQueue" "MultiQueue" "PacketInfo" "VNetHeader" "User" "Group" ]) - (assertValueOneOf "OneQueue" boolValues) (assertValueOneOf "MultiQueue" boolValues) (assertValueOneOf "PacketInfo" boolValues) (assertValueOneOf "VNetHeader" boolValues) @@ -262,6 +307,9 @@ let "DownDelaySec" "LearnPacketIntervalSec" "AdSelect" + "AdActorSystemPriority" + "AdUserPortKey" + "AdActorSystem" "FailOverMACPolicy" "ARPValidate" "ARPIntervalSec" @@ -272,6 +320,7 @@ let "PacketsPerSlave" "GratuitousARP" "AllSlavesActive" + "DynamicTransmitLoadBalancing" "MinLinks" ]) (assertValueOneOf "Mode" [ @@ -292,6 +341,8 @@ let ]) (assertValueOneOf "LACPTransmitRate" ["slow" "fast"]) (assertValueOneOf "AdSelect" ["stable" "bandwidth" "count"]) + (assertRange "AdActorSystemPriority" 1 65535) + (assertRange "AdUserPortKey" 0 1023) (assertValueOneOf "FailOverMACPolicy" ["none" "active" "follow"]) (assertValueOneOf "ARPValidate" ["none" "active" "backup" "all"]) (assertValueOneOf "ARPAllTargets" ["any" "all"]) @@ -300,6 +351,9 @@ let (assertRange "PacketsPerSlave" 0 65535) (assertRange "GratuitousARP" 0 255) (assertValueOneOf "AllSlavesActive" boolValues) + (assertValueOneOf "DynamicTransmitLoadBalancing" boolValues) + (assertInt "MinLinks") + (assertMinimum "MinLinks" 0) ]; checkXfrm = checkUnitConfig "Xfrm" [ @@ -323,6 +377,7 @@ let "DHCPServer" "LinkLocalAddressing" "IPv4LLRoute" + "DefaultRouteOnDevice" "IPv6Token" "LLMNR" "MulticastDNS" @@ -336,6 +391,7 @@ let "Gateway" "DNS" "Domains" + "DNSDefaultRoute" "NTP" "IPForward" "IPMasquerade" @@ -356,33 +412,43 @@ let "MACVLAN" "VXLAN" "Tunnel" + "MACsec" "ActiveSlave" "PrimarySlave" "ConfigureWithoutCarrier" + "IgnoreCarrierLoss" "Xfrm" "KeepConfiguration" ]) # Note: For DHCP the values both, none, v4, v6 are deprecated - (assertValueOneOf "DHCP" ["yes" "no" "ipv4" "ipv6" "both" "none" "v4" "v6"]) + (assertValueOneOf "DHCP" ["yes" "no" "ipv4" "ipv6"]) (assertValueOneOf "DHCPServer" boolValues) - (assertValueOneOf "LinkLocalAddressing" ["yes" "no" "ipv4" "ipv6" "ipv4-fallback" "fallback"]) + (assertValueOneOf "LinkLocalAddressing" ["yes" "no" "ipv4" "ipv6" "fallback" "ipv4-fallback"]) (assertValueOneOf "IPv4LLRoute" boolValues) - (assertValueOneOf "LLMNR" ["yes" "resolve" "no"]) - (assertValueOneOf "MulticastDNS" ["yes" "resolve" "no"]) - (assertValueOneOf "DNSOverTLS" ["opportunistic" "no"]) - (assertValueOneOf "DNSSEC" ["yes" "allow-downgrade" "no"]) - (assertValueOneOf "LLDP" ["yes" "routers-only" "no"]) - (assertValueOneOf "EmitLLDP" ["yes" "no" "nearest-bridge" "non-tpmr-bridge" "customer-bridge"]) - (assertValueOneOf "IPForward" ["yes" "no" "ipv4" "ipv6"]) + (assertValueOneOf "DefaultRouteOnDevice" boolValues) + (assertValueOneOf "LLMNR" (boolValues ++ ["resolve"])) + (assertValueOneOf "MulticastDNS" (boolValues ++ ["resolve"])) + (assertValueOneOf "DNSOverTLS" (boolValues ++ ["opportunistic"])) + (assertValueOneOf "DNSSEC" (boolValues ++ ["allow-downgrade"])) + (assertValueOneOf "LLDP" (boolValues ++ ["routers-only"])) + (assertValueOneOf "EmitLLDP" (boolValues ++ ["nearest-bridge" "non-tpmr-bridge" "customer-bridge"])) + (assertValueOneOf "DNSDefaultRoute" boolValues) + (assertValueOneOf "IPForward" (boolValues ++ ["ipv4" "ipv6"])) (assertValueOneOf "IPMasquerade" boolValues) - (assertValueOneOf "IPv6PrivacyExtensions" ["yes" "no" "prefer-public" "kernel"]) + (assertValueOneOf "IPv6PrivacyExtensions" (boolValues ++ ["prefer-public" "kernel"])) (assertValueOneOf "IPv6AcceptRA" boolValues) + (assertInt "IPv6DuplicateAddressDetection") + (assertMinimum "IPv6DuplicateAddressDetection" 0) + (assertInt "IPv6HopLimit") + (assertMinimum "IPv6HopLimit" 0) (assertValueOneOf "IPv4ProxyARP" boolValues) (assertValueOneOf "IPv6ProxyNDP" boolValues) - (assertValueOneOf "IPv6PrefixDelegation" (boolValues ++ [ "dhcpv6" "static" ])) + (assertValueOneOf "IPv6PrefixDelegation" ["static" "dhcpv6" "yes" "false"]) + (assertByteFormat "IPv6MTUBytes") (assertValueOneOf "ActiveSlave" boolValues) (assertValueOneOf "PrimarySlave" boolValues) (assertValueOneOf "ConfigureWithoutCarrier" boolValues) + (assertValueOneOf "IgnoreCarrierLoss" boolValues) (assertValueOneOf "KeepConfiguration" (boolValues ++ ["static" "dhcp-on-stop" "dhcp"])) ]; @@ -397,15 +463,15 @@ let "HomeAddress" "DuplicateAddressDetection" "ManageTemporaryAddress" - "PrefixRoute" + "AddPrefixRoute" "AutoJoin" ]) (assertHasField "Address") (assertValueOneOf "PreferredLifetime" ["forever" "infinity" "0" 0]) (assertValueOneOf "HomeAddress" boolValues) - (assertValueOneOf "DuplicateAddressDetection" boolValues) + (assertValueOneOf "DuplicateAddressDetection" ["ipv4" "ipv6" "both" "none"]) (assertValueOneOf "ManageTemporaryAddress" boolValues) - (assertValueOneOf "PrefixRoute" boolValues) + (assertValueOneOf "AddPrefixRoute" boolValues) (assertValueOneOf "AutoJoin" boolValues) ]; @@ -424,19 +490,24 @@ let "IPProtocol" "InvertRule" "Family" + "User" + "SuppressPrefixLength" ]) (assertRange "TypeOfService" 0 255) + (assertInt "FirewallMark") # The following check won't work on nix <= 2.2 # see https://github.com/NixOS/nix/pull/2378 # # Add this again when we'll have drop the # nix < 2.2 support. # (assertRange "FirewallMark" 1 4294967295) + (assertMinimum "FirewallMark" 1) (assertInt "Priority") (assertPort "SourcePort") (assertPort "DestinationPort") (assertValueOneOf "InvertRule" boolValues) (assertValueOneOf "Family" ["ipv4" "ipv6" "both"]) + (assertRange "SuppressPrefixLength" 0 128) ]; checkRoute = checkUnitConfig "Route" [ @@ -455,8 +526,34 @@ let "InitialCongestionWindow" "InitialAdvertisedReceiveWindow" "QuickAck" + "FastOpenNoCookie" + "TTLPropagate" "MTUBytes" + "IPServiceType" + "MultiPathRoute" ]) + (assertValueOneOf "GatewayOnLink" boolValues) + (assertInt "Metric") + (assertValueOneOf "IPv6Preference" ["low" "medium" "high"]) + (assertValueOneOf "Scope" ["global" "site" "link" "host" "nowhere"]) + (assertValueOneOf "Type" [ + "unicast" + "local" + "broadcast" + "anycast" + "multicast" + "blackhole" + "unreachable" + "prohibit" + "throw" + "nat" + "xresolve" + ]) + (assertValueOneOf "QuickAck" boolValues) + (assertValueOneOf "FastOpenNoCookie" boolValues) + (assertValueOneOf "TTLPropagate" boolValues) + (assertByteFormat "MTUBytes") + (assertValueOneOf "IPServiceType" ["CS6" "CS4"]) ]; checkDhcpV4 = checkUnitConfig "DHCPv4" [ @@ -464,6 +561,7 @@ let "UseDNS" "RoutesToDNS" "UseNTP" + "UseSIP" "UseMTU" "Anonymize" "SendHostname" @@ -482,24 +580,41 @@ let "RequestBroadcast" "RouteMetric" "RouteTable" + "RouteMTUBytes" "ListenPort" "SendRelease" + "SendDecline" + "BlackList" + "RequestOptions" + "SendOption" ]) (assertValueOneOf "UseDNS" boolValues) (assertValueOneOf "RoutesToDNS" boolValues) (assertValueOneOf "UseNTP" boolValues) + (assertValueOneOf "UseSIP" boolValues) (assertValueOneOf "UseMTU" boolValues) (assertValueOneOf "Anonymize" boolValues) (assertValueOneOf "SendHostname" boolValues) (assertValueOneOf "UseHostname" boolValues) - (assertValueOneOf "UseDomains" ["yes" "no" "route"]) + (assertValueOneOf "UseDomains" (boolValues ++ ["route"])) (assertValueOneOf "UseRoutes" boolValues) (assertValueOneOf "UseTimezone" boolValues) - (assertMinimum "MaxAttempts" 0) + (assertValueOneOf "ClientIdentifier" ["mac" "duid" "duid-only"]) + (assertInt "IAID") (assertValueOneOf "RequestBroadcast" boolValues) + (assertInt "RouteMetric") (assertInt "RouteTable") + # The following check won't work on nix <= 2.2 + # see https://github.com/NixOS/nix/pull/2378 + # + # Add this again when we'll have drop the + # nix < 2.2 support. + # (assertRange "RouteTable" 0 4294967295) (assertMinimum "RouteTable" 0) + (assertByteFormat "RouteMTUBytes") + (assertPort "ListenPort") (assertValueOneOf "SendRelease" boolValues) + (assertValueOneOf "SendDecline" boolValues) ]; checkDhcpV6 = checkUnitConfig "DHCPv6" [ @@ -533,7 +648,6 @@ let (assertValueOneOf "RouterPreference" ["high" "medium" "low" "normal" "default"]) (assertValueOneOf "EmitDNS" boolValues) (assertValueOneOf "EmitDomains" boolValues) - (assertMinimum "DNSLifetimeSec" 0) ]; checkIpv6Prefix = checkUnitConfig "IPv6Prefix" [ @@ -546,11 +660,8 @@ let ]) (assertValueOneOf "AddressAutoconfiguration" boolValues) (assertValueOneOf "OnLink" boolValues) - (assertMinimum "PreferredLifetimeSec" 0) - (assertMinimum "ValidLifetimeSec" 0) ]; - checkDhcpServer = checkUnitConfig "DHCPServer" [ (assertOnlyFields [ "PoolOffset" @@ -561,23 +672,32 @@ let "DNS" "EmitNTP" "NTP" + "EmitSIP" + "SIP" "EmitRouter" "EmitTimezone" "Timezone" + "SendOption" ]) + (assertInt "PoolOffset") + (assertMinimum "PoolOffset" 0) + (assertInt "PoolSize") + (assertMinimum "PoolSize" 0) (assertValueOneOf "EmitDNS" boolValues) (assertValueOneOf "EmitNTP" boolValues) + (assertValueOneOf "EmitSIP" boolValues) (assertValueOneOf "EmitRouter" boolValues) (assertValueOneOf "EmitTimezone" boolValues) ]; - # .network files have a [Link] section with different options than in .netlink files + # .network files have a [Link] section with different options than in .link files checkNetworkLink = checkUnitConfig "Link" [ (assertOnlyFields [ "MACAddress" "MTUBytes" "ARP" "Multicast" + "AllMulticast" "Unmanaged" "RequiredForOnline" ]) @@ -585,8 +705,10 @@ let (assertByteFormat "MTUBytes") (assertValueOneOf "ARP" boolValues) (assertValueOneOf "Multicast" boolValues) + (assertValueOneOf "AllMulticast" boolValues) (assertValueOneOf "Unmanaged" boolValues) (assertValueOneOf "RequiredForOnline" (boolValues ++ [ + "missing" "off" "no-carrier" "dormant" @@ -598,7 +720,6 @@ let ])) ]; - commonNetworkOptions = { enable = mkOption { From bb3ba3e515ee6843e47fd423e519a384c3722c36 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Wed, 1 Jul 2020 18:05:32 +0200 Subject: [PATCH 008/143] nixos/networkd: reoder code to match networkd documentation --- nixos/modules/system/boot/networkd.nix | 1736 ++++++++++++------------ 1 file changed, 874 insertions(+), 862 deletions(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 2ccd0a38dab4..1ac671d5f30e 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -8,717 +8,730 @@ let cfg = config.systemd.network; - checkLink = checkUnitConfig "Link" [ - (assertOnlyFields [ - "Description" - "Alias" - "MACAddressPolicy" - "MACAddress" - "NamePolicy" - "Name" - "AlternativeNamesPolicy" - "AlternativeName" - "MTUBytes" - "BitsPerSecond" - "Duplex" - "AutoNegotiation" - "WakeOnLan" - "Port" - "Advertise" - "ReceiveChecksumOffload" - "TransmitChecksumOffload" - "TCPSegmentationOffload" - "TCP6SegmentationOffload" - "GenericSegmentationOffload" - "GenericReceiveOffload" - "LargeReceiveOffload" - "RxChannels" - "TxChannels" - "OtherChannels" - "CombinedChannels" - "RxBufferSize" - "TxBufferSize" - ]) - (assertValueOneOf "MACAddressPolicy" ["persistent" "random" "none"]) - (assertMacAddress "MACAddress") - (assertByteFormat "MTUBytes") - (assertByteFormat "BitsPerSecond") - (assertValueOneOf "Duplex" ["half" "full"]) - (assertValueOneOf "AutoNegotiation" boolValues) - (assertValueOneOf "WakeOnLan" ["phy" "unicast" "multicast" "broadcast" "arp" "magic" "secureon" "off"]) - (assertValueOneOf "Port" ["tp" "aui" "bnc" "mii" "fibre"]) - (assertValueOneOf "ReceiveChecksumOffload" boolValues) - (assertValueOneOf "TransmitChecksumOffload" boolValues) - (assertValueOneOf "TCPSegmentationOffload" boolValues) - (assertValueOneOf "TCP6SegmentationOffload" boolValues) - (assertValueOneOf "GenericSegmentationOffload" boolValues) - (assertValueOneOf "GenericReceiveOffload" boolValues) - (assertValueOneOf "LargeReceiveOffload" boolValues) - (assertInt "RxChannels") - # The following checks won't work on nix <= 2.2 - # see https://github.com/NixOS/nix/pull/2378 - # - # Add this again when we'll have drop the - # nix < 2.2 support. - # (assertRange "RxChannels" 1 4294967295) - (assertMinimum "RxChannels" 1) - (assertInt "TxChannels") - # (assertRange "TxChannels" 1 4294967295) - (assertMinimum "TxChannels" 1) - (assertInt "OtherChannels") - # (assertRange "OtherChannels" 1 4294967295) - (assertMinimum "OtherChannels" 1) - (assertInt "CombinedChannels") - # (assertRange "CombinedChannels" 1 4294967295) - (assertMinimum "CombinedChannels" 1) - (assertInt "RxBufferSize") - (assertInt "TxBufferSize") - ]; + check = { - checkNetdev = checkUnitConfig "Netdev" [ - (assertOnlyFields [ - "Description" - "Name" - "Kind" - "MTUBytes" - "MACAddress" - ]) - (assertHasField "Name") - (assertHasField "Kind") - (assertValueOneOf "Kind" [ - "bond" - "bridge" - "dummy" - "gre" - "gretap" - "erspan" - "ip6gre" - "ip6tnl" - "ip6gretap" - "ipip" - "ipvlan" - "macvlan" - "macvtap" - "sit" - "tap" - "tun" - "veth" - "vlan" - "vti" - "vti6" - "vxlan" - "geneve" - "l2tp" - "macsec" - "vrf" - "vcan" - "vxcan" - "wireguard" - "netdevsim" - "nlmon" - "fou" - "xfrm" - "ifb" - ]) - (assertByteFormat "MTUBytes") - (assertMacAddress "MACAddress") - ]; + link = { - checkVRF = checkUnitConfig "VRF" [ - (assertOnlyFields [ - "Table" - ]) - (assertInt "Table") - (assertMinimum "Table" 0) - ]; + sectionLink = checkUnitConfig "Link" [ + (assertOnlyFields [ + "Description" + "Alias" + "MACAddressPolicy" + "MACAddress" + "NamePolicy" + "Name" + "AlternativeNamesPolicy" + "AlternativeName" + "MTUBytes" + "BitsPerSecond" + "Duplex" + "AutoNegotiation" + "WakeOnLan" + "Port" + "Advertise" + "ReceiveChecksumOffload" + "TransmitChecksumOffload" + "TCPSegmentationOffload" + "TCP6SegmentationOffload" + "GenericSegmentationOffload" + "GenericReceiveOffload" + "LargeReceiveOffload" + "RxChannels" + "TxChannels" + "OtherChannels" + "CombinedChannels" + "RxBufferSize" + "TxBufferSize" + ]) + (assertValueOneOf "MACAddressPolicy" ["persistent" "random" "none"]) + (assertMacAddress "MACAddress") + (assertByteFormat "MTUBytes") + (assertByteFormat "BitsPerSecond") + (assertValueOneOf "Duplex" ["half" "full"]) + (assertValueOneOf "AutoNegotiation" boolValues) + (assertValueOneOf "WakeOnLan" ["phy" "unicast" "multicast" "broadcast" "arp" "magic" "secureon" "off"]) + (assertValueOneOf "Port" ["tp" "aui" "bnc" "mii" "fibre"]) + (assertValueOneOf "ReceiveChecksumOffload" boolValues) + (assertValueOneOf "TransmitChecksumOffload" boolValues) + (assertValueOneOf "TCPSegmentationOffload" boolValues) + (assertValueOneOf "TCP6SegmentationOffload" boolValues) + (assertValueOneOf "GenericSegmentationOffload" boolValues) + (assertValueOneOf "GenericReceiveOffload" boolValues) + (assertValueOneOf "LargeReceiveOffload" boolValues) + (assertInt "RxChannels") + # The following checks won't work on nix <= 2.2 + # see https://github.com/NixOS/nix/pull/2378 + # + # Add this again when we'll have drop the + # nix < 2.2 support. + # (assertRange "RxChannels" 1 4294967295) + (assertMinimum "RxChannels" 1) + (assertInt "TxChannels") + # (assertRange "TxChannels" 1 4294967295) + (assertMinimum "TxChannels" 1) + (assertInt "OtherChannels") + # (assertRange "OtherChannels" 1 4294967295) + (assertMinimum "OtherChannels" 1) + (assertInt "CombinedChannels") + # (assertRange "CombinedChannels" 1 4294967295) + (assertMinimum "CombinedChannels" 1) + (assertInt "RxBufferSize") + (assertInt "TxBufferSize") + ]; + }; - # NOTE The PrivateKey directive is missing on purpose here, please - # do not add it to this list. The nix store is world-readable let's - # refrain ourselves from providing a footgun. - checkWireGuard = checkUnitConfig "WireGuard" [ - (assertOnlyFields [ - "PrivateKeyFile" - "ListenPort" - "FirewallMark" - ]) - # The following check won't work on nix <= 2.2 - # see https://github.com/NixOS/nix/pull/2378 - # - # Add this again when we'll have drop the - # nix < 2.2 support. - # (assertRange "FirewallMark" 1 4294967295) - ]; + netdev = let - # NOTE The PresharedKey directive is missing on purpose here, please - # do not add it to this list. The nix store is world-readable,let's - # refrain ourselves from providing a footgun. - checkWireGuardPeer = checkUnitConfig "WireGuardPeer" [ - (assertOnlyFields [ - "PublicKey" - "PresharedKeyFile" - "AllowedIPs" - "Endpoint" - "PersistentKeepalive" - ]) - (assertRange "PersistentKeepalive" 0 65535) - ]; + tunChecks = [ + (assertOnlyFields [ + "MultiQueue" + "PacketInfo" + "VNetHeader" + "User" + "Group" + ]) + (assertValueOneOf "MultiQueue" boolValues) + (assertValueOneOf "PacketInfo" boolValues) + (assertValueOneOf "VNetHeader" boolValues) + ]; + in { - checkVlan = checkUnitConfig "VLAN" [ - (assertOnlyFields [ - "Id" - "GVRP" - "MVRP" - "LooseBinding" - "ReorderHeader" - ]) - (assertRange "Id" 0 4094) - (assertValueOneOf "GVRP" boolValues) - (assertValueOneOf "MVRP" boolValues) - (assertValueOneOf "LooseBinding" boolValues) - (assertValueOneOf "ReorderHeader" boolValues) - ]; + sectionNetdev = checkUnitConfig "Netdev" [ + (assertOnlyFields [ + "Description" + "Name" + "Kind" + "MTUBytes" + "MACAddress" + ]) + (assertHasField "Name") + (assertHasField "Kind") + (assertValueOneOf "Kind" [ + "bond" + "bridge" + "dummy" + "gre" + "gretap" + "erspan" + "ip6gre" + "ip6tnl" + "ip6gretap" + "ipip" + "ipvlan" + "macvlan" + "macvtap" + "sit" + "tap" + "tun" + "veth" + "vlan" + "vti" + "vti6" + "vxlan" + "geneve" + "l2tp" + "macsec" + "vrf" + "vcan" + "vxcan" + "wireguard" + "netdevsim" + "nlmon" + "fou" + "xfrm" + "ifb" + ]) + (assertByteFormat "MTUBytes") + (assertMacAddress "MACAddress") + ]; - checkMacvlan = checkUnitConfig "MACVLAN" [ - (assertOnlyFields [ - "Mode" - ]) - (assertValueOneOf "Mode" ["private" "vepa" "bridge" "passthru"]) - ]; + sectionVLAN = checkUnitConfig "VLAN" [ + (assertOnlyFields [ + "Id" + "GVRP" + "MVRP" + "LooseBinding" + "ReorderHeader" + ]) + (assertRange "Id" 0 4094) + (assertValueOneOf "GVRP" boolValues) + (assertValueOneOf "MVRP" boolValues) + (assertValueOneOf "LooseBinding" boolValues) + (assertValueOneOf "ReorderHeader" boolValues) + ]; - checkVxlan = checkUnitConfig "VXLAN" [ - (assertOnlyFields [ - "VNI" - "Remote" - "Local" - "Group" - "TOS" - "TTL" - "MacLearning" - "FDBAgeingSec" - "MaximumFDBEntries" - "ReduceARPProxy" - "L2MissNotification" - "L3MissNotification" - "RouteShortCircuit" - "UDPChecksum" - "UDP6ZeroChecksumTx" - "UDP6ZeroChecksumRx" - "RemoteChecksumTx" - "RemoteChecksumRx" - "GroupPolicyExtension" - "GenericProtocolExtension" - "DestinationPort" - "PortRange" - "FlowLabel" - "IPDoNotFragment" - ]) - (assertRange "VNI" 1 16777215) - (assertValueOneOf "MacLearning" boolValues) - (assertInt "MaximumFDBEntries") - (assertValueOneOf "ReduceARPProxy" boolValues) - (assertValueOneOf "L2MissNotification" boolValues) - (assertValueOneOf "L3MissNotification" boolValues) - (assertValueOneOf "RouteShortCircuit" boolValues) - (assertValueOneOf "UDPChecksum" boolValues) - (assertValueOneOf "UDP6ZeroChecksumTx" boolValues) - (assertValueOneOf "UDP6ZeroChecksumRx" boolValues) - (assertValueOneOf "RemoteChecksumTx" boolValues) - (assertValueOneOf "RemoteChecksumRx" boolValues) - (assertValueOneOf "GroupPolicyExtension" boolValues) - (assertValueOneOf "GenericProtocolExtension" boolValues) - (assertRange "FlowLabel" 0 1048575) - (assertValueOneOf "IPDoNotFragment" (boolValues + ["inherit"])) - ]; + sectionMACVLAN = checkUnitConfig "MACVLAN" [ + (assertOnlyFields [ + "Mode" + ]) + (assertValueOneOf "Mode" ["private" "vepa" "bridge" "passthru"]) + ]; - checkTunnel = checkUnitConfig "Tunnel" [ - (assertOnlyFields [ - "Local" - "Remote" - "TOS" - "TTL" - "DiscoverPathMTU" - "IPv6FlowLabel" - "CopyDSCP" - "EncapsulationLimit" - "Key" - "InputKey" - "OutputKey" - "Mode" - "Independent" - "AssignToLoopback" - "AllowLocalRemote" - "FooOverUDP" - "FOUDestinationPort" - "FOUSourcePort" - "Encapsulation" - "IPv6RapidDeploymentPrefix" - "ISATAP" - "SerializeTunneledPackets" - "ERSPANIndex" - ]) - (assertRange "TTL" 0 255) - (assertValueOneOf "DiscoverPathMTU" boolValues) - (assertValueOneOf "CopyDSCP" boolValues) - (assertValueOneOf "Mode" ["ip6ip6" "ipip6" "any"]) - (assertValueOneOf "Independent" boolValues) - (assertValueOneOf "AssignToLoopback" boolValues) - (assertValueOneOf "AllowLocalRemote" boolValues) - (assertValueOneOf "FooOverUDP" boolValues) - (assertPort "FOUDestinationPort") - (assertPort "FOUSourcePort") - (assertValueOneOf "Encapsulation" ["FooOverUDP" "GenericUDPEncapsulation"]) - (assertValueOneOf "ISATAP" boolValues) - (assertValueOneOf "SerializeTunneledPackets" boolValues) - (assertRange "ERSPANIndex" 1 1048575) - ]; + sectionVXLAN = checkUnitConfig "VXLAN" [ + (assertOnlyFields [ + "VNI" + "Remote" + "Local" + "Group" + "TOS" + "TTL" + "MacLearning" + "FDBAgeingSec" + "MaximumFDBEntries" + "ReduceARPProxy" + "L2MissNotification" + "L3MissNotification" + "RouteShortCircuit" + "UDPChecksum" + "UDP6ZeroChecksumTx" + "UDP6ZeroChecksumRx" + "RemoteChecksumTx" + "RemoteChecksumRx" + "GroupPolicyExtension" + "GenericProtocolExtension" + "DestinationPort" + "PortRange" + "FlowLabel" + "IPDoNotFragment" + ]) + (assertRange "VNI" 1 16777215) + (assertValueOneOf "MacLearning" boolValues) + (assertInt "MaximumFDBEntries") + (assertValueOneOf "ReduceARPProxy" boolValues) + (assertValueOneOf "L2MissNotification" boolValues) + (assertValueOneOf "L3MissNotification" boolValues) + (assertValueOneOf "RouteShortCircuit" boolValues) + (assertValueOneOf "UDPChecksum" boolValues) + (assertValueOneOf "UDP6ZeroChecksumTx" boolValues) + (assertValueOneOf "UDP6ZeroChecksumRx" boolValues) + (assertValueOneOf "RemoteChecksumTx" boolValues) + (assertValueOneOf "RemoteChecksumRx" boolValues) + (assertValueOneOf "GroupPolicyExtension" boolValues) + (assertValueOneOf "GenericProtocolExtension" boolValues) + (assertRange "FlowLabel" 0 1048575) + (assertValueOneOf "IPDoNotFragment" (boolValues + ["inherit"])) + ]; - checkPeer = checkUnitConfig "Peer" [ - (assertOnlyFields [ - "Name" - "MACAddress" - ]) - (assertMacAddress "MACAddress") - ]; + sectionTunnel = checkUnitConfig "Tunnel" [ + (assertOnlyFields [ + "Local" + "Remote" + "TOS" + "TTL" + "DiscoverPathMTU" + "IPv6FlowLabel" + "CopyDSCP" + "EncapsulationLimit" + "Key" + "InputKey" + "OutputKey" + "Mode" + "Independent" + "AssignToLoopback" + "AllowLocalRemote" + "FooOverUDP" + "FOUDestinationPort" + "FOUSourcePort" + "Encapsulation" + "IPv6RapidDeploymentPrefix" + "ISATAP" + "SerializeTunneledPackets" + "ERSPANIndex" + ]) + (assertRange "TTL" 0 255) + (assertValueOneOf "DiscoverPathMTU" boolValues) + (assertValueOneOf "CopyDSCP" boolValues) + (assertValueOneOf "Mode" ["ip6ip6" "ipip6" "any"]) + (assertValueOneOf "Independent" boolValues) + (assertValueOneOf "AssignToLoopback" boolValues) + (assertValueOneOf "AllowLocalRemote" boolValues) + (assertValueOneOf "FooOverUDP" boolValues) + (assertPort "FOUDestinationPort") + (assertPort "FOUSourcePort") + (assertValueOneOf "Encapsulation" ["FooOverUDP" "GenericUDPEncapsulation"]) + (assertValueOneOf "ISATAP" boolValues) + (assertValueOneOf "SerializeTunneledPackets" boolValues) + (assertRange "ERSPANIndex" 1 1048575) + ]; - tunTapChecks = [ - (assertOnlyFields [ - "MultiQueue" - "PacketInfo" - "VNetHeader" - "User" - "Group" - ]) - (assertValueOneOf "MultiQueue" boolValues) - (assertValueOneOf "PacketInfo" boolValues) - (assertValueOneOf "VNetHeader" boolValues) - ]; + sectionPeer = checkUnitConfig "Peer" [ + (assertOnlyFields [ + "Name" + "MACAddress" + ]) + (assertMacAddress "MACAddress") + ]; - checkTun = checkUnitConfig "Tun" tunTapChecks; + sectionTun = checkUnitConfig "Tun" tunChecks; - checkTap = checkUnitConfig "Tap" tunTapChecks; + sectionTap = checkUnitConfig "Tap" tunChecks; - checkBond = checkUnitConfig "Bond" [ - (assertOnlyFields [ - "Mode" - "TransmitHashPolicy" - "LACPTransmitRate" - "MIIMonitorSec" - "UpDelaySec" - "DownDelaySec" - "LearnPacketIntervalSec" - "AdSelect" - "AdActorSystemPriority" - "AdUserPortKey" - "AdActorSystem" - "FailOverMACPolicy" - "ARPValidate" - "ARPIntervalSec" - "ARPIPTargets" - "ARPAllTargets" - "PrimaryReselectPolicy" - "ResendIGMP" - "PacketsPerSlave" - "GratuitousARP" - "AllSlavesActive" - "DynamicTransmitLoadBalancing" - "MinLinks" - ]) - (assertValueOneOf "Mode" [ - "balance-rr" - "active-backup" - "balance-xor" - "broadcast" - "802.3ad" - "balance-tlb" - "balance-alb" - ]) - (assertValueOneOf "TransmitHashPolicy" [ - "layer2" - "layer3+4" - "layer2+3" - "encap2+3" - "encap3+4" - ]) - (assertValueOneOf "LACPTransmitRate" ["slow" "fast"]) - (assertValueOneOf "AdSelect" ["stable" "bandwidth" "count"]) - (assertRange "AdActorSystemPriority" 1 65535) - (assertRange "AdUserPortKey" 0 1023) - (assertValueOneOf "FailOverMACPolicy" ["none" "active" "follow"]) - (assertValueOneOf "ARPValidate" ["none" "active" "backup" "all"]) - (assertValueOneOf "ARPAllTargets" ["any" "all"]) - (assertValueOneOf "PrimaryReselectPolicy" ["always" "better" "failure"]) - (assertRange "ResendIGMP" 0 255) - (assertRange "PacketsPerSlave" 0 65535) - (assertRange "GratuitousARP" 0 255) - (assertValueOneOf "AllSlavesActive" boolValues) - (assertValueOneOf "DynamicTransmitLoadBalancing" boolValues) - (assertInt "MinLinks") - (assertMinimum "MinLinks" 0) - ]; + # NOTE The PrivateKey directive is missing on purpose here, please + # do not add it to this list. The nix store is world-readable let's + # refrain ourselves from providing a footgun. + sectionWireGuard = checkUnitConfig "WireGuard" [ + (assertOnlyFields [ + "PrivateKeyFile" + "ListenPort" + "FirewallMark" + ]) + # The following check won't work on nix <= 2.2 + # see https://github.com/NixOS/nix/pull/2378 + # + # Add this again when we'll have drop the + # nix < 2.2 support. + # (assertRange "FirewallMark" 1 4294967295) + ]; - checkXfrm = checkUnitConfig "Xfrm" [ - (assertOnlyFields [ - "InterfaceId" - "Independent" - ]) - # The following check won't work on nix <= 2.2 - # see https://github.com/NixOS/nix/pull/2378 - # - # Add this again when we'll have drop the - # nix < 2.2 support. - # (assertRange "InterfaceId" 1 4294967295) - (assertValueOneOf "Independent" boolValues) - ]; + # NOTE The PresharedKey directive is missing on purpose here, please + # do not add it to this list. The nix store is world-readable,let's + # refrain ourselves from providing a footgun. + sectionWireGuardPeer = checkUnitConfig "WireGuardPeer" [ + (assertOnlyFields [ + "PublicKey" + "PresharedKeyFile" + "AllowedIPs" + "Endpoint" + "PersistentKeepalive" + ]) + (assertRange "PersistentKeepalive" 0 65535) + ]; - checkNetwork = checkUnitConfig "Network" [ - (assertOnlyFields [ - "Description" - "DHCP" - "DHCPServer" - "LinkLocalAddressing" - "IPv4LLRoute" - "DefaultRouteOnDevice" - "IPv6Token" - "LLMNR" - "MulticastDNS" - "DNSOverTLS" - "DNSSEC" - "DNSSECNegativeTrustAnchors" - "LLDP" - "EmitLLDP" - "BindCarrier" - "Address" - "Gateway" - "DNS" - "Domains" - "DNSDefaultRoute" - "NTP" - "IPForward" - "IPMasquerade" - "IPv6PrivacyExtensions" - "IPv6AcceptRA" - "IPv6DuplicateAddressDetection" - "IPv6HopLimit" - "IPv4ProxyARP" - "IPv6ProxyNDP" - "IPv6ProxyNDPAddress" - "IPv6PrefixDelegation" - "IPv6MTUBytes" - "Bridge" - "Bond" - "VRF" - "VLAN" - "IPVLAN" - "MACVLAN" - "VXLAN" - "Tunnel" - "MACsec" - "ActiveSlave" - "PrimarySlave" - "ConfigureWithoutCarrier" - "IgnoreCarrierLoss" - "Xfrm" - "KeepConfiguration" - ]) - # Note: For DHCP the values both, none, v4, v6 are deprecated - (assertValueOneOf "DHCP" ["yes" "no" "ipv4" "ipv6"]) - (assertValueOneOf "DHCPServer" boolValues) - (assertValueOneOf "LinkLocalAddressing" ["yes" "no" "ipv4" "ipv6" "fallback" "ipv4-fallback"]) - (assertValueOneOf "IPv4LLRoute" boolValues) - (assertValueOneOf "DefaultRouteOnDevice" boolValues) - (assertValueOneOf "LLMNR" (boolValues ++ ["resolve"])) - (assertValueOneOf "MulticastDNS" (boolValues ++ ["resolve"])) - (assertValueOneOf "DNSOverTLS" (boolValues ++ ["opportunistic"])) - (assertValueOneOf "DNSSEC" (boolValues ++ ["allow-downgrade"])) - (assertValueOneOf "LLDP" (boolValues ++ ["routers-only"])) - (assertValueOneOf "EmitLLDP" (boolValues ++ ["nearest-bridge" "non-tpmr-bridge" "customer-bridge"])) - (assertValueOneOf "DNSDefaultRoute" boolValues) - (assertValueOneOf "IPForward" (boolValues ++ ["ipv4" "ipv6"])) - (assertValueOneOf "IPMasquerade" boolValues) - (assertValueOneOf "IPv6PrivacyExtensions" (boolValues ++ ["prefer-public" "kernel"])) - (assertValueOneOf "IPv6AcceptRA" boolValues) - (assertInt "IPv6DuplicateAddressDetection") - (assertMinimum "IPv6DuplicateAddressDetection" 0) - (assertInt "IPv6HopLimit") - (assertMinimum "IPv6HopLimit" 0) - (assertValueOneOf "IPv4ProxyARP" boolValues) - (assertValueOneOf "IPv6ProxyNDP" boolValues) - (assertValueOneOf "IPv6PrefixDelegation" ["static" "dhcpv6" "yes" "false"]) - (assertByteFormat "IPv6MTUBytes") - (assertValueOneOf "ActiveSlave" boolValues) - (assertValueOneOf "PrimarySlave" boolValues) - (assertValueOneOf "ConfigureWithoutCarrier" boolValues) - (assertValueOneOf "IgnoreCarrierLoss" boolValues) - (assertValueOneOf "KeepConfiguration" (boolValues ++ ["static" "dhcp-on-stop" "dhcp"])) - ]; + sectionBond = checkUnitConfig "Bond" [ + (assertOnlyFields [ + "Mode" + "TransmitHashPolicy" + "LACPTransmitRate" + "MIIMonitorSec" + "UpDelaySec" + "DownDelaySec" + "LearnPacketIntervalSec" + "AdSelect" + "AdActorSystemPriority" + "AdUserPortKey" + "AdActorSystem" + "FailOverMACPolicy" + "ARPValidate" + "ARPIntervalSec" + "ARPIPTargets" + "ARPAllTargets" + "PrimaryReselectPolicy" + "ResendIGMP" + "PacketsPerSlave" + "GratuitousARP" + "AllSlavesActive" + "DynamicTransmitLoadBalancing" + "MinLinks" + ]) + (assertValueOneOf "Mode" [ + "balance-rr" + "active-backup" + "balance-xor" + "broadcast" + "802.3ad" + "balance-tlb" + "balance-alb" + ]) + (assertValueOneOf "TransmitHashPolicy" [ + "layer2" + "layer3+4" + "layer2+3" + "encap2+3" + "encap3+4" + ]) + (assertValueOneOf "LACPTransmitRate" ["slow" "fast"]) + (assertValueOneOf "AdSelect" ["stable" "bandwidth" "count"]) + (assertRange "AdActorSystemPriority" 1 65535) + (assertRange "AdUserPortKey" 0 1023) + (assertValueOneOf "FailOverMACPolicy" ["none" "active" "follow"]) + (assertValueOneOf "ARPValidate" ["none" "active" "backup" "all"]) + (assertValueOneOf "ARPAllTargets" ["any" "all"]) + (assertValueOneOf "PrimaryReselectPolicy" ["always" "better" "failure"]) + (assertRange "ResendIGMP" 0 255) + (assertRange "PacketsPerSlave" 0 65535) + (assertRange "GratuitousARP" 0 255) + (assertValueOneOf "AllSlavesActive" boolValues) + (assertValueOneOf "DynamicTransmitLoadBalancing" boolValues) + (assertInt "MinLinks") + (assertMinimum "MinLinks" 0) + ]; - checkAddress = checkUnitConfig "Address" [ - (assertOnlyFields [ - "Address" - "Peer" - "Broadcast" - "Label" - "PreferredLifetime" - "Scope" - "HomeAddress" - "DuplicateAddressDetection" - "ManageTemporaryAddress" - "AddPrefixRoute" - "AutoJoin" - ]) - (assertHasField "Address") - (assertValueOneOf "PreferredLifetime" ["forever" "infinity" "0" 0]) - (assertValueOneOf "HomeAddress" boolValues) - (assertValueOneOf "DuplicateAddressDetection" ["ipv4" "ipv6" "both" "none"]) - (assertValueOneOf "ManageTemporaryAddress" boolValues) - (assertValueOneOf "AddPrefixRoute" boolValues) - (assertValueOneOf "AutoJoin" boolValues) - ]; + sectionXfrm = checkUnitConfig "Xfrm" [ + (assertOnlyFields [ + "InterfaceId" + "Independent" + ]) + # The following check won't work on nix <= 2.2 + # see https://github.com/NixOS/nix/pull/2378 + # + # Add this again when we'll have drop the + # nix < 2.2 support. + # (assertRange "InterfaceId" 1 4294967295) + (assertValueOneOf "Independent" boolValues) + ]; - checkRoutingPolicyRule = checkUnitConfig "RoutingPolicyRule" [ - (assertOnlyFields [ - "TypeOfService" - "From" - "To" - "FirewallMark" - "Table" - "Priority" - "IncomingInterface" - "OutgoingInterface" - "SourcePort" - "DestinationPort" - "IPProtocol" - "InvertRule" - "Family" - "User" - "SuppressPrefixLength" - ]) - (assertRange "TypeOfService" 0 255) - (assertInt "FirewallMark") - # The following check won't work on nix <= 2.2 - # see https://github.com/NixOS/nix/pull/2378 - # - # Add this again when we'll have drop the - # nix < 2.2 support. - # (assertRange "FirewallMark" 1 4294967295) - (assertMinimum "FirewallMark" 1) - (assertInt "Priority") - (assertPort "SourcePort") - (assertPort "DestinationPort") - (assertValueOneOf "InvertRule" boolValues) - (assertValueOneOf "Family" ["ipv4" "ipv6" "both"]) - (assertRange "SuppressPrefixLength" 0 128) - ]; + sectionVRF = checkUnitConfig "VRF" [ + (assertOnlyFields [ + "Table" + ]) + (assertInt "Table") + (assertMinimum "Table" 0) + ]; + }; - checkRoute = checkUnitConfig "Route" [ - (assertOnlyFields [ - "Gateway" - "GatewayOnLink" - "Destination" - "Source" - "Metric" - "IPv6Preference" - "Scope" - "PreferredSource" - "Table" - "Protocol" - "Type" - "InitialCongestionWindow" - "InitialAdvertisedReceiveWindow" - "QuickAck" - "FastOpenNoCookie" - "TTLPropagate" - "MTUBytes" - "IPServiceType" - "MultiPathRoute" - ]) - (assertValueOneOf "GatewayOnLink" boolValues) - (assertInt "Metric") - (assertValueOneOf "IPv6Preference" ["low" "medium" "high"]) - (assertValueOneOf "Scope" ["global" "site" "link" "host" "nowhere"]) - (assertValueOneOf "Type" [ - "unicast" - "local" - "broadcast" - "anycast" - "multicast" - "blackhole" - "unreachable" - "prohibit" - "throw" - "nat" - "xresolve" - ]) - (assertValueOneOf "QuickAck" boolValues) - (assertValueOneOf "FastOpenNoCookie" boolValues) - (assertValueOneOf "TTLPropagate" boolValues) - (assertByteFormat "MTUBytes") - (assertValueOneOf "IPServiceType" ["CS6" "CS4"]) - ]; + network = { - checkDhcpV4 = checkUnitConfig "DHCPv4" [ - (assertOnlyFields [ - "UseDNS" - "RoutesToDNS" - "UseNTP" - "UseSIP" - "UseMTU" - "Anonymize" - "SendHostname" - "UseHostname" - "Hostname" - "UseDomains" - "UseRoutes" - "UseTimezone" - "ClientIdentifier" - "VendorClassIdentifier" - "UserClass" - "MaxAttempts" - "DUIDType" - "DUIDRawData" - "IAID" - "RequestBroadcast" - "RouteMetric" - "RouteTable" - "RouteMTUBytes" - "ListenPort" - "SendRelease" - "SendDecline" - "BlackList" - "RequestOptions" - "SendOption" - ]) - (assertValueOneOf "UseDNS" boolValues) - (assertValueOneOf "RoutesToDNS" boolValues) - (assertValueOneOf "UseNTP" boolValues) - (assertValueOneOf "UseSIP" boolValues) - (assertValueOneOf "UseMTU" boolValues) - (assertValueOneOf "Anonymize" boolValues) - (assertValueOneOf "SendHostname" boolValues) - (assertValueOneOf "UseHostname" boolValues) - (assertValueOneOf "UseDomains" (boolValues ++ ["route"])) - (assertValueOneOf "UseRoutes" boolValues) - (assertValueOneOf "UseTimezone" boolValues) - (assertValueOneOf "ClientIdentifier" ["mac" "duid" "duid-only"]) - (assertInt "IAID") - (assertValueOneOf "RequestBroadcast" boolValues) - (assertInt "RouteMetric") - (assertInt "RouteTable") - # The following check won't work on nix <= 2.2 - # see https://github.com/NixOS/nix/pull/2378 - # - # Add this again when we'll have drop the - # nix < 2.2 support. - # (assertRange "RouteTable" 0 4294967295) - (assertMinimum "RouteTable" 0) - (assertByteFormat "RouteMTUBytes") - (assertPort "ListenPort") - (assertValueOneOf "SendRelease" boolValues) - (assertValueOneOf "SendDecline" boolValues) - ]; + sectionLink = checkUnitConfig "Link" [ + (assertOnlyFields [ + "MACAddress" + "MTUBytes" + "ARP" + "Multicast" + "AllMulticast" + "Unmanaged" + "RequiredForOnline" + ]) + (assertMacAddress "MACAddress") + (assertByteFormat "MTUBytes") + (assertValueOneOf "ARP" boolValues) + (assertValueOneOf "Multicast" boolValues) + (assertValueOneOf "AllMulticast" boolValues) + (assertValueOneOf "Unmanaged" boolValues) + (assertValueOneOf "RequiredForOnline" (boolValues ++ [ + "missing" + "off" + "no-carrier" + "dormant" + "degraded-carrier" + "carrier" + "degraded" + "enslaved" + "routable" + ])) + ]; - checkDhcpV6 = checkUnitConfig "DHCPv6" [ - (assertOnlyFields [ - "UseDNS" - "UseNTP" - "RapidCommit" - "ForceDHCPv6PDOtherInformation" - "PrefixDelegationHint" - ]) - (assertValueOneOf "UseDNS" boolValues) - (assertValueOneOf "UseNTP" boolValues) - (assertValueOneOf "RapidCommit" boolValues) - (assertValueOneOf "ForceDHCPv6PDOtherInformation" boolValues) - ]; + sectionNetwork = checkUnitConfig "Network" [ + (assertOnlyFields [ + "Description" + "DHCP" + "DHCPServer" + "LinkLocalAddressing" + "IPv4LLRoute" + "DefaultRouteOnDevice" + "IPv6Token" + "LLMNR" + "MulticastDNS" + "DNSOverTLS" + "DNSSEC" + "DNSSECNegativeTrustAnchors" + "LLDP" + "EmitLLDP" + "BindCarrier" + "Address" + "Gateway" + "DNS" + "Domains" + "DNSDefaultRoute" + "NTP" + "IPForward" + "IPMasquerade" + "IPv6PrivacyExtensions" + "IPv6AcceptRA" + "IPv6DuplicateAddressDetection" + "IPv6HopLimit" + "IPv4ProxyARP" + "IPv6ProxyNDP" + "IPv6ProxyNDPAddress" + "IPv6PrefixDelegation" + "IPv6MTUBytes" + "Bridge" + "Bond" + "VRF" + "VLAN" + "IPVLAN" + "MACVLAN" + "VXLAN" + "Tunnel" + "MACsec" + "ActiveSlave" + "PrimarySlave" + "ConfigureWithoutCarrier" + "IgnoreCarrierLoss" + "Xfrm" + "KeepConfiguration" + ]) + # Note: For DHCP the values both, none, v4, v6 are deprecated + (assertValueOneOf "DHCP" ["yes" "no" "ipv4" "ipv6"]) + (assertValueOneOf "DHCPServer" boolValues) + (assertValueOneOf "LinkLocalAddressing" ["yes" "no" "ipv4" "ipv6" "fallback" "ipv4-fallback"]) + (assertValueOneOf "IPv4LLRoute" boolValues) + (assertValueOneOf "DefaultRouteOnDevice" boolValues) + (assertValueOneOf "LLMNR" (boolValues ++ ["resolve"])) + (assertValueOneOf "MulticastDNS" (boolValues ++ ["resolve"])) + (assertValueOneOf "DNSOverTLS" (boolValues ++ ["opportunistic"])) + (assertValueOneOf "DNSSEC" (boolValues ++ ["allow-downgrade"])) + (assertValueOneOf "LLDP" (boolValues ++ ["routers-only"])) + (assertValueOneOf "EmitLLDP" (boolValues ++ ["nearest-bridge" "non-tpmr-bridge" "customer-bridge"])) + (assertValueOneOf "DNSDefaultRoute" boolValues) + (assertValueOneOf "IPForward" (boolValues ++ ["ipv4" "ipv6"])) + (assertValueOneOf "IPMasquerade" boolValues) + (assertValueOneOf "IPv6PrivacyExtensions" (boolValues ++ ["prefer-public" "kernel"])) + (assertValueOneOf "IPv6AcceptRA" boolValues) + (assertInt "IPv6DuplicateAddressDetection") + (assertMinimum "IPv6DuplicateAddressDetection" 0) + (assertInt "IPv6HopLimit") + (assertMinimum "IPv6HopLimit" 0) + (assertValueOneOf "IPv4ProxyARP" boolValues) + (assertValueOneOf "IPv6ProxyNDP" boolValues) + (assertValueOneOf "IPv6PrefixDelegation" ["static" "dhcpv6" "yes" "false"]) + (assertByteFormat "IPv6MTUBytes") + (assertValueOneOf "ActiveSlave" boolValues) + (assertValueOneOf "PrimarySlave" boolValues) + (assertValueOneOf "ConfigureWithoutCarrier" boolValues) + (assertValueOneOf "IgnoreCarrierLoss" boolValues) + (assertValueOneOf "KeepConfiguration" (boolValues ++ ["static" "dhcp-on-stop" "dhcp"])) + ]; - checkIpv6PrefixDelegation = checkUnitConfig "IPv6PrefixDelegation" [ - (assertOnlyFields [ - "Managed" - "OtherInformation" - "RouterLifetimeSec" - "RouterPreference" - "EmitDNS" - "DNS" - "EmitDomains" - "Domains" - "DNSLifetimeSec" - ]) - (assertValueOneOf "Managed" boolValues) - (assertValueOneOf "OtherInformation" boolValues) - (assertValueOneOf "RouterPreference" ["high" "medium" "low" "normal" "default"]) - (assertValueOneOf "EmitDNS" boolValues) - (assertValueOneOf "EmitDomains" boolValues) - ]; + sectionAddress = checkUnitConfig "Address" [ + (assertOnlyFields [ + "Address" + "Peer" + "Broadcast" + "Label" + "PreferredLifetime" + "Scope" + "HomeAddress" + "DuplicateAddressDetection" + "ManageTemporaryAddress" + "AddPrefixRoute" + "AutoJoin" + ]) + (assertHasField "Address") + (assertValueOneOf "PreferredLifetime" ["forever" "infinity" "0" 0]) + (assertValueOneOf "HomeAddress" boolValues) + (assertValueOneOf "DuplicateAddressDetection" ["ipv4" "ipv6" "both" "none"]) + (assertValueOneOf "ManageTemporaryAddress" boolValues) + (assertValueOneOf "AddPrefixRoute" boolValues) + (assertValueOneOf "AutoJoin" boolValues) + ]; - checkIpv6Prefix = checkUnitConfig "IPv6Prefix" [ - (assertOnlyFields [ - "AddressAutoconfiguration" - "OnLink" - "Prefix" - "PreferredLifetimeSec" - "ValidLifetimeSec" - ]) - (assertValueOneOf "AddressAutoconfiguration" boolValues) - (assertValueOneOf "OnLink" boolValues) - ]; + sectionRoutingPolicyRule = checkUnitConfig "RoutingPolicyRule" [ + (assertOnlyFields [ + "TypeOfService" + "From" + "To" + "FirewallMark" + "Table" + "Priority" + "IncomingInterface" + "OutgoingInterface" + "SourcePort" + "DestinationPort" + "IPProtocol" + "InvertRule" + "Family" + "User" + "SuppressPrefixLength" + ]) + (assertRange "TypeOfService" 0 255) + (assertInt "FirewallMark") + # The following check won't work on nix <= 2.2 + # see https://github.com/NixOS/nix/pull/2378 + # + # Add this again when we'll have drop the + # nix < 2.2 support. + # (assertRange "FirewallMark" 1 4294967295) + (assertMinimum "FirewallMark" 1) + (assertInt "Priority") + (assertPort "SourcePort") + (assertPort "DestinationPort") + (assertValueOneOf "InvertRule" boolValues) + (assertValueOneOf "Family" ["ipv4" "ipv6" "both"]) + (assertRange "SuppressPrefixLength" 0 128) + ]; - checkDhcpServer = checkUnitConfig "DHCPServer" [ - (assertOnlyFields [ - "PoolOffset" - "PoolSize" - "DefaultLeaseTimeSec" - "MaxLeaseTimeSec" - "EmitDNS" - "DNS" - "EmitNTP" - "NTP" - "EmitSIP" - "SIP" - "EmitRouter" - "EmitTimezone" - "Timezone" - "SendOption" - ]) - (assertInt "PoolOffset") - (assertMinimum "PoolOffset" 0) - (assertInt "PoolSize") - (assertMinimum "PoolSize" 0) - (assertValueOneOf "EmitDNS" boolValues) - (assertValueOneOf "EmitNTP" boolValues) - (assertValueOneOf "EmitSIP" boolValues) - (assertValueOneOf "EmitRouter" boolValues) - (assertValueOneOf "EmitTimezone" boolValues) - ]; + sectionRoute = checkUnitConfig "Route" [ + (assertOnlyFields [ + "Gateway" + "GatewayOnLink" + "Destination" + "Source" + "Metric" + "IPv6Preference" + "Scope" + "PreferredSource" + "Table" + "Protocol" + "Type" + "InitialCongestionWindow" + "InitialAdvertisedReceiveWindow" + "QuickAck" + "FastOpenNoCookie" + "TTLPropagate" + "MTUBytes" + "IPServiceType" + "MultiPathRoute" + ]) + (assertValueOneOf "GatewayOnLink" boolValues) + (assertInt "Metric") + (assertValueOneOf "IPv6Preference" ["low" "medium" "high"]) + (assertValueOneOf "Scope" ["global" "site" "link" "host" "nowhere"]) + (assertValueOneOf "Type" [ + "unicast" + "local" + "broadcast" + "anycast" + "multicast" + "blackhole" + "unreachable" + "prohibit" + "throw" + "nat" + "xresolve" + ]) + (assertValueOneOf "QuickAck" boolValues) + (assertValueOneOf "FastOpenNoCookie" boolValues) + (assertValueOneOf "TTLPropagate" boolValues) + (assertByteFormat "MTUBytes") + (assertValueOneOf "IPServiceType" ["CS6" "CS4"]) + ]; - # .network files have a [Link] section with different options than in .link files - checkNetworkLink = checkUnitConfig "Link" [ - (assertOnlyFields [ - "MACAddress" - "MTUBytes" - "ARP" - "Multicast" - "AllMulticast" - "Unmanaged" - "RequiredForOnline" - ]) - (assertMacAddress "MACAddress") - (assertByteFormat "MTUBytes") - (assertValueOneOf "ARP" boolValues) - (assertValueOneOf "Multicast" boolValues) - (assertValueOneOf "AllMulticast" boolValues) - (assertValueOneOf "Unmanaged" boolValues) - (assertValueOneOf "RequiredForOnline" (boolValues ++ [ - "missing" - "off" - "no-carrier" - "dormant" - "degraded-carrier" - "carrier" - "degraded" - "enslaved" - "routable" - ])) - ]; + sectionDHCPv4 = checkUnitConfig "DHCPv4" [ + (assertOnlyFields [ + "UseDNS" + "RoutesToDNS" + "UseNTP" + "UseSIP" + "UseMTU" + "Anonymize" + "SendHostname" + "UseHostname" + "Hostname" + "UseDomains" + "UseRoutes" + "UseTimezone" + "ClientIdentifier" + "VendorClassIdentifier" + "UserClass" + "MaxAttempts" + "DUIDType" + "DUIDRawData" + "IAID" + "RequestBroadcast" + "RouteMetric" + "RouteTable" + "RouteMTUBytes" + "ListenPort" + "SendRelease" + "SendDecline" + "BlackList" + "RequestOptions" + "SendOption" + ]) + (assertValueOneOf "UseDNS" boolValues) + (assertValueOneOf "RoutesToDNS" boolValues) + (assertValueOneOf "UseNTP" boolValues) + (assertValueOneOf "UseSIP" boolValues) + (assertValueOneOf "UseMTU" boolValues) + (assertValueOneOf "Anonymize" boolValues) + (assertValueOneOf "SendHostname" boolValues) + (assertValueOneOf "UseHostname" boolValues) + (assertValueOneOf "UseDomains" (boolValues ++ ["route"])) + (assertValueOneOf "UseRoutes" boolValues) + (assertValueOneOf "UseTimezone" boolValues) + (assertValueOneOf "ClientIdentifier" ["mac" "duid" "duid-only"]) + (assertInt "IAID") + (assertValueOneOf "RequestBroadcast" boolValues) + (assertInt "RouteMetric") + (assertInt "RouteTable") + # The following check won't work on nix <= 2.2 + # see https://github.com/NixOS/nix/pull/2378 + # + # Add this again when we'll have drop the + # nix < 2.2 support. + # (assertRange "RouteTable" 0 4294967295) + (assertMinimum "RouteTable" 0) + (assertByteFormat "RouteMTUBytes") + (assertPort "ListenPort") + (assertValueOneOf "SendRelease" boolValues) + (assertValueOneOf "SendDecline" boolValues) + ]; + + sectionDHCPv6 = checkUnitConfig "DHCPv6" [ + (assertOnlyFields [ + "UseDNS" + "UseNTP" + "RapidCommit" + "ForceDHCPv6PDOtherInformation" + "PrefixDelegationHint" + ]) + (assertValueOneOf "UseDNS" boolValues) + (assertValueOneOf "UseNTP" boolValues) + (assertValueOneOf "RapidCommit" boolValues) + (assertValueOneOf "ForceDHCPv6PDOtherInformation" boolValues) + ]; + + sectionDHCPServer = checkUnitConfig "DHCPServer" [ + (assertOnlyFields [ + "PoolOffset" + "PoolSize" + "DefaultLeaseTimeSec" + "MaxLeaseTimeSec" + "EmitDNS" + "DNS" + "EmitNTP" + "NTP" + "EmitSIP" + "SIP" + "EmitRouter" + "EmitTimezone" + "Timezone" + "SendOption" + ]) + (assertInt "PoolOffset") + (assertMinimum "PoolOffset" 0) + (assertInt "PoolSize") + (assertMinimum "PoolSize" 0) + (assertValueOneOf "EmitDNS" boolValues) + (assertValueOneOf "EmitNTP" boolValues) + (assertValueOneOf "EmitSIP" boolValues) + (assertValueOneOf "EmitRouter" boolValues) + (assertValueOneOf "EmitTimezone" boolValues) + ]; + + sectionIPv6PrefixDelegation = checkUnitConfig "IPv6PrefixDelegation" [ + (assertOnlyFields [ + "Managed" + "OtherInformation" + "RouterLifetimeSec" + "RouterPreference" + "EmitDNS" + "DNS" + "EmitDomains" + "Domains" + "DNSLifetimeSec" + ]) + (assertValueOneOf "Managed" boolValues) + (assertValueOneOf "OtherInformation" boolValues) + (assertValueOneOf "RouterPreference" ["high" "medium" "low" "normal" "default"]) + (assertValueOneOf "EmitDNS" boolValues) + (assertValueOneOf "EmitDomains" boolValues) + ]; + + sectionIPv6Prefix = checkUnitConfig "IPv6Prefix" [ + (assertOnlyFields [ + "AddressAutoconfiguration" + "OnLink" + "Prefix" + "PreferredLifetimeSec" + "ValidLifetimeSec" + ]) + (assertValueOneOf "AddressAutoconfiguration" boolValues) + (assertValueOneOf "OnLink" boolValues) + ]; + + }; + }; commonNetworkOptions = { @@ -764,7 +777,7 @@ let linkConfig = mkOption { default = {}; example = { MACAddress = "00:ff:ee:aa:cc:dd"; }; - type = types.addCheck (types.attrsOf unitOption) checkLink; + type = types.addCheck (types.attrsOf unitOption) check.link.sectionLink; description = '' Each attribute in this set specifies an option in the [Link] section of the unit. See @@ -775,12 +788,28 @@ let }; + wireguardPeerOptions = { + options = { + wireguardPeerConfig = mkOption { + default = {}; + example = { }; + type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionWireGuardPeer; + description = '' + Each attribute in this set specifies an option in the + [WireGuardPeer] section of the unit. See + systemd.network + 5 for details. + ''; + }; + }; + }; + netdevOptions = commonNetworkOptions // { netdevConfig = mkOption { default = {}; example = { Name = "mybridge"; Kind = "bridge"; }; - type = types.addCheck (types.attrsOf unitOption) checkNetdev; + type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionNetdev; description = '' Each attribute in this set specifies an option in the [Netdev] section of the unit. See @@ -789,18 +818,87 @@ let ''; }; - vrfConfig = mkOption { + vlanConfig = mkOption { default = {}; - example = { Table = 2342; }; - type = types.addCheck (types.attrsOf unitOption) checkVRF; + example = { Id = 4; }; + type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionVLAN; description = '' Each attribute in this set specifies an option in the - [VRF] section of the unit. See + [VLAN] section of the unit. See + systemd.netdev + 5 for details. + ''; + }; + + macvlanConfig = mkOption { + default = {}; + example = { Mode = "private"; }; + type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionMACVLAN; + description = '' + Each attribute in this set specifies an option in the + [MACVLAN] section of the unit. See + systemd.netdev + 5 for details. + ''; + }; + + vxlanConfig = mkOption { + default = {}; + example = { Id = "4"; }; + type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionVXLAN; + description = '' + Each attribute in this set specifies an option in the + [VXLAN] section of the unit. See + systemd.netdev + 5 for details. + ''; + }; + + tunnelConfig = mkOption { + default = {}; + example = { Remote = "192.168.1.1"; }; + type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionTunnel; + description = '' + Each attribute in this set specifies an option in the + [Tunnel] section of the unit. See + systemd.netdev + 5 for details. + ''; + }; + + peerConfig = mkOption { + default = {}; + example = { Name = "veth2"; }; + type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionPeer; + description = '' + Each attribute in this set specifies an option in the + [Peer] section of the unit. See + systemd.netdev + 5 for details. + ''; + }; + + tunConfig = mkOption { + default = {}; + example = { User = "openvpn"; }; + type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionTun; + description = '' + Each attribute in this set specifies an option in the + [Tun] section of the unit. See + systemd.netdev + 5 for details. + ''; + }; + + tapConfig = mkOption { + default = {}; + example = { User = "openvpn"; }; + type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionTap; + description = '' + Each attribute in this set specifies an option in the + [Tap] section of the unit. See systemd.netdev 5 for details. - A detailed explanation about how VRFs work can be found in the - kernel - docs. ''; }; @@ -811,7 +909,7 @@ let ListenPort = 51820; FwMark = 42; }; - type = types.addCheck (types.attrsOf unitOption) checkWireGuard; + type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionWireGuard; description = '' Each attribute in this set specifies an option in the [WireGuard] section of the unit. See @@ -844,94 +942,10 @@ let ''; }; - vlanConfig = mkOption { - default = {}; - example = { Id = 4; }; - type = types.addCheck (types.attrsOf unitOption) checkVlan; - description = '' - Each attribute in this set specifies an option in the - [VLAN] section of the unit. See - systemd.netdev - 5 for details. - ''; - }; - - macvlanConfig = mkOption { - default = {}; - example = { Mode = "private"; }; - type = types.addCheck (types.attrsOf unitOption) checkMacvlan; - description = '' - Each attribute in this set specifies an option in the - [MACVLAN] section of the unit. See - systemd.netdev - 5 for details. - ''; - }; - - vxlanConfig = mkOption { - default = {}; - example = { Id = "4"; }; - type = types.addCheck (types.attrsOf unitOption) checkVxlan; - description = '' - Each attribute in this set specifies an option in the - [VXLAN] section of the unit. See - systemd.netdev - 5 for details. - ''; - }; - - tunnelConfig = mkOption { - default = {}; - example = { Remote = "192.168.1.1"; }; - type = types.addCheck (types.attrsOf unitOption) checkTunnel; - description = '' - Each attribute in this set specifies an option in the - [Tunnel] section of the unit. See - systemd.netdev - 5 for details. - ''; - }; - - peerConfig = mkOption { - default = {}; - example = { Name = "veth2"; }; - type = types.addCheck (types.attrsOf unitOption) checkPeer; - description = '' - Each attribute in this set specifies an option in the - [Peer] section of the unit. See - systemd.netdev - 5 for details. - ''; - }; - - tunConfig = mkOption { - default = {}; - example = { User = "openvpn"; }; - type = types.addCheck (types.attrsOf unitOption) checkTun; - description = '' - Each attribute in this set specifies an option in the - [Tun] section of the unit. See - systemd.netdev - 5 for details. - ''; - }; - - tapConfig = mkOption { - default = {}; - example = { User = "openvpn"; }; - type = types.addCheck (types.attrsOf unitOption) checkTap; - description = '' - Each attribute in this set specifies an option in the - [Tap] section of the unit. See - systemd.netdev - 5 for details. - ''; - }; - bondConfig = mkOption { default = {}; example = { Mode = "802.3ad"; }; - type = types.addCheck (types.attrsOf unitOption) checkBond; + type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionBond; description = '' Each attribute in this set specifies an option in the [Bond] section of the unit. See @@ -943,7 +957,7 @@ let xfrmConfig = mkOption { default = {}; example = { InterfaceId = 1; }; - type = types.addCheck (types.attrsOf unitOption) checkXfrm; + type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionXfrm; description = '' Each attribute in this set specifies an option in the [Xfrm] section of the unit. See @@ -952,6 +966,21 @@ let ''; }; + vrfConfig = mkOption { + default = {}; + example = { Table = 2342; }; + type = types.addCheck (types.attrsOf unitOption) check.netdev.sectionVRF; + description = '' + Each attribute in this set specifies an option in the + [VRF] section of the unit. See + systemd.netdev + 5 for details. + A detailed explanation about how VRFs work can be found in the + kernel + docs. + ''; + }; + }; addressOptions = { @@ -959,7 +988,7 @@ let addressConfig = mkOption { default = {}; example = { Address = "192.168.0.100/24"; }; - type = types.addCheck (types.attrsOf unitOption) checkAddress; + type = types.addCheck (types.attrsOf unitOption) check.network.sectionAddress; description = '' Each attribute in this set specifies an option in the [Address] section of the unit. See @@ -975,7 +1004,7 @@ let routingPolicyRuleConfig = mkOption { default = { }; example = { routingPolicyRuleConfig = { Table = 10; IncomingInterface = "eth1"; Family = "both"; } ;}; - type = types.addCheck (types.attrsOf unitOption) checkRoutingPolicyRule; + type = types.addCheck (types.attrsOf unitOption) check.network.sectionRoutingPolicyRule; description = '' Each attribute in this set specifies an option in the [RoutingPolicyRule] section of the unit. See @@ -991,7 +1020,7 @@ let routeConfig = mkOption { default = {}; example = { Gateway = "192.168.0.1"; }; - type = types.addCheck (types.attrsOf unitOption) checkRoute; + type = types.addCheck (types.attrsOf unitOption) check.network.sectionRoute; description = '' Each attribute in this set specifies an option in the [Route] section of the unit. See @@ -1002,28 +1031,12 @@ let }; }; - wireguardPeerOptions = { - options = { - wireguardPeerConfig = mkOption { - default = {}; - example = { }; - type = types.addCheck (types.attrsOf unitOption) checkWireGuardPeer; - description = '' - Each attribute in this set specifies an option in the - [WireGuardPeer] section of the unit. See - systemd.network - 5 for details. - ''; - }; - }; - }; - ipv6PrefixOptions = { options = { ipv6PrefixConfig = mkOption { default = {}; example = { Prefix = "fd00::/64"; }; - type = types.addCheck (types.attrsOf unitOption) checkIpv6Prefix; + type = types.addCheck (types.attrsOf unitOption) check.network.sectionIPv6Prefix; description = '' Each attribute in this set specifies an option in the [IPv6Prefix] section of the unit. See @@ -1034,13 +1047,24 @@ let }; }; - networkOptions = commonNetworkOptions // { + linkConfig = mkOption { + default = {}; + example = { Unmanaged = true; }; + type = types.addCheck (types.attrsOf unitOption) check.network.sectionLink; + description = '' + Each attribute in this set specifies an option in the + [Link] section of the unit. See + systemd.network + 5 for details. + ''; + }; + networkConfig = mkOption { default = {}; example = { Description = "My Network"; }; - type = types.addCheck (types.attrsOf unitOption) checkNetwork; + type = types.addCheck (types.attrsOf unitOption) check.network.sectionNetwork; description = '' Each attribute in this set specifies an option in the [Network] section of the unit. See @@ -1059,7 +1083,7 @@ let dhcpV4Config = mkOption { default = {}; example = { UseDNS = true; UseRoutes = true; }; - type = types.addCheck (types.attrsOf unitOption) checkDhcpV4; + type = types.addCheck (types.attrsOf unitOption) check.network.sectionDHCPv4; description = '' Each attribute in this set specifies an option in the [DHCPv4] section of the unit. See @@ -1071,7 +1095,7 @@ let dhcpV6Config = mkOption { default = {}; example = { UseDNS = true; UseRoutes = true; }; - type = types.addCheck (types.attrsOf unitOption) checkDhcpV6; + type = types.addCheck (types.attrsOf unitOption) check.network.sectionDHCPv6; description = '' Each attribute in this set specifies an option in the [DHCPv6] section of the unit. See @@ -1080,10 +1104,22 @@ let ''; }; + dhcpServerConfig = mkOption { + default = {}; + example = { PoolOffset = 50; EmitDNS = false; }; + type = types.addCheck (types.attrsOf unitOption) check.network.sectionDHCPServer; + description = '' + Each attribute in this set specifies an option in the + [DHCPServer] section of the unit. See + systemd.network + 5 for details. + ''; + }; + ipv6PrefixDelegationConfig = mkOption { default = {}; example = { EmitDNS = true; Managed = true; OtherInformation = true; }; - type = types.addCheck (types.attrsOf unitOption) checkIpv6PrefixDelegation; + type = types.addCheck (types.attrsOf unitOption) check.network.sectionIPv6PrefixDelegation; description = '' Each attribute in this set specifies an option in the [IPv6PrefixDelegation] section of the unit. See @@ -1103,30 +1139,6 @@ let ''; }; - dhcpServerConfig = mkOption { - default = {}; - example = { PoolOffset = 50; EmitDNS = false; }; - type = types.addCheck (types.attrsOf unitOption) checkDhcpServer; - description = '' - Each attribute in this set specifies an option in the - [DHCPServer] section of the unit. See - systemd.network - 5 for details. - ''; - }; - - linkConfig = mkOption { - default = {}; - example = { Unmanaged = true; }; - type = types.addCheck (types.attrsOf unitOption) checkNetworkLink; - description = '' - Each attribute in this set specifies an option in the - [Link] section of the unit. See - systemd.network - 5 for details. - ''; - }; - name = mkOption { type = types.nullOr types.str; default = null; @@ -1374,6 +1386,16 @@ let ${attrsToSection def.tapConfig} ''} + ${optionalString (def.wireguardConfig != { }) '' + [WireGuard] + ${attrsToSection def.wireguardConfig} + + ''} + ${flip concatMapStrings def.wireguardPeers (x: '' + [WireGuardPeer] + ${attrsToSection x.wireguardPeerConfig} + + '')} ${optionalString (def.bondConfig != { }) '' [Bond] ${attrsToSection def.bondConfig} @@ -1389,16 +1411,6 @@ let ${attrsToSection def.vrfConfig} ''} - ${optionalString (def.wireguardConfig != { }) '' - [WireGuard] - ${attrsToSection def.wireguardConfig} - - ''} - ${flip concatMapStrings def.wireguardPeers (x: '' - [WireGuardPeer] - ${attrsToSection x.wireguardPeerConfig} - - '')} ${def.extraConfig} ''; }; @@ -1428,6 +1440,21 @@ let ${concatStringsSep "\n" (map (s: "Tunnel=${s}") def.tunnel)} ${concatStringsSep "\n" (map (s: "Xfrm=${s}") def.xfrm)} + ${flip concatMapStrings def.addresses (x: '' + [Address] + ${attrsToSection x.addressConfig} + + '')} + ${flip concatMapStrings def.routingPolicyRules (x: '' + [RoutingPolicyRule] + ${attrsToSection x.routingPolicyRuleConfig} + + '')} + ${flip concatMapStrings def.routes (x: '' + [Route] + ${attrsToSection x.routeConfig} + + '')} ${optionalString (def.dhcpV4Config != { }) '' [DHCPv4] ${attrsToSection def.dhcpV4Config} @@ -1437,6 +1464,11 @@ let [DHCPv6] ${attrsToSection def.dhcpV6Config} + ''} + ${optionalString (def.dhcpServerConfig != { }) '' + [DHCPServer] + ${attrsToSection def.dhcpServerConfig} + ''} ${optionalString (def.ipv6PrefixDelegationConfig != {}) '' [IPv6PrefixDelegation] @@ -1447,26 +1479,6 @@ let [IPv6Prefix] ${attrsToSection x.ipv6PrefixConfig} - '')} - ${optionalString (def.dhcpServerConfig != { }) '' - [DHCPServer] - ${attrsToSection def.dhcpServerConfig} - - ''} - ${flip concatMapStrings def.addresses (x: '' - [Address] - ${attrsToSection x.addressConfig} - - '')} - ${flip concatMapStrings def.routes (x: '' - [Route] - ${attrsToSection x.routeConfig} - - '')} - ${flip concatMapStrings def.routingPolicyRules (x: '' - [RoutingPolicyRule] - ${attrsToSection x.routingPolicyRuleConfig} - '')} ${def.extraConfig} ''; From 6e1a9bbd9b363cfbe85bca5f7b6f48d8735712f9 Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Wed, 1 Jul 2020 19:27:49 +0200 Subject: [PATCH 009/143] nixos/networkd: delete unnecessary new lines in config files --- nixos/modules/system/boot/networkd.nix | 244 +++++++++++++------------ 1 file changed, 123 insertions(+), 121 deletions(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 1ac671d5f30e..84aaa34c3bb7 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -1328,160 +1328,162 @@ let }; }; - commonMatchText = def: optionalString (def.matchConfig != {}) '' + commonMatchText = def: optionalString (def.matchConfig != { }) '' [Match] ${attrsToSection def.matchConfig} ''; linkToUnit = name: def: { inherit (def) enable; - text = commonMatchText def + - '' + text = commonMatchText def + + '' [Link] ${attrsToSection def.linkConfig} - - ${def.extraConfig} - ''; + '' + + def.extraConfig; }; netdevToUnit = name: def: { inherit (def) enable; - text = commonMatchText def + - '' + text = commonMatchText def + + '' [NetDev] ${attrsToSection def.netdevConfig} - - ${optionalString (def.vlanConfig != { }) '' - [VLAN] - ${attrsToSection def.vlanConfig} - - ''} - ${optionalString (def.macvlanConfig != { }) '' - [MACVLAN] - ${attrsToSection def.macvlanConfig} - - ''} - ${optionalString (def.vxlanConfig != { }) '' - [VXLAN] - ${attrsToSection def.vxlanConfig} - - ''} - ${optionalString (def.tunnelConfig != { }) '' - [Tunnel] - ${attrsToSection def.tunnelConfig} - - ''} - ${optionalString (def.peerConfig != { }) '' - [Peer] - ${attrsToSection def.peerConfig} - - ''} - ${optionalString (def.tunConfig != { }) '' - [Tun] - ${attrsToSection def.tunConfig} - - ''} - ${optionalString (def.tapConfig != { }) '' - [Tap] - ${attrsToSection def.tapConfig} - - ''} - ${optionalString (def.wireguardConfig != { }) '' - [WireGuard] - ${attrsToSection def.wireguardConfig} - - ''} - ${flip concatMapStrings def.wireguardPeers (x: '' - [WireGuardPeer] - ${attrsToSection x.wireguardPeerConfig} - - '')} - ${optionalString (def.bondConfig != { }) '' - [Bond] - ${attrsToSection def.bondConfig} - - ''} - ${optionalString (def.xfrmConfig != { }) '' - [Xfrm] - ${attrsToSection def.xfrmConfig} - - ''} - ${optionalString (def.vrfConfig != { }) '' - [VRF] - ${attrsToSection def.vrfConfig} - - ''} - ${def.extraConfig} - ''; + '' + + optionalString (def.vlanConfig != { }) '' + [VLAN] + ${attrsToSection def.vlanConfig} + '' + + optionalString (def.macvlanConfig != { }) '' + [MACVLAN] + ${attrsToSection def.macvlanConfig} + '' + + optionalString (def.vxlanConfig != { }) '' + [VXLAN] + ${attrsToSection def.vxlanConfig} + '' + + optionalString (def.tunnelConfig != { }) '' + [Tunnel] + ${attrsToSection def.tunnelConfig} + '' + + optionalString (def.peerConfig != { }) '' + [Peer] + ${attrsToSection def.peerConfig} + '' + + optionalString (def.tunConfig != { }) '' + [Tun] + ${attrsToSection def.tunConfig} + '' + + optionalString (def.tapConfig != { }) '' + [Tap] + ${attrsToSection def.tapConfig} + '' + + optionalString (def.wireguardConfig != { }) '' + [WireGuard] + ${attrsToSection def.wireguardConfig} + '' + + flip concatMapStrings def.wireguardPeers (x: '' + [WireGuardPeer] + ${attrsToSection x.wireguardPeerConfig} + '') + + optionalString (def.bondConfig != { }) '' + [Bond] + ${attrsToSection def.bondConfig} + '' + + optionalString (def.xfrmConfig != { }) '' + [Xfrm] + ${attrsToSection def.xfrmConfig} + '' + + optionalString (def.vrfConfig != { }) '' + [VRF] + ${attrsToSection def.vrfConfig} + '' + + def.extraConfig; }; networkToUnit = name: def: { inherit (def) enable; - text = commonMatchText def + + text = commonMatchText def + + optionalString (def.linkConfig != { }) '' + [Link] + ${attrsToSection def.linkConfig} '' - ${optionalString (def.linkConfig != { }) '' - [Link] - ${attrsToSection def.linkConfig} - - ''} - + + '' [Network] - ${attrsToSection def.networkConfig} + '' + + attrsToSection def.networkConfig + + optionalString (def.address != [ ]) '' ${concatStringsSep "\n" (map (s: "Address=${s}") def.address)} + '' + + optionalString (def.gateway != [ ]) '' ${concatStringsSep "\n" (map (s: "Gateway=${s}") def.gateway)} + '' + + optionalString (def.dns != [ ]) '' ${concatStringsSep "\n" (map (s: "DNS=${s}") def.dns)} + '' + + optionalString (def.ntp != [ ]) '' ${concatStringsSep "\n" (map (s: "NTP=${s}") def.ntp)} + '' + + optionalString (def.bridge != [ ]) '' ${concatStringsSep "\n" (map (s: "Bridge=${s}") def.bridge)} + '' + + optionalString (def.bond != [ ]) '' ${concatStringsSep "\n" (map (s: "Bond=${s}") def.bond)} + '' + + optionalString (def.vrf != [ ]) '' ${concatStringsSep "\n" (map (s: "VRF=${s}") def.vrf)} + '' + + optionalString (def.vlan != [ ]) '' ${concatStringsSep "\n" (map (s: "VLAN=${s}") def.vlan)} + '' + + optionalString (def.macvlan != [ ]) '' ${concatStringsSep "\n" (map (s: "MACVLAN=${s}") def.macvlan)} + '' + + optionalString (def.vxlan != [ ]) '' ${concatStringsSep "\n" (map (s: "VXLAN=${s}") def.vxlan)} + '' + + optionalString (def.tunnel != [ ]) '' ${concatStringsSep "\n" (map (s: "Tunnel=${s}") def.tunnel)} + '' + + optionalString (def.xfrm != [ ]) '' ${concatStringsSep "\n" (map (s: "Xfrm=${s}") def.xfrm)} + '' + + '' - ${flip concatMapStrings def.addresses (x: '' - [Address] - ${attrsToSection x.addressConfig} - - '')} - ${flip concatMapStrings def.routingPolicyRules (x: '' - [RoutingPolicyRule] - ${attrsToSection x.routingPolicyRuleConfig} - - '')} - ${flip concatMapStrings def.routes (x: '' - [Route] - ${attrsToSection x.routeConfig} - - '')} - ${optionalString (def.dhcpV4Config != { }) '' - [DHCPv4] - ${attrsToSection def.dhcpV4Config} - - ''} - ${optionalString (def.dhcpV6Config != {}) '' - [DHCPv6] - ${attrsToSection def.dhcpV6Config} - - ''} - ${optionalString (def.dhcpServerConfig != { }) '' - [DHCPServer] - ${attrsToSection def.dhcpServerConfig} - - ''} - ${optionalString (def.ipv6PrefixDelegationConfig != {}) '' - [IPv6PrefixDelegation] - ${attrsToSection def.ipv6PrefixDelegationConfig} - - ''} - ${flip concatMapStrings def.ipv6Prefixes (x: '' - [IPv6Prefix] - ${attrsToSection x.ipv6PrefixConfig} - - '')} - ${def.extraConfig} - ''; + '' + + flip concatMapStrings def.addresses (x: '' + [Address] + ${attrsToSection x.addressConfig} + '') + + flip concatMapStrings def.routingPolicyRules (x: '' + [RoutingPolicyRule] + ${attrsToSection x.routingPolicyRuleConfig} + '') + + flip concatMapStrings def.routes (x: '' + [Route] + ${attrsToSection x.routeConfig} + '') + + optionalString (def.dhcpV4Config != { }) '' + [DHCPv4] + ${attrsToSection def.dhcpV4Config} + '' + + optionalString (def.dhcpV6Config != { }) '' + [DHCPv6] + ${attrsToSection def.dhcpV6Config} + '' + + optionalString (def.dhcpServerConfig != { }) '' + [DHCPServer] + ${attrsToSection def.dhcpServerConfig} + '' + + optionalString (def.ipv6PrefixDelegationConfig != { }) '' + [IPv6PrefixDelegation] + ${attrsToSection def.ipv6PrefixDelegationConfig} + '' + + flip concatMapStrings def.ipv6Prefixes (x: '' + [IPv6Prefix] + ${attrsToSection x.ipv6PrefixConfig} + '') + + def.extraConfig; }; unitFiles = listToAttrs (map (name: { From 70407f09da97a4a4a79d1927c7074ca317f37d7f Mon Sep 17 00:00:00 2001 From: datafoo <34766150+datafoo@users.noreply.github.com> Date: Thu, 9 Jul 2020 10:12:22 +0200 Subject: [PATCH 010/143] nixos/networkd: use assertRange with 64bits integers --- nixos/modules/system/boot/networkd.nix | 62 ++++++++++---------------- 1 file changed, 23 insertions(+), 39 deletions(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 84aaa34c3bb7..47689b2a4700 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -59,22 +59,13 @@ let (assertValueOneOf "GenericReceiveOffload" boolValues) (assertValueOneOf "LargeReceiveOffload" boolValues) (assertInt "RxChannels") - # The following checks won't work on nix <= 2.2 - # see https://github.com/NixOS/nix/pull/2378 - # - # Add this again when we'll have drop the - # nix < 2.2 support. - # (assertRange "RxChannels" 1 4294967295) - (assertMinimum "RxChannels" 1) + (assertRange "RxChannels" 1 4294967295) (assertInt "TxChannels") - # (assertRange "TxChannels" 1 4294967295) - (assertMinimum "TxChannels" 1) + (assertRange "TxChannels" 1 4294967295) (assertInt "OtherChannels") - # (assertRange "OtherChannels" 1 4294967295) - (assertMinimum "OtherChannels" 1) + (assertRange "OtherChannels" 1 4294967295) (assertInt "CombinedChannels") - # (assertRange "CombinedChannels" 1 4294967295) - (assertMinimum "CombinedChannels" 1) + (assertRange "CombinedChannels" 1 4294967295) (assertInt "RxBufferSize") (assertInt "TxBufferSize") ]; @@ -153,6 +144,7 @@ let "LooseBinding" "ReorderHeader" ]) + (assertInt "Id") (assertRange "Id" 0 4094) (assertValueOneOf "GVRP" boolValues) (assertValueOneOf "MVRP" boolValues) @@ -194,6 +186,7 @@ let "FlowLabel" "IPDoNotFragment" ]) + (assertInt "VNI") (assertRange "VNI" 1 16777215) (assertValueOneOf "MacLearning" boolValues) (assertInt "MaximumFDBEntries") @@ -208,6 +201,7 @@ let (assertValueOneOf "RemoteChecksumRx" boolValues) (assertValueOneOf "GroupPolicyExtension" boolValues) (assertValueOneOf "GenericProtocolExtension" boolValues) + (assertInt "FlowLabel") (assertRange "FlowLabel" 0 1048575) (assertValueOneOf "IPDoNotFragment" (boolValues + ["inherit"])) ]; @@ -238,6 +232,7 @@ let "SerializeTunneledPackets" "ERSPANIndex" ]) + (assertInt "TTL") (assertRange "TTL" 0 255) (assertValueOneOf "DiscoverPathMTU" boolValues) (assertValueOneOf "CopyDSCP" boolValues) @@ -251,6 +246,7 @@ let (assertValueOneOf "Encapsulation" ["FooOverUDP" "GenericUDPEncapsulation"]) (assertValueOneOf "ISATAP" boolValues) (assertValueOneOf "SerializeTunneledPackets" boolValues) + (assertInt "ERSPANIndex") (assertRange "ERSPANIndex" 1 1048575) ]; @@ -275,12 +271,8 @@ let "ListenPort" "FirewallMark" ]) - # The following check won't work on nix <= 2.2 - # see https://github.com/NixOS/nix/pull/2378 - # - # Add this again when we'll have drop the - # nix < 2.2 support. - # (assertRange "FirewallMark" 1 4294967295) + (assertInt "FirewallMark") + (assertRange "FirewallMark" 1 4294967295) ]; # NOTE The PresharedKey directive is missing on purpose here, please @@ -294,6 +286,7 @@ let "Endpoint" "PersistentKeepalive" ]) + (assertInt "PersistentKeepalive") (assertRange "PersistentKeepalive" 0 65535) ]; @@ -341,14 +334,19 @@ let ]) (assertValueOneOf "LACPTransmitRate" ["slow" "fast"]) (assertValueOneOf "AdSelect" ["stable" "bandwidth" "count"]) + (assertInt "AdActorSystemPriority") (assertRange "AdActorSystemPriority" 1 65535) + (assertInt "AdUserPortKey") (assertRange "AdUserPortKey" 0 1023) (assertValueOneOf "FailOverMACPolicy" ["none" "active" "follow"]) (assertValueOneOf "ARPValidate" ["none" "active" "backup" "all"]) (assertValueOneOf "ARPAllTargets" ["any" "all"]) (assertValueOneOf "PrimaryReselectPolicy" ["always" "better" "failure"]) + (assertInt "ResendIGMP") (assertRange "ResendIGMP" 0 255) + (assertInt "PacketsPerSlave") (assertRange "PacketsPerSlave" 0 65535) + (assertInt "GratuitousARP") (assertRange "GratuitousARP" 0 255) (assertValueOneOf "AllSlavesActive" boolValues) (assertValueOneOf "DynamicTransmitLoadBalancing" boolValues) @@ -361,12 +359,8 @@ let "InterfaceId" "Independent" ]) - # The following check won't work on nix <= 2.2 - # see https://github.com/NixOS/nix/pull/2378 - # - # Add this again when we'll have drop the - # nix < 2.2 support. - # (assertRange "InterfaceId" 1 4294967295) + (assertInt "InterfaceId") + (assertRange "InterfaceId" 1 4294967295) (assertValueOneOf "Independent" boolValues) ]; @@ -533,20 +527,16 @@ let "User" "SuppressPrefixLength" ]) + (assertInt "TypeOfService") (assertRange "TypeOfService" 0 255) (assertInt "FirewallMark") - # The following check won't work on nix <= 2.2 - # see https://github.com/NixOS/nix/pull/2378 - # - # Add this again when we'll have drop the - # nix < 2.2 support. - # (assertRange "FirewallMark" 1 4294967295) - (assertMinimum "FirewallMark" 1) + (assertRange "FirewallMark" 1 4294967295) (assertInt "Priority") (assertPort "SourcePort") (assertPort "DestinationPort") (assertValueOneOf "InvertRule" boolValues) (assertValueOneOf "Family" ["ipv4" "ipv6" "both"]) + (assertInt "SuppressPrefixLength") (assertRange "SuppressPrefixLength" 0 128) ]; @@ -644,13 +634,7 @@ let (assertValueOneOf "RequestBroadcast" boolValues) (assertInt "RouteMetric") (assertInt "RouteTable") - # The following check won't work on nix <= 2.2 - # see https://github.com/NixOS/nix/pull/2378 - # - # Add this again when we'll have drop the - # nix < 2.2 support. - # (assertRange "RouteTable" 0 4294967295) - (assertMinimum "RouteTable" 0) + (assertRange "RouteTable" 0 4294967295) (assertByteFormat "RouteMTUBytes") (assertPort "ListenPort") (assertValueOneOf "SendRelease" boolValues) From 07076e9fe015489fcd1c67f37c0d750442c6f975 Mon Sep 17 00:00:00 2001 From: DavHau Date: Tue, 21 Jul 2020 07:05:07 +0000 Subject: [PATCH 011/143] nextcloud: configurable user and group, enabled nginx, improve setup --- nixos/modules/services/web-apps/nextcloud.nix | 46 +++++++++++++------ 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 328561dc8007..4c5e51a82855 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -6,6 +6,8 @@ let cfg = config.services.nextcloud; fpm = config.services.phpfpm.pools.nextcloud; + group = if cfg.nginx.enable then config.services.nginx.group else cfg.group; + phpPackage = let base = pkgs.php74; @@ -33,8 +35,8 @@ let #! ${pkgs.runtimeShell} cd ${cfg.package} sudo=exec - if [[ "$USER" != nextcloud ]]; then - sudo='exec /run/wrappers/bin/sudo -u nextcloud --preserve-env=NEXTCLOUD_CONFIG_DIR --preserve-env=OC_PASS' + if [[ "$USER" != ${cfg.user} ]]; then + sudo='exec /run/wrappers/bin/sudo -u ${cfg.user} --preserve-env=NEXTCLOUD_CONFIG_DIR --preserve-env=OC_PASS' fi export NEXTCLOUD_CONFIG_DIR="${cfg.home}/config" $sudo \ @@ -71,6 +73,19 @@ in { description = "Which package to use for the Nextcloud instance."; relatedPackages = [ "nextcloud17" "nextcloud18" "nextcloud19" ]; }; + user = mkOption { + type = types.str; + default = "nextcloud"; + description = "User of the nextcloud service"; + }; + group = mkOption { + type = with types; nullOr str; + description = '' + Set group for nextcloud related services. + This option cannot be used if is set. + In this case is used instead."; + ''; + }; maxUploadSize = mkOption { default = "512M"; @@ -93,7 +108,7 @@ in { nginx.enable = mkOption { type = types.bool; - default = false; + default = true; description = '' Whether to enable nginx virtual host management. Further nginx configuration can be done by adapting services.nginx.virtualHosts.<name>. @@ -167,7 +182,7 @@ in { }; dbuser = mkOption { type = types.nullOr types.str; - default = "nextcloud"; + default = cfg.user; description = "Database user."; }; dbpass = mkOption { @@ -322,6 +337,9 @@ in { && !(acfg.adminpass != null && acfg.adminpassFile != null)); message = "Please specify exactly one of adminpass or adminpassFile"; } + { assertion = cfg.nginx.enable -> (group == config.services.nginx.group); + message = "Nextcloud group cannot be set if nginx is used"; + } ]; warnings = [] @@ -468,11 +486,9 @@ in { script = '' chmod og+x ${cfg.home} ln -sf ${cfg.package}/apps ${cfg.home}/ - mkdir -p ${cfg.home}/config ${cfg.home}/data ${cfg.home}/store-apps + install -o ${cfg.user} -g ${group} -d ${cfg.home}/config ${cfg.home}/data ${cfg.home}/store-apps ln -sf ${overrideConfig} ${cfg.home}/config/override.config.php - chown -R nextcloud:nginx ${cfg.home}/config ${cfg.home}/data ${cfg.home}/store-apps - # Do not install if already installed if [[ ! -e ${cfg.home}/config/config.php ]]; then ${occInstallCmd} @@ -488,21 +504,21 @@ in { nextcloud-cron = { environment.NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config"; serviceConfig.Type = "oneshot"; - serviceConfig.User = "nextcloud"; + serviceConfig.User = cfg.user; serviceConfig.ExecStart = "${phpPackage}/bin/php -f ${cfg.package}/cron.php"; }; nextcloud-update-plugins = mkIf cfg.autoUpdateApps.enable { serviceConfig.Type = "oneshot"; serviceConfig.ExecStart = "${occ}/bin/nextcloud-occ app:update --all"; - serviceConfig.User = "nextcloud"; + serviceConfig.User = cfg.user; startAt = cfg.autoUpdateApps.startAt; }; }; services.phpfpm = { pools.nextcloud = { - user = "nextcloud"; - group = "nginx"; + user = cfg.user; + inherit group; phpOptions = phpOptionsStr; phpPackage = phpPackage; phpEnv = { @@ -510,16 +526,16 @@ in { PATH = "/run/wrappers/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/bin:/bin"; }; settings = mapAttrs (name: mkDefault) { - "listen.owner" = "nginx"; - "listen.group" = "nginx"; + "listen.owner" = cfg.user; + "listen.group" = group; } // cfg.poolSettings; extraConfig = cfg.poolConfig; }; }; - users.extraUsers.nextcloud = { + users.extraUsers.${cfg.user} = { home = "${cfg.home}"; - group = "nginx"; + inherit group; createHome = true; }; From 6ee30041327343137bab79cf924eac1a17ad0d5c Mon Sep 17 00:00:00 2001 From: DavHau Date: Sun, 26 Jul 2020 15:54:23 +0700 Subject: [PATCH 012/143] nextcloud improve user/group handling - remove optons cfg.user, cfg.groups - add option `serverUser` which is required when not using nginx - add `serverUser` to nextcloud group - set user/group to "nextcloud" for nextcloud services - make setup-service non-root --- nixos/modules/services/web-apps/nextcloud.nix | 47 +++++++++---------- 1 file changed, 22 insertions(+), 25 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 4c5e51a82855..0a184b45827d 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -7,6 +7,7 @@ let fpm = config.services.phpfpm.pools.nextcloud; group = if cfg.nginx.enable then config.services.nginx.group else cfg.group; + serverUser = if cfg.nginx.enable then config.services.nginx.user else cfg.serverUser; phpPackage = let @@ -35,8 +36,8 @@ let #! ${pkgs.runtimeShell} cd ${cfg.package} sudo=exec - if [[ "$USER" != ${cfg.user} ]]; then - sudo='exec /run/wrappers/bin/sudo -u ${cfg.user} --preserve-env=NEXTCLOUD_CONFIG_DIR --preserve-env=OC_PASS' + if [[ "$USER" != nextcloud ]]; then + sudo='exec /run/wrappers/bin/sudo -u nextcloud --preserve-env=NEXTCLOUD_CONFIG_DIR --preserve-env=OC_PASS' fi export NEXTCLOUD_CONFIG_DIR="${cfg.home}/config" $sudo \ @@ -73,18 +74,9 @@ in { description = "Which package to use for the Nextcloud instance."; relatedPackages = [ "nextcloud17" "nextcloud18" "nextcloud19" ]; }; - user = mkOption { + serverUser = mkOption { type = types.str; - default = "nextcloud"; - description = "User of the nextcloud service"; - }; - group = mkOption { - type = with types; nullOr str; - description = '' - Set group for nextcloud related services. - This option cannot be used if is set. - In this case is used instead."; - ''; + description = "Must be set to the user of the webserver if nginx is not used."; }; maxUploadSize = mkOption { @@ -182,7 +174,7 @@ in { }; dbuser = mkOption { type = types.nullOr types.str; - default = cfg.user; + default = "nextcloud"; description = "Database user."; }; dbpass = mkOption { @@ -337,8 +329,11 @@ in { && !(acfg.adminpass != null && acfg.adminpassFile != null)); message = "Please specify exactly one of adminpass or adminpassFile"; } - { assertion = cfg.nginx.enable -> (group == config.services.nginx.group); - message = "Nextcloud group cannot be set if nginx is used"; + { assertion = cfg.nginx.enable -> (cfg.serverUser == null); + message = "serverUser cannot be set if nginx is used"; + } + { assertion = ! cfg.nginx.enable -> ( hasAttr cfg.serverUser config.users.users); + message = "configured serverUser '${cfg.serverUser}' doesn't exist"; } ]; @@ -486,7 +481,7 @@ in { script = '' chmod og+x ${cfg.home} ln -sf ${cfg.package}/apps ${cfg.home}/ - install -o ${cfg.user} -g ${group} -d ${cfg.home}/config ${cfg.home}/data ${cfg.home}/store-apps + install -o nextcloud -g nextcloud -d ${cfg.home}/config ${cfg.home}/data ${cfg.home}/store-apps ln -sf ${overrideConfig} ${cfg.home}/config/override.config.php # Do not install if already installed @@ -500,25 +495,26 @@ in { ${occSetTrustedDomainsCmd} ''; serviceConfig.Type = "oneshot"; + serviceConfig.User = "nextcloud"; }; nextcloud-cron = { environment.NEXTCLOUD_CONFIG_DIR = "${cfg.home}/config"; serviceConfig.Type = "oneshot"; - serviceConfig.User = cfg.user; + serviceConfig.User = "nextcloud"; serviceConfig.ExecStart = "${phpPackage}/bin/php -f ${cfg.package}/cron.php"; }; nextcloud-update-plugins = mkIf cfg.autoUpdateApps.enable { serviceConfig.Type = "oneshot"; serviceConfig.ExecStart = "${occ}/bin/nextcloud-occ app:update --all"; - serviceConfig.User = cfg.user; + serviceConfig.User = "nextcloud"; startAt = cfg.autoUpdateApps.startAt; }; }; services.phpfpm = { pools.nextcloud = { - user = cfg.user; - inherit group; + user = "nextcloud"; + group = "nextcloud"; phpOptions = phpOptionsStr; phpPackage = phpPackage; phpEnv = { @@ -526,18 +522,19 @@ in { PATH = "/run/wrappers/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/bin:/bin"; }; settings = mapAttrs (name: mkDefault) { - "listen.owner" = cfg.user; - "listen.group" = group; + "listen.owner" = serverUser; + "listen.group" = config.users.users.${serverUser}.group; } // cfg.poolSettings; extraConfig = cfg.poolConfig; }; }; - users.extraUsers.${cfg.user} = { + users.users.nextcloud = { home = "${cfg.home}"; - inherit group; + group = "nextcloud"; createHome = true; }; + users.groups.nextcloud.members = [ "nextcloud" "${serverUser}" ]; environment.systemPackages = [ occ ]; } From fd9eb16b249aad1d5e231b8329035abfab5fc0eb Mon Sep 17 00:00:00 2001 From: DavHau Date: Mon, 27 Jul 2020 12:06:04 +0700 Subject: [PATCH 013/143] nextcloud: restrict web server support to nginx only --- nixos/modules/services/web-apps/nextcloud.nix | 229 ++++++++---------- 1 file changed, 100 insertions(+), 129 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 0a184b45827d..61722e6627d3 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -6,9 +6,6 @@ let cfg = config.services.nextcloud; fpm = config.services.phpfpm.pools.nextcloud; - group = if cfg.nginx.enable then config.services.nginx.group else cfg.group; - serverUser = if cfg.nginx.enable then config.services.nginx.user else cfg.serverUser; - phpPackage = let base = pkgs.php74; @@ -74,10 +71,6 @@ in { description = "Which package to use for the Nextcloud instance."; relatedPackages = [ "nextcloud17" "nextcloud18" "nextcloud19" ]; }; - serverUser = mkOption { - type = types.str; - description = "Must be set to the user of the webserver if nginx is not used."; - }; maxUploadSize = mkOption { default = "512M"; @@ -98,16 +91,6 @@ in { ''; }; - nginx.enable = mkOption { - type = types.bool; - default = true; - description = '' - Whether to enable nginx virtual host management. - Further nginx configuration can be done by adapting services.nginx.virtualHosts.<name>. - See for further information. - ''; - }; - webfinger = mkOption { type = types.bool; default = false; @@ -329,12 +312,6 @@ in { && !(acfg.adminpass != null && acfg.adminpassFile != null)); message = "Please specify exactly one of adminpass or adminpassFile"; } - { assertion = cfg.nginx.enable -> (cfg.serverUser == null); - message = "serverUser cannot be set if nginx is used"; - } - { assertion = ! cfg.nginx.enable -> ( hasAttr cfg.serverUser config.users.users); - message = "configured serverUser '${cfg.serverUser}' doesn't exist"; - } ]; warnings = [] @@ -522,8 +499,8 @@ in { PATH = "/run/wrappers/bin:/nix/var/nix/profiles/default/bin:/run/current-system/sw/bin:/usr/bin:/bin"; }; settings = mapAttrs (name: mkDefault) { - "listen.owner" = serverUser; - "listen.group" = config.users.users.${serverUser}.group; + "listen.owner" = config.services.nginx.user; + "listen.group" = config.users.users.${config.services.nginx.user}.group; } // cfg.poolSettings; extraConfig = cfg.poolConfig; }; @@ -534,117 +511,111 @@ in { group = "nextcloud"; createHome = true; }; - users.groups.nextcloud.members = [ "nextcloud" "${serverUser}" ]; + users.groups.nextcloud.members = [ "nextcloud" config.services.nginx.user ]; environment.systemPackages = [ occ ]; - } - - (mkIf cfg.nginx.enable { - services.nginx = { - enable = true; - virtualHosts = { - ${cfg.hostName} = { - root = cfg.package; - locations = { - "= /robots.txt" = { - priority = 100; - extraConfig = '' - allow all; - log_not_found off; - access_log off; - ''; - }; - "/" = { - priority = 200; - extraConfig = "rewrite ^ /index.php;"; - }; - "~ ^/store-apps" = { - priority = 201; - extraConfig = "root ${cfg.home};"; - }; - "= /.well-known/carddav" = { - priority = 210; - extraConfig = "return 301 $scheme://$host/remote.php/dav;"; - }; - "= /.well-known/caldav" = { - priority = 210; - extraConfig = "return 301 $scheme://$host/remote.php/dav;"; - }; - "~ ^\\/(?:build|tests|config|lib|3rdparty|templates|data)\\/" = { - priority = 300; - extraConfig = "deny all;"; - }; - "~ ^\\/(?:\\.|autotest|occ|issue|indie|db_|console)" = { - priority = 300; - extraConfig = "deny all;"; - }; - "~ ^\\/(?:index|remote|public|cron|core/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|ocs-provider\\/.+|ocm-provider\\/.+)\\.php(?:$|\\/)" = { - priority = 500; - extraConfig = '' - include ${config.services.nginx.package}/conf/fastcgi.conf; - fastcgi_split_path_info ^(.+\.php)(\\/.*)$; - try_files $fastcgi_script_name =404; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param HTTPS ${if cfg.https then "on" else "off"}; - fastcgi_param modHeadersAvailable true; - fastcgi_param front_controller_active true; - fastcgi_pass unix:${fpm.socket}; - fastcgi_intercept_errors on; - fastcgi_request_buffering off; - fastcgi_read_timeout 120s; - ''; - }; - "~ ^\\/(?:updater|ocs-provider|ocm-provider)(?:$|\\/)".extraConfig = '' - try_files $uri/ =404; - index index.php; - ''; - "~ \\.(?:css|js|woff2?|svg|gif)$".extraConfig = '' - try_files $uri /index.php$request_uri; - add_header Cache-Control "public, max-age=15778463"; - add_header X-Content-Type-Options nosniff; - add_header X-XSS-Protection "1; mode=block"; - add_header X-Robots-Tag none; - add_header X-Download-Options noopen; - add_header X-Permitted-Cross-Domain-Policies none; - add_header X-Frame-Options sameorigin; - add_header Referrer-Policy no-referrer; - access_log off; - ''; - "~ \\.(?:png|html|ttf|ico|jpg|jpeg|bcmap|mp4|webm)$".extraConfig = '' - try_files $uri /index.php$request_uri; - access_log off; - ''; - }; + + services.nginx.enable = true; + services.nginx.virtualHosts.${cfg.hostName} = { + root = cfg.package; + locations = { + "= /robots.txt" = { + priority = 100; extraConfig = '' - add_header X-Content-Type-Options nosniff; - add_header X-XSS-Protection "1; mode=block"; - add_header X-Robots-Tag none; - add_header X-Download-Options noopen; - add_header X-Permitted-Cross-Domain-Policies none; - add_header X-Frame-Options sameorigin; - add_header Referrer-Policy no-referrer; - add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always; - error_page 403 /core/templates/403.php; - error_page 404 /core/templates/404.php; - client_max_body_size ${cfg.maxUploadSize}; - fastcgi_buffers 64 4K; - fastcgi_hide_header X-Powered-By; - gzip on; - gzip_vary on; - gzip_comp_level 4; - gzip_min_length 256; - gzip_proxied expired no-cache no-store private no_last_modified no_etag auth; - gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy; - - ${optionalString cfg.webfinger '' - rewrite ^/.well-known/host-meta /public.php?service=host-meta last; - rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; - ''} + allow all; + log_not_found off; + access_log off; ''; }; + "/" = { + priority = 200; + extraConfig = "rewrite ^ /index.php;"; + }; + "~ ^/store-apps" = { + priority = 201; + extraConfig = "root ${cfg.home};"; + }; + "= /.well-known/carddav" = { + priority = 210; + extraConfig = "return 301 $scheme://$host/remote.php/dav;"; + }; + "= /.well-known/caldav" = { + priority = 210; + extraConfig = "return 301 $scheme://$host/remote.php/dav;"; + }; + "~ ^\\/(?:build|tests|config|lib|3rdparty|templates|data)\\/" = { + priority = 300; + extraConfig = "deny all;"; + }; + "~ ^\\/(?:\\.|autotest|occ|issue|indie|db_|console)" = { + priority = 300; + extraConfig = "deny all;"; + }; + "~ ^\\/(?:index|remote|public|cron|core/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|ocs-provider\\/.+|ocm-provider\\/.+)\\.php(?:$|\\/)" = { + priority = 500; + extraConfig = '' + include ${config.services.nginx.package}/conf/fastcgi.conf; + fastcgi_split_path_info ^(.+\.php)(\\/.*)$; + try_files $fastcgi_script_name =404; + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param HTTPS ${if cfg.https then "on" else "off"}; + fastcgi_param modHeadersAvailable true; + fastcgi_param front_controller_active true; + fastcgi_pass unix:${fpm.socket}; + fastcgi_intercept_errors on; + fastcgi_request_buffering off; + fastcgi_read_timeout 120s; + ''; + }; + "~ ^\\/(?:updater|ocs-provider|ocm-provider)(?:$|\\/)".extraConfig = '' + try_files $uri/ =404; + index index.php; + ''; + "~ \\.(?:css|js|woff2?|svg|gif)$".extraConfig = '' + try_files $uri /index.php$request_uri; + add_header Cache-Control "public, max-age=15778463"; + add_header X-Content-Type-Options nosniff; + add_header X-XSS-Protection "1; mode=block"; + add_header X-Robots-Tag none; + add_header X-Download-Options noopen; + add_header X-Permitted-Cross-Domain-Policies none; + add_header X-Frame-Options sameorigin; + add_header Referrer-Policy no-referrer; + access_log off; + ''; + "~ \\.(?:png|html|ttf|ico|jpg|jpeg|bcmap|mp4|webm)$".extraConfig = '' + try_files $uri /index.php$request_uri; + access_log off; + ''; }; + extraConfig = '' + add_header X-Content-Type-Options nosniff; + add_header X-XSS-Protection "1; mode=block"; + add_header X-Robots-Tag none; + add_header X-Download-Options noopen; + add_header X-Permitted-Cross-Domain-Policies none; + add_header X-Frame-Options sameorigin; + add_header Referrer-Policy no-referrer; + add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always; + error_page 403 /core/templates/403.php; + error_page 404 /core/templates/404.php; + client_max_body_size ${cfg.maxUploadSize}; + fastcgi_buffers 64 4K; + fastcgi_hide_header X-Powered-By; + gzip on; + gzip_vary on; + gzip_comp_level 4; + gzip_min_length 256; + gzip_proxied expired no-cache no-store private no_last_modified no_etag auth; + gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy; + + ${optionalString cfg.webfinger '' + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + ''} + ''; }; - }) + } ]); meta.doc = ./nextcloud.xml; From 5823ed784112361aed298cf865f29b51cd4a3f0a Mon Sep 17 00:00:00 2001 From: DavHau Date: Mon, 27 Jul 2020 12:41:42 +0700 Subject: [PATCH 014/143] nextcloud: fix group permissions on startup --- nixos/modules/services/web-apps/nextcloud.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 61722e6627d3..14858e2456e6 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -458,7 +458,17 @@ in { script = '' chmod og+x ${cfg.home} ln -sf ${cfg.package}/apps ${cfg.home}/ - install -o nextcloud -g nextcloud -d ${cfg.home}/config ${cfg.home}/data ${cfg.home}/store-apps + + # create nextcloud directories. + # if the directories exist already with wrong permissions, we fix that + for dir in ${cfg.home}/config ${cfg.home}/data ${cfg.home}/store-apps; do + if [ ! -e $dir ]; then + install -o nextcloud -g nextcloud -d $dir + elif [ $(stat -c "%G" $dir) != "nextcloud" ]; then + chown -R nextcloud:nextcloud $dir + fi + done + ln -sf ${overrideConfig} ${cfg.home}/config/override.config.php # Do not install if already installed From b90a70d53f5cf9812c95f38e096fd99081aea93f Mon Sep 17 00:00:00 2001 From: DavHau Date: Mon, 27 Jul 2020 20:20:13 +0700 Subject: [PATCH 015/143] nextcloud: shorten nginx group reference Co-authored-by: Aaron Andersen --- nixos/modules/services/web-apps/nextcloud.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 14858e2456e6..44be27e9bd77 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -510,7 +510,7 @@ in { }; settings = mapAttrs (name: mkDefault) { "listen.owner" = config.services.nginx.user; - "listen.group" = config.users.users.${config.services.nginx.user}.group; + "listen.group" = config.services.nginx.group; } // cfg.poolSettings; extraConfig = cfg.poolConfig; }; From 5b9ec0f003d38d25b8c4d6a0a778f061a47912f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 30 Jul 2020 13:39:18 -0300 Subject: [PATCH 016/143] untrunc-anthwlock: init at 2020.07.18 --- .../tools/video/untrunc-anthwlock/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/video/untrunc-anthwlock/default.nix diff --git a/pkgs/tools/video/untrunc-anthwlock/default.nix b/pkgs/tools/video/untrunc-anthwlock/default.nix new file mode 100644 index 000000000000..126952850936 --- /dev/null +++ b/pkgs/tools/video/untrunc-anthwlock/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchFromGitHub, ffmpeg, libui }: + +stdenv.mkDerivation { + pname = "untrunc-anthwlock"; + version = "2020.07.18"; + + src = fetchFromGitHub { + owner = "anthwlock"; + repo = "untrunc"; + rev = "a0bf2e8642ecdb7af5897ed9b0dd30a7d03520ae"; + sha256 = "14i2lq68q990hnm2kkfamlsi67bcml85zl8yjsyxc5h8ncc2f3dp"; + }; + + + buildInputs = [ ffmpeg libui ]; + + postBuild = '' + make untrunc-gui + ''; + + installPhase = '' + runHook preInstall + install -D -t $out/bin untrunc untrunc-gui + runHook postInstall + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Restore a truncated mp4/mov (improved version of ponchio/untrunc)"; + homepage = "https://github.com/anthwlock/untrunc"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1e61e8e51b79..a11d03ebde7f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7372,6 +7372,8 @@ in untrunc = callPackage ../tools/video/untrunc { }; + untrunc-anthwlock = callPackage ../tools/video/untrunc-anthwlock { }; + up = callPackage ../tools/misc/up { }; upx = callPackage ../tools/compression/upx { }; From 33390d65937565b235ca043bec1c6d69fa33a6e5 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 13:54:57 +0000 Subject: [PATCH 017/143] bitcoin-abc: 0.21.10 -> 0.21.12 --- pkgs/applications/blockchains/bitcoin-abc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/blockchains/bitcoin-abc.nix b/pkgs/applications/blockchains/bitcoin-abc.nix index 95adfd800120..420e267aa82a 100644 --- a/pkgs/applications/blockchains/bitcoin-abc.nix +++ b/pkgs/applications/blockchains/bitcoin-abc.nix @@ -7,13 +7,13 @@ with stdenv.lib; mkDerivation rec { name = "bitcoin" + (toString (optional (!withGui) "d")) + "-abc-" + version; - version = "0.21.10"; + version = "0.21.12"; src = fetchFromGitHub { owner = "bitcoin-ABC"; repo = "bitcoin-abc"; rev = "v${version}"; - sha256 = "1m210g6db8f09m66v75ia1fdd1dlvs1srgk2jhd3wqbvnmjqa77f"; + sha256 = "1mad3aqfwrxi06135nf8hv13d67nilmxpx4dw5vjcy1zi3lljj1j"; }; patches = [ ./fix-bitcoin-qt-build.patch ]; From 386d5c1be11fa5cb29aac7359c9b43dae0028d89 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 20:35:48 +0000 Subject: [PATCH 018/143] calibre: 4.19.0 -> 4.22.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index acd4c9fcacce..a548177567ce 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -30,11 +30,11 @@ let in mkDerivation rec { pname = "calibre"; - version = "4.19.0"; + version = "4.22.0"; src = fetchurl { url = "https://download.calibre-ebook.com/${version}/${pname}-${version}.tar.xz"; - sha256 = "1kpj65spwr9m88vshsljpdrw5jy7bbpqgqcrvqb17abh7fnnrb4x"; + sha256 = "0d0wmd3ijk8px1d662igal4lfmpyzynfzs6ms1bb9nf42mq2pxai"; }; patches = [ From ca910f8ddaf3860f604322f65f1838a69677e88b Mon Sep 17 00:00:00 2001 From: Bruno Bigras Date: Fri, 31 Jul 2020 23:13:00 -0400 Subject: [PATCH 019/143] obs-wlrobs: 20200111 -> 20200622 --- pkgs/applications/video/obs-studio/wlrobs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/obs-studio/wlrobs.nix b/pkgs/applications/video/obs-studio/wlrobs.nix index 77ef09d3c24d..99486a9ccc0c 100644 --- a/pkgs/applications/video/obs-studio/wlrobs.nix +++ b/pkgs/applications/video/obs-studio/wlrobs.nix @@ -13,12 +13,12 @@ assert dmabufSupport -> libdrm != null && libGL != null; stdenv.mkDerivation { pname = "obs-wlrobs"; - version = "20200111"; + version = "20200622"; src = fetchhg { url = "https://hg.sr.ht/~scoopta/wlrobs"; - rev = "8345bf985e390896d89e35e2feae1fa37722f4be"; - sha256 = "0j01wkhwhhla4qx8mwyrq2qj9cfhxksxaq2k8rskmy2qbdkvvdpb"; + rev = "1d3acaaf64049da3da9721aa8b9b47582fe0081b"; + sha256 = "0qrcf8024r4ynfjw0zx8vn59ygx9q5rb196s6nyxmy3gkv2lfxlq"; }; buildInputs = [ libX11 libGL libdrm meson ninja pkgconfig wayland obs-studio ]; From f9861ae348efa1b3fa74e4ff802f7b0c507e72f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Sat, 1 Aug 2020 09:39:37 +0200 Subject: [PATCH 020/143] oneDNN: 1.5.1 -> 1.6 Changelog: https://github.com/oneapi-src/oneDNN/releases/tag/v1.6 --- pkgs/development/libraries/oneDNN/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index 865a0ab77244..b2beaee0bc90 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -5,13 +5,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { pname = "oneDNN"; - version = "1.5.1"; + version = "1.6"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${version}"; - sha256 = "1l66gkidldjpznp8pb01wdgrmm0rmrbndv8lzidz8fp9hf473zgl"; + sha256 = "0w2rgr3zgk7a3cql12dpddyhz2isyqqaks4vm8p45y426pd5m64b"; }; outputs = [ "out" "dev" "doc" ]; From 81dd022471943861f11a0907661af57fbdb7a8a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 31 Jul 2020 09:21:16 -0300 Subject: [PATCH 021/143] enlightenment.efl: move to pkgs/desktops/enlightenment/efl/ --- pkgs/desktops/enlightenment/default.nix | 2 +- .../{ => efl}/0002-efreet-more-stat-info-changes.patch | 0 pkgs/desktops/enlightenment/{efl.nix => efl/default.nix} | 0 pkgs/desktops/enlightenment/{ => efl}/efl-elua.patch | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/enlightenment/{ => efl}/0002-efreet-more-stat-info-changes.patch (100%) rename pkgs/desktops/enlightenment/{efl.nix => efl/default.nix} (100%) rename pkgs/desktops/enlightenment/{ => efl}/efl-elua.patch (100%) diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index dcaf6260f0c4..bdb56e9172d1 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -1,7 +1,7 @@ { callPackage, pkgs }: { #### CORE EFL - efl = callPackage ./efl.nix { }; + efl = callPackage ./efl { }; #### WINDOW MANAGER enlightenment = callPackage ./enlightenment.nix { }; diff --git a/pkgs/desktops/enlightenment/0002-efreet-more-stat-info-changes.patch b/pkgs/desktops/enlightenment/efl/0002-efreet-more-stat-info-changes.patch similarity index 100% rename from pkgs/desktops/enlightenment/0002-efreet-more-stat-info-changes.patch rename to pkgs/desktops/enlightenment/efl/0002-efreet-more-stat-info-changes.patch diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl/default.nix similarity index 100% rename from pkgs/desktops/enlightenment/efl.nix rename to pkgs/desktops/enlightenment/efl/default.nix diff --git a/pkgs/desktops/enlightenment/efl-elua.patch b/pkgs/desktops/enlightenment/efl/efl-elua.patch similarity index 100% rename from pkgs/desktops/enlightenment/efl-elua.patch rename to pkgs/desktops/enlightenment/efl/efl-elua.patch From f9d16d59f6351bcc24d2791a325798471f2b3d2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 31 Jul 2020 09:25:54 -0300 Subject: [PATCH 022/143] enlightenment.enlightenment: move to pkgs/desktops/enlightenment/enlightenment/ --- pkgs/desktops/enlightenment/default.nix | 2 +- .../{ => enlightenment}/0001-wrapped-setuid-executables.patch | 0 .../{ => enlightenment}/0003-setuid-missing-path.patch | 0 .../{enlightenment.nix => enlightenment/default.nix} | 0 4 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/enlightenment/{ => enlightenment}/0001-wrapped-setuid-executables.patch (100%) rename pkgs/desktops/enlightenment/{ => enlightenment}/0003-setuid-missing-path.patch (100%) rename pkgs/desktops/enlightenment/{enlightenment.nix => enlightenment/default.nix} (100%) diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index bdb56e9172d1..2dd19ce146b2 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -4,7 +4,7 @@ efl = callPackage ./efl { }; #### WINDOW MANAGER - enlightenment = callPackage ./enlightenment.nix { }; + enlightenment = callPackage ./enlightenment { }; #### APPLICATIONS econnman = callPackage ./econnman.nix { }; diff --git a/pkgs/desktops/enlightenment/0001-wrapped-setuid-executables.patch b/pkgs/desktops/enlightenment/enlightenment/0001-wrapped-setuid-executables.patch similarity index 100% rename from pkgs/desktops/enlightenment/0001-wrapped-setuid-executables.patch rename to pkgs/desktops/enlightenment/enlightenment/0001-wrapped-setuid-executables.patch diff --git a/pkgs/desktops/enlightenment/0003-setuid-missing-path.patch b/pkgs/desktops/enlightenment/enlightenment/0003-setuid-missing-path.patch similarity index 100% rename from pkgs/desktops/enlightenment/0003-setuid-missing-path.patch rename to pkgs/desktops/enlightenment/enlightenment/0003-setuid-missing-path.patch diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment/default.nix similarity index 100% rename from pkgs/desktops/enlightenment/enlightenment.nix rename to pkgs/desktops/enlightenment/enlightenment/default.nix From 0f2bbb850dfc89018e4c4d51d2aea1efea268844 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 31 Jul 2020 09:32:01 -0300 Subject: [PATCH 023/143] enlightenment.econnman: move to pkgs/desktops/enlightenment/econnman/ --- pkgs/desktops/enlightenment/default.nix | 2 +- .../enlightenment/{econnman.nix => econnman/default.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/enlightenment/{econnman.nix => econnman/default.nix} (100%) diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index 2dd19ce146b2..36b53c3c9a09 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -7,7 +7,7 @@ enlightenment = callPackage ./enlightenment { }; #### APPLICATIONS - econnman = callPackage ./econnman.nix { }; + econnman = callPackage ./econnman { }; terminology = callPackage ./terminology.nix { }; rage = callPackage ./rage.nix { }; ephoto = callPackage ./ephoto.nix { }; diff --git a/pkgs/desktops/enlightenment/econnman.nix b/pkgs/desktops/enlightenment/econnman/default.nix similarity index 100% rename from pkgs/desktops/enlightenment/econnman.nix rename to pkgs/desktops/enlightenment/econnman/default.nix From 5eea1c16db7bd8aed35b596d75c7487ca0e69465 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 31 Jul 2020 09:33:41 -0300 Subject: [PATCH 024/143] enlightenment.terminology: move to pkgs/desktops/enlightenment/terminology/ --- pkgs/desktops/enlightenment/default.nix | 2 +- .../enlightenment/{terminology.nix => terminology/default.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/enlightenment/{terminology.nix => terminology/default.nix} (100%) diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index 36b53c3c9a09..f95d75a25e1b 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -8,7 +8,7 @@ #### APPLICATIONS econnman = callPackage ./econnman { }; - terminology = callPackage ./terminology.nix { }; + terminology = callPackage ./terminology { }; rage = callPackage ./rage.nix { }; ephoto = callPackage ./ephoto.nix { }; } diff --git a/pkgs/desktops/enlightenment/terminology.nix b/pkgs/desktops/enlightenment/terminology/default.nix similarity index 100% rename from pkgs/desktops/enlightenment/terminology.nix rename to pkgs/desktops/enlightenment/terminology/default.nix From 435a50be50d86183488833d4042efe5bcc05fcc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 31 Jul 2020 09:35:20 -0300 Subject: [PATCH 025/143] enlightenment.rage: move to pkgs/desktops/enlightenment/rage/ --- pkgs/desktops/enlightenment/default.nix | 2 +- pkgs/desktops/enlightenment/{rage.nix => rage/default.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/enlightenment/{rage.nix => rage/default.nix} (100%) diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index f95d75a25e1b..2c68a9841ea5 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -9,6 +9,6 @@ #### APPLICATIONS econnman = callPackage ./econnman { }; terminology = callPackage ./terminology { }; - rage = callPackage ./rage.nix { }; + rage = callPackage ./rage { }; ephoto = callPackage ./ephoto.nix { }; } diff --git a/pkgs/desktops/enlightenment/rage.nix b/pkgs/desktops/enlightenment/rage/default.nix similarity index 100% rename from pkgs/desktops/enlightenment/rage.nix rename to pkgs/desktops/enlightenment/rage/default.nix From 57986d0a4a324fe6d86e7dd5eca15e089db5ef06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Fri, 31 Jul 2020 09:37:14 -0300 Subject: [PATCH 026/143] enlightenment.ephoto: move to pkgs/desktops/enlightenment/ephoto/ --- pkgs/desktops/enlightenment/default.nix | 2 +- pkgs/desktops/enlightenment/{ephoto.nix => ephoto/default.nix} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/desktops/enlightenment/{ephoto.nix => ephoto/default.nix} (100%) diff --git a/pkgs/desktops/enlightenment/default.nix b/pkgs/desktops/enlightenment/default.nix index 2c68a9841ea5..5c6a64b1f33d 100644 --- a/pkgs/desktops/enlightenment/default.nix +++ b/pkgs/desktops/enlightenment/default.nix @@ -10,5 +10,5 @@ econnman = callPackage ./econnman { }; terminology = callPackage ./terminology { }; rage = callPackage ./rage { }; - ephoto = callPackage ./ephoto.nix { }; + ephoto = callPackage ./ephoto { }; } diff --git a/pkgs/desktops/enlightenment/ephoto.nix b/pkgs/desktops/enlightenment/ephoto/default.nix similarity index 100% rename from pkgs/desktops/enlightenment/ephoto.nix rename to pkgs/desktops/enlightenment/ephoto/default.nix From ca916e8cb3220ba43a43d10f72ccb4b88077a461 Mon Sep 17 00:00:00 2001 From: DavHau Date: Mon, 3 Aug 2020 14:04:46 +0700 Subject: [PATCH 027/143] nextcloud: deprecate nginx, use chgrp, mkDefault for nginx, fix tests --- nixos/modules/services/web-apps/nextcloud.nix | 12 +++++++++--- nixos/tests/nextcloud/basic.nix | 1 - nixos/tests/nextcloud/with-mysql-and-memcached.nix | 1 - nixos/tests/nextcloud/with-postgresql-and-redis.nix | 1 - 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index 44be27e9bd77..d9660852528a 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -45,6 +45,12 @@ let inherit (config.system) stateVersion; in { + + imports = [ + ( mkRemovedOptionModule [ "services" "nextcloud" "nginx" "enable" ] + "The nextcloud module dropped support for other webservers than nginx.") + ]; + options.services.nextcloud = { enable = mkEnableOption "nextcloud"; hostName = mkOption { @@ -465,7 +471,7 @@ in { if [ ! -e $dir ]; then install -o nextcloud -g nextcloud -d $dir elif [ $(stat -c "%G" $dir) != "nextcloud" ]; then - chown -R nextcloud:nextcloud $dir + chgrp -R nextcloud $dir fi done @@ -524,8 +530,8 @@ in { users.groups.nextcloud.members = [ "nextcloud" config.services.nginx.user ]; environment.systemPackages = [ occ ]; - - services.nginx.enable = true; + + services.nginx.enable = mkDefault true; services.nginx.virtualHosts.${cfg.hostName} = { root = cfg.package; locations = { diff --git a/nixos/tests/nextcloud/basic.nix b/nixos/tests/nextcloud/basic.nix index a8fa0cae6f0f..72fb020dca70 100644 --- a/nixos/tests/nextcloud/basic.nix +++ b/nixos/tests/nextcloud/basic.nix @@ -33,7 +33,6 @@ in { services.nextcloud = { enable = true; - nginx.enable = true; hostName = "nextcloud"; config = { # Don't inherit adminuser since "root" is supposed to be the default diff --git a/nixos/tests/nextcloud/with-mysql-and-memcached.nix b/nixos/tests/nextcloud/with-mysql-and-memcached.nix index 8db630be893a..bec3815a3e14 100644 --- a/nixos/tests/nextcloud/with-mysql-and-memcached.nix +++ b/nixos/tests/nextcloud/with-mysql-and-memcached.nix @@ -17,7 +17,6 @@ in { services.nextcloud = { enable = true; hostName = "nextcloud"; - nginx.enable = true; https = true; caching = { apcu = true; diff --git a/nixos/tests/nextcloud/with-postgresql-and-redis.nix b/nixos/tests/nextcloud/with-postgresql-and-redis.nix index 95219cac9be8..40a208115c32 100644 --- a/nixos/tests/nextcloud/with-postgresql-and-redis.nix +++ b/nixos/tests/nextcloud/with-postgresql-and-redis.nix @@ -17,7 +17,6 @@ in { services.nextcloud = { enable = true; hostName = "nextcloud"; - nginx.enable = true; caching = { apcu = false; redis = true; From d62c280524f114f743193d61171410137a829cac Mon Sep 17 00:00:00 2001 From: Lancelot SIX Date: Tue, 4 Aug 2020 09:36:11 +0100 Subject: [PATCH 028/143] skypeforlinux: 8.62.0.85 -> 8.63.0.76 --- .../networking/instant-messengers/skypeforlinux/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix index fbafd819f83d..bdcaf3bd6085 100644 --- a/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix +++ b/pkgs/applications/networking/instant-messengers/skypeforlinux/default.nix @@ -7,7 +7,7 @@ let # Please keep the version x.y.0.z and do not update to x.y.76.z because the # source of the latter disappears much faster. - version = "8.62.0.85"; + version = "8.63.0.76"; rpath = stdenv.lib.makeLibraryPath [ alsaLib @@ -65,7 +65,7 @@ let "https://mirror.cs.uchicago.edu/skype/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" "https://web.archive.org/web/https://repo.skype.com/deb/pool/main/s/skypeforlinux/skypeforlinux_${version}_amd64.deb" ]; - sha256 = "0qlm2hbshxgycczv227bbj2fbiw3b76rp24mh8amhq4xbscazl38"; + sha256 = "0gmrk1giabr53imiwdflf6ykwpcj2q5zn3bynvrncnhivsbvaavy"; } else throw "Skype for linux is not supported on ${stdenv.hostPlatform.system}"; From 128dbb31cca3ba479396c6b65946e2e6503c0f8d Mon Sep 17 00:00:00 2001 From: DavHau Date: Wed, 5 Aug 2020 11:50:26 +0700 Subject: [PATCH 029/143] nextcloud: use mkDefault for whole nginx config --- nixos/modules/services/web-apps/nextcloud.nix | 176 +++++++++--------- 1 file changed, 89 insertions(+), 87 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.nix b/nixos/modules/services/web-apps/nextcloud.nix index d9660852528a..0579e58d1d62 100644 --- a/nixos/modules/services/web-apps/nextcloud.nix +++ b/nixos/modules/services/web-apps/nextcloud.nix @@ -531,65 +531,81 @@ in { environment.systemPackages = [ occ ]; - services.nginx.enable = mkDefault true; - services.nginx.virtualHosts.${cfg.hostName} = { - root = cfg.package; - locations = { - "= /robots.txt" = { - priority = 100; - extraConfig = '' - allow all; - log_not_found off; + services.nginx = mkDefault { + enable = true; + virtualHosts.${cfg.hostName} = { + root = cfg.package; + locations = { + "= /robots.txt" = { + priority = 100; + extraConfig = '' + allow all; + log_not_found off; + access_log off; + ''; + }; + "/" = { + priority = 200; + extraConfig = "rewrite ^ /index.php;"; + }; + "~ ^/store-apps" = { + priority = 201; + extraConfig = "root ${cfg.home};"; + }; + "= /.well-known/carddav" = { + priority = 210; + extraConfig = "return 301 $scheme://$host/remote.php/dav;"; + }; + "= /.well-known/caldav" = { + priority = 210; + extraConfig = "return 301 $scheme://$host/remote.php/dav;"; + }; + "~ ^\\/(?:build|tests|config|lib|3rdparty|templates|data)\\/" = { + priority = 300; + extraConfig = "deny all;"; + }; + "~ ^\\/(?:\\.|autotest|occ|issue|indie|db_|console)" = { + priority = 300; + extraConfig = "deny all;"; + }; + "~ ^\\/(?:index|remote|public|cron|core/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|ocs-provider\\/.+|ocm-provider\\/.+)\\.php(?:$|\\/)" = { + priority = 500; + extraConfig = '' + include ${config.services.nginx.package}/conf/fastcgi.conf; + fastcgi_split_path_info ^(.+\.php)(\\/.*)$; + try_files $fastcgi_script_name =404; + fastcgi_param PATH_INFO $fastcgi_path_info; + fastcgi_param HTTPS ${if cfg.https then "on" else "off"}; + fastcgi_param modHeadersAvailable true; + fastcgi_param front_controller_active true; + fastcgi_pass unix:${fpm.socket}; + fastcgi_intercept_errors on; + fastcgi_request_buffering off; + fastcgi_read_timeout 120s; + ''; + }; + "~ ^\\/(?:updater|ocs-provider|ocm-provider)(?:$|\\/)".extraConfig = '' + try_files $uri/ =404; + index index.php; + ''; + "~ \\.(?:css|js|woff2?|svg|gif)$".extraConfig = '' + try_files $uri /index.php$request_uri; + add_header Cache-Control "public, max-age=15778463"; + add_header X-Content-Type-Options nosniff; + add_header X-XSS-Protection "1; mode=block"; + add_header X-Robots-Tag none; + add_header X-Download-Options noopen; + add_header X-Permitted-Cross-Domain-Policies none; + add_header X-Frame-Options sameorigin; + add_header Referrer-Policy no-referrer; + access_log off; + ''; + "~ \\.(?:png|html|ttf|ico|jpg|jpeg|bcmap|mp4|webm)$".extraConfig = '' + try_files $uri /index.php$request_uri; access_log off; ''; }; - "/" = { - priority = 200; - extraConfig = "rewrite ^ /index.php;"; - }; - "~ ^/store-apps" = { - priority = 201; - extraConfig = "root ${cfg.home};"; - }; - "= /.well-known/carddav" = { - priority = 210; - extraConfig = "return 301 $scheme://$host/remote.php/dav;"; - }; - "= /.well-known/caldav" = { - priority = 210; - extraConfig = "return 301 $scheme://$host/remote.php/dav;"; - }; - "~ ^\\/(?:build|tests|config|lib|3rdparty|templates|data)\\/" = { - priority = 300; - extraConfig = "deny all;"; - }; - "~ ^\\/(?:\\.|autotest|occ|issue|indie|db_|console)" = { - priority = 300; - extraConfig = "deny all;"; - }; - "~ ^\\/(?:index|remote|public|cron|core/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|ocs-provider\\/.+|ocm-provider\\/.+)\\.php(?:$|\\/)" = { - priority = 500; - extraConfig = '' - include ${config.services.nginx.package}/conf/fastcgi.conf; - fastcgi_split_path_info ^(.+\.php)(\\/.*)$; - try_files $fastcgi_script_name =404; - fastcgi_param PATH_INFO $fastcgi_path_info; - fastcgi_param HTTPS ${if cfg.https then "on" else "off"}; - fastcgi_param modHeadersAvailable true; - fastcgi_param front_controller_active true; - fastcgi_pass unix:${fpm.socket}; - fastcgi_intercept_errors on; - fastcgi_request_buffering off; - fastcgi_read_timeout 120s; - ''; - }; - "~ ^\\/(?:updater|ocs-provider|ocm-provider)(?:$|\\/)".extraConfig = '' - try_files $uri/ =404; - index index.php; - ''; - "~ \\.(?:css|js|woff2?|svg|gif)$".extraConfig = '' - try_files $uri /index.php$request_uri; - add_header Cache-Control "public, max-age=15778463"; + extraConfig = '' add_header X-Content-Type-Options nosniff; add_header X-XSS-Protection "1; mode=block"; add_header X-Robots-Tag none; @@ -597,39 +613,25 @@ in { add_header X-Permitted-Cross-Domain-Policies none; add_header X-Frame-Options sameorigin; add_header Referrer-Policy no-referrer; - access_log off; - ''; - "~ \\.(?:png|html|ttf|ico|jpg|jpeg|bcmap|mp4|webm)$".extraConfig = '' - try_files $uri /index.php$request_uri; - access_log off; + add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always; + error_page 403 /core/templates/403.php; + error_page 404 /core/templates/404.php; + client_max_body_size ${cfg.maxUploadSize}; + fastcgi_buffers 64 4K; + fastcgi_hide_header X-Powered-By; + gzip on; + gzip_vary on; + gzip_comp_level 4; + gzip_min_length 256; + gzip_proxied expired no-cache no-store private no_last_modified no_etag auth; + gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy; + + ${optionalString cfg.webfinger '' + rewrite ^/.well-known/host-meta /public.php?service=host-meta last; + rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; + ''} ''; }; - extraConfig = '' - add_header X-Content-Type-Options nosniff; - add_header X-XSS-Protection "1; mode=block"; - add_header X-Robots-Tag none; - add_header X-Download-Options noopen; - add_header X-Permitted-Cross-Domain-Policies none; - add_header X-Frame-Options sameorigin; - add_header Referrer-Policy no-referrer; - add_header Strict-Transport-Security "max-age=15552000; includeSubDomains" always; - error_page 403 /core/templates/403.php; - error_page 404 /core/templates/404.php; - client_max_body_size ${cfg.maxUploadSize}; - fastcgi_buffers 64 4K; - fastcgi_hide_header X-Powered-By; - gzip on; - gzip_vary on; - gzip_comp_level 4; - gzip_min_length 256; - gzip_proxied expired no-cache no-store private no_last_modified no_etag auth; - gzip_types application/atom+xml application/javascript application/json application/ld+json application/manifest+json application/rss+xml application/vnd.geo+json application/vnd.ms-fontobject application/x-font-ttf application/x-web-app-manifest+json application/xhtml+xml application/xml font/opentype image/bmp image/svg+xml image/x-icon text/cache-manifest text/css text/plain text/vcard text/vnd.rim.location.xloc text/vtt text/x-component text/x-cross-domain-policy; - - ${optionalString cfg.webfinger '' - rewrite ^/.well-known/host-meta /public.php?service=host-meta last; - rewrite ^/.well-known/host-meta.json /public.php?service=host-meta-json last; - ''} - ''; }; } ]); From 6854a2cb4d9fee6b3cc885fd73e939a3a409ecb5 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 5 Aug 2020 04:20:00 -0500 Subject: [PATCH 030/143] grpc: 1.29.0 -> 1.31.0 Changelog: https://github.com/grpc/grpc/releases/tag/v1.31.0 --- pkgs/development/libraries/grpc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/grpc/default.nix b/pkgs/development/libraries/grpc/default.nix index ab497eadb6d6..b0fe149b6f06 100644 --- a/pkgs/development/libraries/grpc/default.nix +++ b/pkgs/development/libraries/grpc/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, zlib, c-ares, pkgconfig, openssl, protobuf, gflags, abseil-cpp }: stdenv.mkDerivation rec { - version = "1.29.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too + version = "1.31.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too pname = "grpc"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "1n604grkf2amzrmwcz6am0rpbp3yfb062lpgmhv943hj8wk7xw27"; + sha256 = "1h7gmhkjijfkpqhz8vswhkz2gkphs638g10dlkayic8xg9xdl4gj"; fetchSubmodules = true; }; patches = [ From 1a3967a4093f7f50e8db83d567061ac2196cfa73 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Wed, 5 Aug 2020 04:21:00 -0500 Subject: [PATCH 031/143] pythonPackages.grpcio-tools: 1.29.0 -> 1.31.0 --- pkgs/development/python-modules/grpcio-tools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/grpcio-tools/default.nix b/pkgs/development/python-modules/grpcio-tools/default.nix index 4b28e07a6cee..37ffc8beca55 100644 --- a/pkgs/development/python-modules/grpcio-tools/default.nix +++ b/pkgs/development/python-modules/grpcio-tools/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "grpcio-tools"; - version = "1.29.0"; + version = "1.31.0"; src = fetchPypi { inherit pname version; - sha256 = "0f681c1ebd5472b804baa391b16dc59d92b065903999566f4776bfbd010bcec9"; + sha256 = "3b08cbd3f4d5b60e3bff8f859e6e03db739967a684268164abc940415e23ca51"; }; enableParallelBuilding = true; From f4dad5c17b39547acdd3b598838ed0d710ceccf9 Mon Sep 17 00:00:00 2001 From: Andreas Wiese Date: Wed, 5 Aug 2020 13:38:15 +0200 Subject: [PATCH 032/143] zsh-nix-shell: (unstable-)2019-12-20 -> 0.1.0 --- pkgs/shells/zsh/zsh-nix-shell/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/shells/zsh/zsh-nix-shell/default.nix b/pkgs/shells/zsh/zsh-nix-shell/default.nix index c424cc334836..6db78f1c0f56 100644 --- a/pkgs/shells/zsh/zsh-nix-shell/default.nix +++ b/pkgs/shells/zsh/zsh-nix-shell/default.nix @@ -4,14 +4,14 @@ # `programs.zsh.interactiveShellInit = "source ${pkgs.zsh-nix-shell}/share/zsh-nix-shell/nix-shell.plugin.zsh";` stdenv.mkDerivation rec { - pname = "zsh-nix-shell-unstable"; - version = "2019-12-20"; + pname = "zsh-nix-shell"; + version = "0.1.0"; src = fetchFromGitHub { owner = "chisui"; repo = "zsh-nix-shell"; - rev = "a65382a353eaee5a98f068c330947c032a1263bb"; - sha256 = "0l41ac5b7p8yyjvpfp438kw7zl9dblrpd7icjg1v3ig3xy87zv0n"; + rev = "v${version}"; + sha256 = "0snhch9hfy83d4amkyxx33izvkhbwmindy0zjjk28hih1a9l2jmx"; }; installPhase = '' From cc8d2ba291448139b21ccf39bfc4c070276a2800 Mon Sep 17 00:00:00 2001 From: toonn Date: Thu, 6 Aug 2020 00:49:33 +0200 Subject: [PATCH 033/143] wire-desktop: linux 3.18.2925 -> 3.19.2928 --- .../networking/instant-messengers/wire-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 8d874c581913..5edc9cb3d971 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -21,12 +21,12 @@ let version = { x86_64-darwin = "3.18.3728"; - x86_64-linux = "3.18.2925"; + x86_64-linux = "3.19.2928"; }.${system} or throwSystem; sha256 = { x86_64-darwin = "0xi3k95yw59xsfavncc1giwxlwjz26z34qm3i604ksjjalvpzy5l"; - x86_64-linux = "01g39hncj1w0zyfrzv4mgv8npwvx0g0lw99azyai99877b30bm8j"; + x86_64-linux = "038h1j59qfj5ckaxk823qpfflxay47v0jrqc0hmrdmnd2y59dpx7"; }.${system} or throwSystem; meta = with stdenv.lib; { From 787a38bf6b4f3f5ea3b08d455e89145c1b09452f Mon Sep 17 00:00:00 2001 From: toonn Date: Thu, 6 Aug 2020 00:50:17 +0200 Subject: [PATCH 034/143] wire-desktop: mac 3.18.3728 -> 3.19.3799 --- .../networking/instant-messengers/wire-desktop/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 5edc9cb3d971..532eeb1d0387 100644 --- a/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -20,12 +20,12 @@ let pname = "wire-desktop"; version = { - x86_64-darwin = "3.18.3728"; + x86_64-darwin = "3.19.3799"; x86_64-linux = "3.19.2928"; }.${system} or throwSystem; sha256 = { - x86_64-darwin = "0xi3k95yw59xsfavncc1giwxlwjz26z34qm3i604ksjjalvpzy5l"; + x86_64-darwin = "1sv8n4g1pd4nwpwsg0m61zhrfjlh7sj29rnh46xjw1qg332g6cw9"; x86_64-linux = "038h1j59qfj5ckaxk823qpfflxay47v0jrqc0hmrdmnd2y59dpx7"; }.${system} or throwSystem; From b41f79fe8418dab0d5aff6a6a08b8649f8a46acd Mon Sep 17 00:00:00 2001 From: gnidorah Date: Sun, 12 Jul 2020 00:09:47 +0300 Subject: [PATCH 035/143] openxray: 558 -> 730 --- pkgs/games/openxray/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/games/openxray/default.nix b/pkgs/games/openxray/default.nix index 9e38852a02a5..fe2e978c4cc4 100644 --- a/pkgs/games/openxray/default.nix +++ b/pkgs/games/openxray/default.nix @@ -3,13 +3,13 @@ , pcre, makeWrapper }: let - version = "558"; + version = "730-july-preview"; src = fetchFromGitHub { owner = "OpenXRay"; repo = "xray-16"; rev = version; - sha256 = "1wnkx9g0ww4f5pljrb0wzs054jzkig1i5hlz1p509rfvnhc50afp"; + sha256 = "1nish3sbpk0hsag7r4nyx8j6pl9mlgx58v8dhzg2vwj2q32isyb2"; fetchSubmodules = true; }; @@ -40,7 +40,6 @@ in stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; cmakeFlags = [ "-DCMAKE_INCLUDE_PATH=${cryptopp}/include/cryptopp" ]; - installFlags = [ "DESTDIR=${placeholder "out"}" ]; buildInputs = [ glew freeimage liblockfile openal cryptopp libtheora SDL2 lzo @@ -54,11 +53,6 @@ in stdenv.mkDerivation rec { ''; postInstall = '' - mv $out/var/empty/* $out - install -Dm755 $out/games/xr_3da $out/bin/xr_3da - install -Dm644 $src/License.txt $out/share/licenses/openxray/License.txt - rm -r $out/var $out/games - # needed because of SDL_LoadObject library loading code wrapProgram $out/bin/xr_3da \ --prefix LD_LIBRARY_PATH : $out/lib From 29bdfffddb9b028789aab8a95a61b991c48075db Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 6 Aug 2020 09:21:31 +0300 Subject: [PATCH 036/143] adlplug, opnplug: 1.0.1 -> 1.0.2 --- pkgs/applications/audio/adlplug/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/adlplug/default.nix b/pkgs/applications/audio/adlplug/default.nix index bc626cbad114..7dcc13eb96d5 100644 --- a/pkgs/applications/audio/adlplug/default.nix +++ b/pkgs/applications/audio/adlplug/default.nix @@ -1,18 +1,18 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libjack2, alsaLib , freetype, libX11, libXrandr, libXinerama, libXext, libXcursor -, fetchpatch +, fetchpatch, fmt , adlplugChip ? "-DADLplug_CHIP=OPL3" , pname ? "ADLplug" }: stdenv.mkDerivation rec { inherit pname; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "jpcima"; repo = "ADLplug"; rev = "v${version}"; - sha256 = "0n9srdlgl1j528ap5xmllrqs1w6ibc5yf9sphvl1q9kjnizxrs2c"; + sha256 = "0mqx4bzri8s880v7jwd24nb93m5i3aklqld0b3h0hjnz0lh2qz0f"; fetchSubmodules = true; }; @@ -25,13 +25,13 @@ stdenv.mkDerivation rec { }) ]; - cmakeFlags = [ adlplugChip ]; + cmakeFlags = [ adlplugChip "-DADLplug_USE_SYSTEM_FMT=ON" ]; buildInputs = [ libjack2 alsaLib freetype libX11 libXrandr libXinerama libXext libXcursor ]; - nativeBuildInputs = [ cmake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig fmt ]; meta = with stdenv.lib; { description = "OPL3 and OPN2 FM Chip Synthesizer"; From eaf6ef8f006f99462716a0ed250985a05f1dd329 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 6 Aug 2020 09:26:06 +0300 Subject: [PATCH 037/143] ArchiSteamFarm: 4.2.3.3 -> 4.2.3.6 --- pkgs/applications/misc/ArchiSteamFarm/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/ArchiSteamFarm/default.nix b/pkgs/applications/misc/ArchiSteamFarm/default.nix index 71404e735476..e5121ce6e7d9 100644 --- a/pkgs/applications/misc/ArchiSteamFarm/default.nix +++ b/pkgs/applications/misc/ArchiSteamFarm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ArchiSteamFarm"; - version = "4.2.3.3"; + version = "4.2.3.6"; src = fetchurl { url = "https://github.com/JustArchiNET/ArchiSteamFarm/releases/download/${version}/ASF-generic.zip"; - sha256 = "0v69rrs5fr1n5llfx42xkiish52al7kb36fjy3ng0j9qfp3g8pj7"; + sha256 = "1a8baxrb8czndxxi16md1nyl2snfx215yvrygdpcblgngkp2z2y9"; }; nativeBuildInputs = [ unzip makeWrapper jq ]; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { --run "[ -d config ] || cp --no-preserve=mode -r $dist/config ." \ --run "[ -d logs ] || cp --no-preserve=mode -r $dist/logs ." \ --run "[ -d plugins ] || cp --no-preserve=mode -r $dist/plugins ." \ - --run "[ -d www ] || ln -sf $dist/www ." + --run "ln -sf $dist/www ." ''; meta = with stdenv.lib; { From 2774941cc2f1286879b155fc17bbba36a1779be0 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 6 Aug 2020 09:33:19 +0300 Subject: [PATCH 038/143] kmsxx: 2020-02-14 -> 2020-08-04 --- pkgs/development/libraries/kmsxx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/kmsxx/default.nix b/pkgs/development/libraries/kmsxx/default.nix index 740248a7ae8f..5bd311af2d85 100644 --- a/pkgs/development/libraries/kmsxx/default.nix +++ b/pkgs/development/libraries/kmsxx/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation { pname = "kmsxx"; - version = "2020-02-14"; + version = "2020-08-04"; src = fetchFromGitHub { owner = "tomba"; repo = "kmsxx"; fetchSubmodules = true; - rev = "7c5e645112a899ad018219365c3898b0e896353f"; - sha256 = "1hj4gk4gwlvpjprjbrmrbrzqjhdgszsndrb1i4f9z7mjvdv8gij2"; + rev = "38bee3092f2d477f1baebfcae464f888d3d04bbe"; + sha256 = "0xz4m9bk0naawxwpx5cy1j3cm6c8c9m5y551csk88y88x1g0z0xh"; }; enableParallelBuilding = true; From de0caa8e8970745a8ca6a83a79a6abc7f516e0a4 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 6 Aug 2020 09:46:00 +0300 Subject: [PATCH 039/143] openjk: 2019-11-29 -> 2020-07-03 --- pkgs/games/openjk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix index 2d08a1da9998..0fe327b308e9 100644 --- a/pkgs/games/openjk/default.nix +++ b/pkgs/games/openjk/default.nix @@ -21,13 +21,13 @@ let }; in stdenv.mkDerivation { pname = "OpenJK"; - version = "2019-11-29"; + version = "2020-07-03"; src = fetchFromGitHub { owner = "JACoders"; repo = "OpenJK"; - rev = "eed60925ad1b0d513d3747264f3bf98615fa4b2a"; - sha256 = "0b33cr540vz7w7dlagqf3yldmyx9y2pri20j44pd8fxapq4krrmb"; + rev = "0a336ce4dffe6505e3f754b59732402a1db95752"; + sha256 = "1xagbz42hi3ivs208mnay2dbgh90pmwwbar2p1yfhj3zl3cghcs8"; }; dontAddPrefix = true; From 059675cd0de0616e42081d85a972da0f09b676cd Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 6 Aug 2020 09:53:07 +0300 Subject: [PATCH 040/143] opl3bankeditor: 1.5 -> 1.5.1 --- pkgs/tools/audio/opl3bankeditor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/opl3bankeditor/default.nix b/pkgs/tools/audio/opl3bankeditor/default.nix index 0503f9bad694..381591edb021 100644 --- a/pkgs/tools/audio/opl3bankeditor/default.nix +++ b/pkgs/tools/audio/opl3bankeditor/default.nix @@ -1,14 +1,14 @@ { stdenv, mkDerivation, fetchFromGitHub, cmake, qttools, alsaLib }: mkDerivation rec { - version = "1.5"; + version = "1.5.1"; pname = "OPL3BankEditor"; src = fetchFromGitHub { owner = "Wohlstand"; repo = pname; rev = "v${version}"; - sha256 = "16va5xfbyn2m63722ab5yph0l7kmghkbk6dkia93041mfhdyg9rc"; + sha256 = "1g59qrkcm4xnyxx0s2x28brqbf2ix6vriyx12pcdvfhhcdi55hxh"; fetchSubmodules = true; }; From 1ace84441511d92b3acd40ab58494d124131bfe7 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Thu, 6 Aug 2020 10:01:18 +0300 Subject: [PATCH 041/143] opn2bankeditor: 1.3-beta -> 1.3 --- pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix b/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix index d8f15a65b45b..1d10452470ed 100644 --- a/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix +++ b/pkgs/tools/audio/opl3bankeditor/opn2bankeditor.nix @@ -1,19 +1,14 @@ { opl3bankeditor, fetchFromGitHub }: opl3bankeditor.overrideAttrs (oldAttrs: rec { - version = "1.3-beta"; + version = "1.3"; pname = "OPN2BankEditor"; src = fetchFromGitHub { owner = "Wohlstand"; repo = pname; - rev = version; - sha256 = "0blcvqfj1yj6cmm079aw4jdzv3066jxqy9krp268i6cl2b3bmwvw"; + rev = "v${version}"; + sha256 = "0xsvv0gxqh1lx22f1jm384f7mq1jp57fmpsx1jjaxz435w5hf8s0"; fetchSubmodules = true; }; - - # to be removed with next release - postInstall = '' - install -Dm755 opn2_bank_editor $out/bin/opn2_bank_editor - ''; }) From 28300eb82b6bc388653c87788dd7fc53769ce1ad Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Aug 2020 07:08:03 +0000 Subject: [PATCH 042/143] kustomize: 3.8.0 -> 3.8.1 --- pkgs/development/tools/kustomize/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/kustomize/default.nix b/pkgs/development/tools/kustomize/default.nix index c7a1ba35fec3..635f1d6492e7 100644 --- a/pkgs/development/tools/kustomize/default.nix +++ b/pkgs/development/tools/kustomize/default.nix @@ -2,8 +2,8 @@ buildGoModule rec { pname = "kustomize"; - version = "3.8.0"; - # rev is the 3.8.0 commit, mainly for kustomize version command output + version = "3.8.1"; + # rev is the 3.8.1 commit, mainly for kustomize version command output rev = "6a50372dd5686df22750b0c729adaf369fbf193c"; buildFlagsArray = let t = "sigs.k8s.io/kustomize/api/provenance"; in @@ -17,14 +17,14 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - sha256 = "1v86gqn16xh28gi2fa6jgbbk0clrcng3sbr1az42iy4mm4nmsriy"; + sha256 = "07zdp6xv8viwnaz1qacwhg82dlzcrgb8dls6yz9qk4qcnsk6badx"; }; # avoid finding test and development commands sourceRoot = "source/kustomize"; deleteVendor = true; - vendorSha256 = "03z40gi9nrj120cd57pa3fmi8grldyxa65a1lkvlc2r3z9g29vdw"; + vendorSha256 = "01ff3w4hwp4ynqhg8cplv0i2ixs811d2x2j6xbh1lslyyh3z3wc5"; meta = with lib; { description = "Customization of kubernetes YAML configurations"; From 668e9f2cb39dc9164d6d99def3d312145d3982be Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Aug 2020 07:23:36 +0000 Subject: [PATCH 043/143] ldb: 2.1.4 -> 2.2.0 --- pkgs/development/libraries/ldb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 52daebf8323e..9810234eefa6 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "ldb"; - version = "2.1.4"; + version = "2.2.0"; src = fetchurl { url = "mirror://samba/ldb/${pname}-${version}.tar.gz"; - sha256 = "0kmzs2s7fvar9ksaxyiqlh8q8mbwc7bxrq9w1y91zlyb23p142wy"; + sha256 = "0pxxb3sn9lignkf80kndd84shxqk9m2qwimz62gzb6khd4bvajqk"; }; outputs = [ "out" "dev" ]; From 3f5258b6ab472e9c831189555b5b6f0e44551ce7 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 6 Aug 2020 11:57:07 +0200 Subject: [PATCH 044/143] redshift,redshift-wlr: Fix a file path in postInstall --- pkgs/applications/misc/redshift/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 05dc4c429b61..faa915383021 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -65,7 +65,7 @@ let postInstall = '' substituteInPlace $out/share/applications/redshift.desktop \ --replace 'Exec=redshift' "Exec=$out/bin/redshift" - substituteInPlace $out/share/applications/redshift.desktop \ + substituteInPlace $out/share/applications/redshift-gtk.desktop \ --replace 'Exec=redshift-gtk' "Exec=$out/bin/redshift-gtk" ''; From 79415b0bf6503a009c29b12943452404e0d54439 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 2 Aug 2020 17:53:33 +0000 Subject: [PATCH 045/143] gammastep: init at 2.0.1 Note: Since Gammastep is a fork of Redshift the mkRedshift will be reused as long as they don't diverge too far. Also: Gammastep should eventually replace redshift-wlr. --- pkgs/applications/misc/redshift/default.nix | 37 +++++++++++++++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 35 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index faa915383021..a95e5226f9bd 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchFromGitHub, autoconf, automake, gettext, intltool +{ stdenv, fetchFromGitHub, fetchFromGitLab +, autoconf, automake, gettext, intltool , libtool, pkgconfig, wrapGAppsHook, wrapPython, gobject-introspection , gtk3, python, pygobject3, pyxdg @@ -18,11 +19,16 @@ let stdenv.mkDerivation rec { inherit pname version src meta; - patches = [ + patches = stdenv.lib.optionals (pname != "gammastep") [ # https://github.com/jonls/redshift/pull/575 ./575.patch ]; + postPatch = stdenv.lib.optionalString (pname == "gammastep") '' + substituteInPlace configure.ac \ + --replace "[gammastep], [2.0]" "[gammastep], [${version}]" + ''; + nativeBuildInputs = [ autoconf automake @@ -62,7 +68,12 @@ let # the geoclue agent may inspect these paths and expect them to be # valid without having the correct $PATH set - postInstall = '' + postInstall = if (pname == "gammastep") then '' + substituteInPlace $out/share/applications/gammastep.desktop \ + --replace 'Exec=gammastep' "Exec=$out/bin/gammastep" + substituteInPlace $out/share/applications/gammastep-indicator.desktop \ + --replace 'Exec=gammastep-indicator' "Exec=$out/bin/gammastep-indicator" + '' else '' substituteInPlace $out/share/applications/redshift.desktop \ --replace 'Exec=redshift' "Exec=$out/bin/redshift" substituteInPlace $out/share/applications/redshift-gtk.desktop \ @@ -118,4 +129,24 @@ rec { homepage = "https://github.com/minus7/redshift"; }; }; + + gammastep = mkRedshift rec { + pname = "gammastep"; + version = "2.0.1"; + + src = fetchFromGitLab { + owner = "chinstrap"; + repo = pname; + rev = "v${version}"; + sha256 = "1ky4h892sg2mfbwwq5xv0vnjflsl2x3nsy5q456r1kyk1gwkj0rg"; + }; + + meta = redshift.meta // { + name = "${pname}-${version}"; + longDescription = "Gammastep" + + stdenv.lib.removePrefix "Redshift" redshift.meta.longDescription; + homepage = "https://gitlab.com/chinstrap/gammastep"; + maintainers = [ stdenv.lib.maintainers.primeos ] ++ redshift.meta.maintainers; + }; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6d406907ac6..aef0a27b63d8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24949,7 +24949,7 @@ in inherit (python3Packages) python pygobject3 pyxdg wrapPython; inherit (darwin.apple_sdk.frameworks) CoreLocation ApplicationServices Foundation Cocoa; geoclue = geoclue2; - }) redshift redshift-wlr; + }) redshift redshift-wlr gammastep; redshift-plasma-applet = libsForQt5.callPackage ../applications/misc/redshift-plasma-applet { }; From f4a0f5541f7c96932162049b0f5a4976b98abc2b Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Thu, 6 Aug 2020 12:56:14 +0200 Subject: [PATCH 046/143] cypress: 4.9.0 -> 4.12.1 --- pkgs/development/web/cypress/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/cypress/default.nix b/pkgs/development/web/cypress/default.nix index abc07fc3e9f9..036e824393a7 100644 --- a/pkgs/development/web/cypress/default.nix +++ b/pkgs/development/web/cypress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "4.9.0"; + version = "4.12.1"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "1lyhwy4rg6gdsj4590ya5v27lmyz6hnn4dhs51dq5i069rsw9qw4"; + sha256 = "00sma1q7hbhzjkjnkv8y37ar0wnxk9mkqlpsplgyyyx3gx81nn3s"; }; # don't remove runtime deps From 3a64e5f72e6bdd763ea3d0dcd7c2dc7a9d88c379 Mon Sep 17 00:00:00 2001 From: Simonas Kazlauskas Date: Thu, 6 Aug 2020 11:43:25 +0000 Subject: [PATCH 047/143] arcanist: 20200127 -> 20200711 (#93678) Note that this arcanist bump introduces some breaking changes to the tool interface. --- .../tools/misc/arcanist/default.nix | 73 ++++++++++--------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/pkgs/development/tools/misc/arcanist/default.nix b/pkgs/development/tools/misc/arcanist/default.nix index a6265ba89d03..fcddf1d0cacc 100644 --- a/pkgs/development/tools/misc/arcanist/default.nix +++ b/pkgs/development/tools/misc/arcanist/default.nix @@ -1,53 +1,54 @@ -{ stdenv, fetchFromGitHub, php, flex, makeWrapper }: +{ stdenv, fetchFromGitHub, php, flex }: + +# Make a custom wrapper. If `wrapProgram` is used, arcanist thinks .arc-wrapped is being +# invoked and complains about it being an unknown toolset. We could use `makeWrapper`, but +# then we’d need to still craft a script that does the `php libexec/arcanist/bin/...` dance +# anyway... So just do everything at once. +let makeArcWrapper = toolset: '' + cat << WRAPPER > $out/bin/${toolset} + #!$shell -e + export PATH='${php}/bin/'\''${PATH:+':'}\$PATH + exec ${php}/bin/php $out/libexec/arcanist/bin/${toolset} "\$@" + WRAPPER + chmod +x $out/bin/${toolset} +''; -let - libphutil = fetchFromGitHub { - owner = "phacility"; - repo = "libphutil"; - rev = "cc2a3dbf590389400da55563cb6993f321ec6d73"; - sha256 = "1k7sr3racwz845i7r5kdwvgqrz8gldz07pxj3yw77s58rqbix3ad"; - }; - arcanist = fetchFromGitHub { - owner = "phacility"; - repo = "arcanist"; - rev = "21a1828ea06cf031e93082db8664d73efc88290a"; - sha256 = "05rq9l9z7446ks270viay57r5ibx702b5bnlf4ck529zc4abympx"; - }; in + stdenv.mkDerivation { pname = "arcanist"; - version = "20200127"; + version = "20200711"; - src = [ arcanist libphutil ]; - buildInputs = [ php makeWrapper flex ]; - - unpackPhase = '' - cp -aR ${libphutil} libphutil - cp -aR ${arcanist} arcanist - chmod +w -R libphutil arcanist - ''; + src = fetchFromGitHub { + owner = "phacility"; + repo = "arcanist"; + rev = "2565cc7b4d1dbce6bc7a5b3c4e72ae94be4712fe"; + sha256 = "0jiv4aj4m5750dqw9r8hizjkwiyxk4cg4grkr63sllsa2dpiibxw"; + }; + buildInputs = [ php flex ]; postPatch = stdenv.lib.optionalString stdenv.isAarch64 '' - substituteInPlace libphutil/support/xhpast/Makefile \ + substituteInPlace support/xhpast/Makefile \ --replace "-minline-all-stringops" "" ''; buildPhase = '' - ( - cd libphutil/support/xhpast - make clean all install - ) + make xhpast -C support/xhpast ''; + installPhase = '' mkdir -p $out/bin $out/libexec - cp -R libphutil $out/libexec/libphutil - cp -R arcanist $out/libexec/arcanist - ${if stdenv.isDarwin then '' - echo "#! $shell -e" > $out/bin/arc - echo "exec ${php}/bin/php $out/libexec/arcanist/scripts/arcanist.php "'"$@"' >> $out/bin/arc - chmod +x $out/bin/arc'' - else '' - ln -s $out/libexec/arcanist/scripts/arcanist.php $out/bin/arc''} + make install -C support/xhpast + cp -R $src $out/libexec/arcanist + + ${makeArcWrapper "arc"} + ${makeArcWrapper "phage"} + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/arc help diff -- > /dev/null + $out/bin/phage help alias -- > /dev/null ''; meta = { From 2351189166a700dbcaa00edcb38e95adb509b428 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 6 Aug 2020 21:47:40 +1000 Subject: [PATCH 048/143] .github/workflows/*: minor fixes --- .github/workflows/editorconfig.yml | 2 +- .github/workflows/wait-ofborg.yml | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/workflows/editorconfig.yml b/.github/workflows/editorconfig.yml index 21532a0ded6d..a3b6c54bb6ab 100644 --- a/.github/workflows/editorconfig.yml +++ b/.github/workflows/editorconfig.yml @@ -11,7 +11,7 @@ jobs: with: fetch-depth: 0 - uses: technote-space/get-diff-action@v2.0.3 - - name: fetch editorconfig-checker + - name: Fetch editorconfig-checker env: VERSION: "2.1.0" OS: "linux" diff --git a/.github/workflows/wait-ofborg.yml b/.github/workflows/wait-ofborg.yml index 3b40586fc27e..7b1518896f42 100644 --- a/.github/workflows/wait-ofborg.yml +++ b/.github/workflows/wait-ofborg.yml @@ -7,8 +7,9 @@ jobs: steps: - name: Wait for ofborg CI run: | + # Wait for ofborg ... # eval sometimes takes a bit longer on staging. - if [[ "$BASE_BRANCH" == "refs/heads/staging" ]]; then + if [[ "$BASE_BRANCH" == "staging" ]]; then COUNTDOWN=$((COUNTDOWN*2)) fi # ..in future a better fix would be to make ofborg mark CI as pending right away. From 3f1eb9524c249c1512e5e23d2124277cc2b2aaa3 Mon Sep 17 00:00:00 2001 From: s1341 Date: Thu, 6 Aug 2020 15:24:35 +0300 Subject: [PATCH 049/143] pahole: 1.16 -> 1.17 --- pkgs/development/tools/misc/pahole/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/pahole/default.nix b/pkgs/development/tools/misc/pahole/default.nix index 8541c7a307a2..bb88862a8e8e 100644 --- a/pkgs/development/tools/misc/pahole/default.nix +++ b/pkgs/development/tools/misc/pahole/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pahole"; - version = "1.16"; + version = "1.17"; src = fetchgit { url = "https://git.kernel.org/pub/scm/devel/pahole/pahole.git"; rev = "v${version}"; - sha256 = "1gfc9v4dgs811v1zjk0d9hsgmizllw2hibc83ykmakzysimaxsy3"; + sha256 = "13dxsmhpf9n2wqggf4gd6f12rm0vhv0q96jd50gkvaxzzvgpzzbc"; }; nativeBuildInputs = [ cmake ]; From deb12d397abd533a9a29183ab86cba6ec3a25244 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 6 Aug 2020 08:36:38 -0400 Subject: [PATCH 050/143] linux/hardened/patches/5.6: remove --- pkgs/os-specific/linux/kernel/hardened/patches.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/hardened/patches.json b/pkgs/os-specific/linux/kernel/hardened/patches.json index 4481efef588b..f6070e77d4c3 100644 --- a/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -14,11 +14,6 @@ "sha256": "16h3iiqf6z8v6bbymxrp36w15qil5lfr6y48vwh99dx1yyrgdyzp", "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.54.a/linux-hardened-5.4.54.a.patch" }, - "5.6": { - "name": "linux-hardened-5.6.19.a.patch", - "sha256": "0gxdbcig6hpjxj6qr4lrj773gb76s0xlkrk3hclxk4ms6p82y4mm", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.6.19.a/linux-hardened-5.6.19.a.patch" - }, "5.7": { "name": "linux-hardened-5.7.11.a.patch", "sha256": "0vamaqrcs8nq8pjgq86lrxq0cdkr5kp4vydp8z2sr27q7ninnrla", From 0834620befa00497f47ae52718a7053bbce61fdb Mon Sep 17 00:00:00 2001 From: "B. Kelly" Date: Thu, 6 Aug 2020 08:36:55 -0400 Subject: [PATCH 051/143] libmysofa: disable CODE_COVERAGE in build Leaving it on generates huge amounts of stderr spam from anything that links it (such as ffmpeg) as it tries (and fails) to create profiling records in /build. --- pkgs/development/libraries/audio/libmysofa/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/audio/libmysofa/default.nix b/pkgs/development/libraries/audio/libmysofa/default.nix index 5324fe0685d6..c2b2725c19cc 100644 --- a/pkgs/development/libraries/audio/libmysofa/default.nix +++ b/pkgs/development/libraries/audio/libmysofa/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ zlib ]; - cmakeFlags = [ "-DBUILD_TESTS=OFF" ]; + cmakeFlags = [ "-DBUILD_TESTS=OFF" "-DCODE_COVERAGE=OFF" ]; meta = with stdenv.lib; { description = "Reader for AES SOFA files to get better HRTFs"; From be42a66cd30e6bc957d919a9afbb0eb83adb6c26 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 6 Aug 2020 08:37:22 -0400 Subject: [PATCH 052/143] oh-my-zsh: 2020-07-30 -> 2020-08-06 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 1f22099e9010..f6553cf63421 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2020-07-30"; + version = "2020-08-06"; pname = "oh-my-zsh"; - rev = "8755c5f101f801738dd249c7685dcf30dd03a7b2"; + rev = "079e7bb5e0a79171f3356d55d3f6302a82645a39"; src = fetchgit { inherit rev; url = "https://github.com/ohmyzsh/ohmyzsh"; - sha256 = "0z6bcv91xxfnaj42n7yzlx0wv14f87wws0n5cciy2g4yd3kyzmkq"; + sha256 = "10fpq57alk117991wwbprcmv69f27hbpp7a3gb70mzyjmfiflgk3"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From 0afe6a282a52054fbedec9d262b32ddb066271e2 Mon Sep 17 00:00:00 2001 From: Matt McHenry Date: Mon, 27 Jul 2020 13:44:33 -0400 Subject: [PATCH 053/143] openjdk8: 1.8.0_242 -> 1.8.0_265 --- pkgs/development/compilers/openjdk/8.nix | 36 ++++++++++++------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/pkgs/development/compilers/openjdk/8.nix b/pkgs/development/compilers/openjdk/8.nix index 828df621b6f1..f1379c209b37 100644 --- a/pkgs/development/compilers/openjdk/8.nix +++ b/pkgs/development/compilers/openjdk/8.nix @@ -19,8 +19,8 @@ let aarch64-linux = "aarch64"; }.${stdenv.system} or (throw "Unsupported platform"); - update = "242"; - build = "b08"; + update = "265"; + build = if stdenv.isAarch64 then "b01" else "ga"; baseurl = if stdenv.isAarch64 then "https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah" else "https://hg.openjdk.java.net/jdk8u/jdk8u"; repover = lib.optionalString stdenv.isAarch64 "aarch64-shenandoah-" @@ -29,50 +29,50 @@ let jdk8 = fetchurl { name = "jdk8-${repover}.tar.gz"; url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "0qpmr267qcxhmw398zbl1axd161yxn4k4hfz1jlxlmdvg70p7h90" - else "1crs4hmzmgm6fkwfq0d3xz9lph0nd33fngrqv2rz1mkkqcrjx18z"; + sha256 = if stdenv.isAarch64 then "1a2adw51af064rzlngsdlhs9gl47h3lv6dzvr8swqgl2n93nlbxa" + else "02j1nbf3rxl581fqzc6i3ri6wwxx1dhkmj5klkh5xlp8dkhclr30"; }; langtools = fetchurl { name = "langtools-${repover}.tar.gz"; url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "1rhhi4kgmxvnyl3ic5p008p1n7zyji5nw99blm1lr5fw7ry7df24" - else "1aaxd1rl7dlk4kxdivvqvripsbn0d5vny0jvjksycsm97vrfiry4"; + sha256 = if stdenv.isAarch64 then "0hfrbz7421s2barfrfp0fvmh45iksw2zx1z4ykjg3giv8zbmswfm" + else "1r2adp7sn3y45rb5h059qygz18bgmkqr2g2jc9mpzskl5vwsqiw4"; }; hotspot = fetchurl { name = "hotspot-${repover}.tar.gz"; url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "0lphrhjqlavd6qlkh7h4sd2bqf5gd0cchkcnvy87703fbd7gy5ii" - else "18i4if16zikgda9k5bgqyx0p2104db23zlnclq512178z0p9yycb"; + sha256 = if stdenv.isAarch64 then "0g5h74snfl2dj2xwlvb5hgfbqmnbhxax68axadz11mq7r2bhd0lk" + else "10xj8qr499r6nla74bjh4dmq7pkj63iircijk1wyv9xz5v777pcc"; }; corba = fetchurl { name = "corba-${repover}.tar.gz"; url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "18h0v566v420d00na6x4jrs41v4aa39byk15fi8k6dcn0dmirhvg" - else "1298k8p2dsj7xc4h2ayk5nl4ssrcgncn06ysyqrmnwrb8gj8s1w4"; + sha256 = if stdenv.isAarch64 then "0wfqrpr5m4gnavgsl6zcy2l3c7sgn3yl7yhp2crh9icp44ld2cj9" + else "0lk4jimrafgphffsj5yyyhl6pib0y5xxqcr09bgr2w8sjkp4s04s"; }; jdk = fetchurl { name = "jdk-${repover}.tar.gz"; url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "0xxy7rkj8ah263nnzkd4mg9dai5qix3l9cyilm47dig5hv7g8aq0" - else "0vqlbks3cy3cnmnrnhbjkqinvp8bcy2h96xvx81cvlza4s2hszvz"; + sha256 = if stdenv.isAarch64 then "0ss49bv2dzb9vkabpv1ag04wli5722p0a8gqkzqmzw4nj67snfqw" + else "0anbp4vq8bzhqsqxlgjd0dx0irf57x4i5ddbpljl36vy2pi9xsm7"; }; jaxws = fetchurl { name = "jaxws-${repover}.tar.gz"; url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "0ajqm2l9g5w5ag5s4vl4ldpbm99pqa6d342hrzvv7psqn3zf6ar5" - else "1wg9fbiz09arj0llavnzrmbhw8nx0dw8dcjkrzxw78rj1cadflzc"; + sha256 = if stdenv.isAarch64 then "1nwn6mz38app6pk5f1x3vya1x9qfckyl7z6bi62k6mj2c72ikfh5" + else "113d5nx2mp30m6xy2m2wh0nixk45q8abimlszkiq09w1w1ckzpba"; }; jaxp = fetchurl { name = "jaxp-${repover}.tar.gz"; url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "03zjh6xvza05abxz9d9j2w9xndw9n07f8lrn6dymj7f4imals831" - else "1i5xrk8r8pcgnc68zrgp3hd1a1nzcm99swpmdnlb424qlg5nnrcf"; + sha256 = if stdenv.isAarch64 then "1rhgbwvp7xls7r3f5jm69dw7x521vamchv917dwiz1byvm2bwn7s" + else "0nvqidjssmamcrchq15cg3lfv5v3cnrw05a4h20xmhlpgb9im0vj"; }; nashorn = fetchurl { name = "nashorn-${repover}.tar.gz"; url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "0n809w264ndxksva9c81x0m1fsyg8c627w571f72xxxl9c1bnrmp" - else "0qlxaz7sriy709vcyzz48s2v4p5h4d31my33whip018c4j5gkfqq"; + sha256 = if stdenv.isAarch64 then "14gp8q6jw1hq2wlmcalfwn1kgmnq5w9svqnbjww20f25phxkicij" + else "0fm9ldps7ayk7r3wjqiyxp1s6hvi242kl7f92ydkmlxqyfajx60a"; }; openjdk8 = stdenv.mkDerivation { pname = "openjdk" + lib.optionalString headless "-headless"; From 0c0cfa7b8ca7798c40e5c8ce3df0f896753f13d2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Aug 2020 14:16:13 +0000 Subject: [PATCH 054/143] mcfly: 0.4.0 -> 0.4.1 --- pkgs/tools/misc/mcfly/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/mcfly/default.nix b/pkgs/tools/misc/mcfly/default.nix index 7feb2fce7107..1e5a68d9e7b1 100644 --- a/pkgs/tools/misc/mcfly/default.nix +++ b/pkgs/tools/misc/mcfly/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "mcfly"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "cantino"; repo = "mcfly"; rev = "v${version}"; - sha256 = "01rw7gdvpr2s3yj7wphsm5gfrgzf5jkrci4mpqiw7xp8d5k87nzl"; + sha256 = "0fgnhm0b1sd6n12fa2cwlb5b8q4jjm9lqik4lx3l2hv5pkp3dcmb"; }; preInstall = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { install -Dm644 -t $out/share/mcfly mcfly.zsh ''; - cargoSha256 = "1q1mi69prn9q1nk4021c69vq160ls6md6gpqxk7zyf25r5ckdd98"; + cargoSha256 = "11vc4r3cx5amkrmh4hhc174bca02a87i7hfjb33adjvipphfm83f"; meta = with stdenv.lib; { homepage = "https://github.com/cantino/mcfly"; From d3178c99ccfd9a46d4615cc2863ad08e34d3eaab Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Aug 2020 14:56:49 +0000 Subject: [PATCH 055/143] monolith: 2.3.0 -> 2.3.1 --- pkgs/tools/backup/monolith/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/backup/monolith/default.nix b/pkgs/tools/backup/monolith/default.nix index 43703cce32ce..9d33ce1f3f85 100644 --- a/pkgs/tools/backup/monolith/default.nix +++ b/pkgs/tools/backup/monolith/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "monolith"; - version = "2.3.0"; + version = "2.3.1"; src = fetchFromGitHub { owner = "Y2Z"; repo = pname; rev = "v${version}"; - sha256 = "0jr9vsmjx6dfkkl2lnk8nc3i3snivy5za0zvcazss54xpa3k0fh1"; + sha256 = "16k5mp64a5l063rdj65hbpx414xv0bqdvhvz49k8018f2a2jj5xl"; }; - cargoSha256 = "15zz168igc255kyqd6nl9p2cm1s1hs6bp72jdxjvpzgsg990jp46"; + cargoSha256 = "0s5mv8mymycz4ga4zh9kbrhwmhgl4j01pw1sdzxy49l9waryk9p3"; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = stdenv.lib.optionals stdenv.isLinux [ openssl ] From 1e6f11a2d0ec644d0a9671679d81d5d79c3ad12b Mon Sep 17 00:00:00 2001 From: Kovacsics Robert Date: Mon, 29 Jun 2020 17:17:24 +0100 Subject: [PATCH 056/143] antimicro 2.3 -> antimicroX 3.0 Antimicro is broken an no longer maintained (and doesn't compile). AntimicroX is a fork that does compile, so this removes antimicro and adds antimicroX. --- pkgs/tools/misc/antimicro/default.nix | 27 ---------------- pkgs/tools/misc/antimicroX/default.nix | 44 ++++++++++++++++++++++++++ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 46 insertions(+), 28 deletions(-) delete mode 100644 pkgs/tools/misc/antimicro/default.nix create mode 100644 pkgs/tools/misc/antimicroX/default.nix diff --git a/pkgs/tools/misc/antimicro/default.nix b/pkgs/tools/misc/antimicro/default.nix deleted file mode 100644 index ad86bdef80af..000000000000 --- a/pkgs/tools/misc/antimicro/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ mkDerivation, lib, cmake, pkgconfig, SDL2, qtbase, qttools, xorg, fetchFromGitHub }: - -mkDerivation rec { - pname = "antimicro"; - version = "2.23"; - - src = fetchFromGitHub { - owner = "AntiMicro"; - repo = "antimicro"; - rev = version; - sha256 = "1q40ayxwwyq85lc89cnj1cm2nar625h4vhh8dvmb2qcxczaggf4v"; - }; - - nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ - SDL2 qtbase qttools xorg.libXtst - ]; - - meta = with lib; { - description = "GUI for mapping keyboard and mouse controls to a gamepad"; - inherit (src.meta) homepage; - maintainers = with maintainers; [ jb55 ]; - license = licenses.gpl3; - platforms = with platforms; linux; - broken = true; # 2018-04-10 - }; -} diff --git a/pkgs/tools/misc/antimicroX/default.nix b/pkgs/tools/misc/antimicroX/default.nix new file mode 100644 index 000000000000..23418ced829e --- /dev/null +++ b/pkgs/tools/misc/antimicroX/default.nix @@ -0,0 +1,44 @@ +{ mkDerivation +, lib +, cmake +, extra-cmake-modules +, pkgconfig +, SDL2 +, qtbase +, qttools +, qtx11extras +, xorg +, fetchFromGitHub +, itstool +}: + +mkDerivation rec { + pname = "antimicroX"; + version = "3.0"; + + src = fetchFromGitHub { + owner = "juliagoda"; + repo = "antimicroX"; + rev = version; + sha256 = "0li22sjl95233azxhyda36idnfzbb4b02wf57hnpnba6qvrlpwwl"; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules pkgconfig itstool ]; + buildInputs = [ + SDL2 + qtbase + qttools + qtx11extras + xorg.libX11 + xorg.libXtst + xorg.libXi + ]; + + meta = with lib; { + description = "GUI for mapping keyboard and mouse controls to a gamepad"; + inherit (src.meta) homepage; + maintainers = with maintainers; [ jb55 ]; + license = licenses.gpl3Plus; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 88e7d4d9e844..a6f2971da4f0 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -42,6 +42,7 @@ mapAliases ({ aircrackng = aircrack-ng; # added 2016-01-14 alienfx = throw "alienfx has been removed."; # added 2019-12-08 ammonite-repl = ammonite; # added 2017-05-02 + antimicro = throw "antimicro has been removed as it was broken, see antimicroX instead."; # added 2020-08-06 arduino_core = arduino-core; # added 2015-02-04 asciidocFull = asciidoc-full; # added 2014-06-22 at_spi2_atk = at-spi2-atk; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ef0d40f91b1d..65e61fdf2233 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25026,7 +25026,7 @@ in android-file-transfer = libsForQt5.callPackage ../tools/filesystems/android-file-transfer { }; - antimicro = libsForQt5.callPackage ../tools/misc/antimicro { }; + antimicroX = libsForQt5.callPackage ../tools/misc/antimicroX { }; atari800 = callPackage ../misc/emulators/atari800 { }; From cecc4ce36184fb1051ac6924ebf5d65b5e0668aa Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 6 Aug 2020 18:21:43 +0200 Subject: [PATCH 057/143] php.extensions.{mongodb,intl}: switch back to icu64 See https://hydra.nixos.org/build/124676672 Introduced by 4afdb415d2147d60f1fb2aa24dc07c14fa4f6b59 Closes #94798 --- pkgs/top-level/php-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index e45f9a5bf15e..578dcaf761bf 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -1,5 +1,5 @@ { stdenv, lib, pkgs, fetchgit, php, autoconf, pkgconfig, re2c -, gettext, bzip2, curl, libxml2, openssl, gmp, icu, oniguruma, libsodium +, gettext, bzip2, curl, libxml2, openssl, gmp, icu64, oniguruma, libsodium , html-tidy, libzip, zlib, pcre, pcre2, libxslt, aspell, openldap, cyrus_sasl , uwimap, pam, libiconv, enchant1, libXpm, gd, libwebp, libjpeg, libpng , freetype, libffi, freetds, postgresql, sqlite, net-snmp, unixODBC, libedit @@ -547,7 +547,7 @@ in nativeBuildInputs = [ pkgs.pkgconfig ]; buildInputs = with pkgs; [ cyrus_sasl - icu + icu64 openssl snappy zlib @@ -972,7 +972,7 @@ in enable = (!stdenv.isDarwin); } # interbase (7.3, 7.2) { name = "intl"; - buildInputs = [ icu ]; + buildInputs = [ icu64 ]; patches = lib.optional (lib.versionOlder php.version "7.4") (fetchpatch { url = "https://github.com/php/php-src/commit/93a9b56c90c334896e977721bfb3f38b1721cec6.patch"; sha256 = "055l40lpyhb0rbjn6y23qkzdhvpp7inbnn6x13cpn4inmhjqfpg4"; From 430936519c80b080462fd625c5b500f2d730cf1f Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Tue, 28 Jul 2020 17:20:43 -0400 Subject: [PATCH 058/143] python3Packages.wxPython_4_0: remove unused dependencies The package contains no references to many of its declared dependencies, and the build succeeds without them. --- .../python-modules/wxPython/4.0.nix | 28 ++++--------------- 1 file changed, 5 insertions(+), 23 deletions(-) diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix index e185e26a4f7e..53a3f6b1e319 100644 --- a/pkgs/development/python-modules/wxPython/4.0.nix +++ b/pkgs/development/python-modules/wxPython/4.0.nix @@ -1,29 +1,18 @@ { lib , stdenv -, openglSupport ? true -, libX11 -, pyopengl , buildPythonPackage , fetchPypi , pkgconfig -, libjpeg -, libtiff -, SDL -, gst-plugins-base -, libnotify -, freeglut -, xorg , which , cairo -, requests , pango -, pathlib2 , python , doxygen , ncurses -, libpng -, gstreamer , wxGTK +, numpy +, pillow +, six }: buildPythonPackage rec { @@ -38,14 +27,7 @@ buildPythonPackage rec { doCheck = false; nativeBuildInputs = [ pkgconfig which doxygen wxGTK ]; - - buildInputs = [ libjpeg libtiff SDL - gst-plugins-base libnotify freeglut xorg.libSM ncurses - requests libpng gstreamer libX11 - pathlib2 - (wxGTK.gtk) - ] - ++ lib.optional openglSupport pyopengl; + buildInputs = [ ncurses wxGTK.gtk ]; hardeningDisable = [ "format" ]; @@ -71,7 +53,7 @@ buildPythonPackage rec { wrapPythonPrograms ''; - passthru = { inherit wxGTK openglSupport; }; + passthru = { inherit wxGTK; }; meta = { From 8b76b92065fa720bab7b5300f0018bd48a8549e1 Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Tue, 28 Jul 2020 17:23:57 -0400 Subject: [PATCH 059/143] python3Packages.wxPython_4_0: enable format hardening This was inherited from wxPython 3 and does not seem to be necessary. --- pkgs/development/python-modules/wxPython/4.0.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix index 53a3f6b1e319..cd1e5b063bdb 100644 --- a/pkgs/development/python-modules/wxPython/4.0.nix +++ b/pkgs/development/python-modules/wxPython/4.0.nix @@ -29,8 +29,6 @@ buildPythonPackage rec { nativeBuildInputs = [ pkgconfig which doxygen wxGTK ]; buildInputs = [ ncurses wxGTK.gtk ]; - hardeningDisable = [ "format" ]; - DOXYGEN = "${doxygen}/bin/doxygen"; preConfigure = lib.optionalString (!stdenv.isDarwin) '' From 7f15e31671e6311fbf3f6ec0f5c154719cf3b61a Mon Sep 17 00:00:00 2001 From: Ben Wolsieffer Date: Wed, 29 Jul 2020 00:33:53 -0400 Subject: [PATCH 060/143] python3Packages.wxPython_4_0: remove manual wrapPythonPrograms invocation This was causing programs to be wrapped twice, as wrapping occurs automatically during the fixup phase. --- pkgs/development/python-modules/wxPython/4.0.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/python-modules/wxPython/4.0.nix b/pkgs/development/python-modules/wxPython/4.0.nix index cd1e5b063bdb..406493362c46 100644 --- a/pkgs/development/python-modules/wxPython/4.0.nix +++ b/pkgs/development/python-modules/wxPython/4.0.nix @@ -48,7 +48,6 @@ buildPythonPackage rec { installPhase = '' ${python.interpreter} setup.py install --skip-build --prefix=$out - wrapPythonPrograms ''; passthru = { inherit wxGTK; }; From 77c4dae8bcf4ea667f3a38f57abb28af958909a6 Mon Sep 17 00:00:00 2001 From: David Arnold Date: Thu, 6 Aug 2020 12:07:07 -0500 Subject: [PATCH 061/143] =?UTF-8?q?skaffold:=201.12.1=20=E2=86=92=201.13.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/tools/skaffold/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 398f524af081..032f64bc3481 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "skaffold"; - version = "1.12.1"; + version = "1.13.1"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -19,7 +19,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "1mk4mn9h44v2xs65jjslmi03j3bixg0fkn396hmxp718w68850lz"; + sha256 = "1v6napcpx8k45s8w55lbxahfc1p0qlvl597zgb4dzyg9w67fwnqk"; }; nativeBuildInputs = [ installShellFiles ]; From 4390d9b9f188e825329378c5ce7dc4e086efe1d7 Mon Sep 17 00:00:00 2001 From: Matt Huszagh Date: Sun, 20 Oct 2019 17:53:38 -0700 Subject: [PATCH 062/143] hyp2mat: init at 0.0.17 --- .../science/electronics/hyp2mat/default.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/applications/science/electronics/hyp2mat/default.nix diff --git a/pkgs/applications/science/electronics/hyp2mat/default.nix b/pkgs/applications/science/electronics/hyp2mat/default.nix new file mode 100644 index 000000000000..1fa2c23b5698 --- /dev/null +++ b/pkgs/applications/science/electronics/hyp2mat/default.nix @@ -0,0 +1,53 @@ +{ stdenv +, fetchFromGitHub +, bison +, flex +, gengetopt +, help2man +, groff +, libharu +, autoreconfHook +, pkgconfig +, libpng +, zlib +}: + +stdenv.mkDerivation rec { + pname = "hyp2mat"; + version = "0.0.17"; + + src = fetchFromGitHub { + owner = "koendv"; + repo = "hyp2mat"; + rev = "v${version}"; + sha256 = "04bd2vrn8y1izir7pwl34a60cg2v05baqcrmpfdx5fvf33bbflaj"; + }; + + nativeBuildInputs = [ + autoreconfHook + pkgconfig + ]; + + buildInputs = [ + libharu + libpng + zlib + bison + flex + gengetopt + help2man + groff + ]; + + configureFlags = [ "--enable-library" ]; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Import Hyperlynx Boardsim files to openEMS, an open source 3D full-wave electromagnetic field solver"; + homepage = https://github.com/koendv/hyp2mat; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ matthuszagh ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9eee817b2634..989fec457f91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -25689,6 +25689,8 @@ in gtkwave = callPackage ../applications/science/electronics/gtkwave { }; + hyp2mat = callPackage ../applications/science/electronics/hyp2mat { }; + fped = callPackage ../applications/science/electronics/fped { }; # this is a wrapper for kicad.base and kicad.libraries From d4554905299a4de8dca1051e1595e543a612c7df Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Aug 2020 17:26:43 +0000 Subject: [PATCH 063/143] musikcube: 0.92.1 -> 0.93.1 --- pkgs/applications/audio/musikcube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/musikcube/default.nix b/pkgs/applications/audio/musikcube/default.nix index 0c4e2c71dd95..8fc0616ff73b 100644 --- a/pkgs/applications/audio/musikcube/default.nix +++ b/pkgs/applications/audio/musikcube/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "musikcube"; - version = "0.92.1"; + version = "0.93.1"; src = fetchFromGitHub { owner = "clangen"; repo = pname; rev = version; - sha256 = "0l4ncxqxvp5m014j7vlglhzxhhrxl0c2m71xn0i0a27hn4nc72mr"; + sha256 = "05qsxyr7x8l0vlmn4yjg4gglxvcw9raf6vfzvblsl2ngsdsrnizy"; }; nativeBuildInputs = [ From cee4e14bdf7302e48d313264c0c34a418320bba5 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Thu, 6 Aug 2020 19:45:14 +0200 Subject: [PATCH 064/143] nixos/postgresql: fix setup script The missing () caused parts of the escripts to be added to the ExecStartPost line instead of inside the script. This caused postgresql start to fail under certain conditions. --- nixos/modules/services/databases/postgresql.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/databases/postgresql.nix b/nixos/modules/services/databases/postgresql.nix index 59c9325ca907..3e16b5907dd0 100644 --- a/nixos/modules/services/databases/postgresql.nix +++ b/nixos/modules/services/databases/postgresql.nix @@ -333,7 +333,7 @@ in # Wait for PostgreSQL to be ready to accept connections. ExecStartPost = let - setupScript = pkgs.writeScript "postgresql-setup" '' + setupScript = pkgs.writeScript "postgresql-setup" ('' #!${pkgs.runtimeShell} -e PSQL="${pkgs.utillinux}/bin/runuser -u ${cfg.superUser} -- psql --port=${toString cfg.port}" @@ -360,7 +360,7 @@ in $PSQL -tAc 'GRANT ${permission} ON ${database} TO "${user.name}"' '') user.ensurePermissions)} '') cfg.ensureUsers} - ''; + ''); in "+${setupScript}"; } From a4e77ce9cff170dbb2e49be7c9442a76bf49950e Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 6 Aug 2020 20:10:03 +0200 Subject: [PATCH 065/143] strace: 5.7 -> 5.8 https://github.com/strace/strace/releases/tag/v5.8 --- pkgs/development/tools/misc/strace/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/strace/default.nix b/pkgs/development/tools/misc/strace/default.nix index cbae92dd6d13..ccbed6d430af 100644 --- a/pkgs/development/tools/misc/strace/default.nix +++ b/pkgs/development/tools/misc/strace/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "strace"; - version = "5.7"; + version = "5.8"; src = fetchurl { url = "https://strace.io/files/${version}/${pname}-${version}.tar.xz"; - sha256 = "1n6cfz3i2krkyvxpdp3kmxhf7sy5xp0danzaiirbk5fdkfgvb15j"; + sha256 = "1abs3svkg9985f4jrxx34sj1dcpsf95vv1a0g01c777zgygncjnz"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From ded6c3db4ef5a2c50c033eeed7cd8c688369c137 Mon Sep 17 00:00:00 2001 From: ldesgoui Date: Thu, 6 Aug 2020 20:50:30 +0200 Subject: [PATCH 066/143] discord: 0.0.10 -> 0.0.11 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index a79065a0f8a8..595f5691832b 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -7,10 +7,10 @@ in { pname = "discord"; binaryName = "Discord"; desktopName = "Discord"; - version = "0.0.10"; + version = "0.0.11"; src = fetchurl { url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; - sha256 = "0kx92i8naqr3algmyy3wyzbh8146z7gigxwf1nbpg1gl16wlplaq"; + sha256 = "1saqwigi1gjgy4q8rgnwyni57aaszi0w9vqssgyvfgzff8fpcx54"; }; }; ptb = callPackage ./base.nix rec { From deb0a6ce6e2add99b24bdd93f534bf703004e56e Mon Sep 17 00:00:00 2001 From: Matt Huszagh Date: Sun, 20 Oct 2019 18:01:29 -0700 Subject: [PATCH 067/143] gl2ps: make cmake a native build input --- pkgs/development/libraries/gl2ps/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gl2ps/default.nix b/pkgs/development/libraries/gl2ps/default.nix index 85a9944fcf7b..172531f9dc7c 100644 --- a/pkgs/development/libraries/gl2ps/default.nix +++ b/pkgs/development/libraries/gl2ps/default.nix @@ -1,17 +1,27 @@ -{ stdenv, fetchurl, cmake -, zlib, libGL, libGLU, libpng, freeglut }: +{ stdenv +, fetchurl +, cmake +, zlib +, libGL +, libGLU +, libpng +, freeglut +}: stdenv.mkDerivation rec { - version = "1.4.2"; pname = "gl2ps"; + version = "1.4.2"; src = fetchurl { url = "http://geuz.org/gl2ps/src/${pname}-${version}.tgz"; sha256 = "1sgzv547h7hrskb9qd0x5yp45kmhvibjwj2mfswv95lg070h074d"; }; - buildInputs = [ + nativeBuildInputs = [ cmake + ]; + + buildInputs = [ zlib libGL libGLU From 5efc22d2b92a112b56672f48e94915ac0d217a1b Mon Sep 17 00:00:00 2001 From: Dominic Delabruere Date: Thu, 30 Jul 2020 13:51:40 -0400 Subject: [PATCH 068/143] sfrotz: init at 2.52 sfrotz is an SDL interface version of frotz, the Z-machine interpreter which plays both Infocom games and newer games targeting the Z-machine. Unlike the curses interface version of Frotz, SDL Frotz can handle the graphics in Z-machine version 6 games. --- pkgs/games/sfrotz/default.nix | 69 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 71 insertions(+) create mode 100644 pkgs/games/sfrotz/default.nix diff --git a/pkgs/games/sfrotz/default.nix b/pkgs/games/sfrotz/default.nix new file mode 100644 index 000000000000..6e4839703a1c --- /dev/null +++ b/pkgs/games/sfrotz/default.nix @@ -0,0 +1,69 @@ +{ fetchFromGitLab +, freetype +, libao +, libjpeg +, libmodplug +, libpng +, libsamplerate +, libsndfile +, libvorbis +, pkg-config +, SDL2 +, SDL2_mixer +, stdenv +, zlib }: + +stdenv.mkDerivation rec { + pname = "sfrotz"; + version = "2.52"; + + src = fetchFromGitLab { + domain = "gitlab.com"; + owner = "DavidGriffith"; + repo = "frotz"; + rev = version; + sha256 = "11ca1dz31b7s5vxjqncwjwmbbcr2m5v2rxjn49g4gnvwd6mqw48y"; + }; + + buildInputs = [ + freetype + libao + libjpeg + libmodplug + libpng + libsamplerate + libsndfile + libvorbis + SDL2 + SDL2_mixer + zlib + ]; + nativeBuildInputs = [ pkg-config ]; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + buildPhase = "make sdl"; + installTargets = [ "install_sfrotz" ]; + + meta = with stdenv.lib; { + description = + "Interpreter for Infocom and other Z-Machine games (SDL interface)"; + longDescription = '' + Frotz is a Z-Machine interpreter. The Z-machine is a virtual machine + designed by Infocom to run all of their text adventures. It went through + multiple revisions during the lifetime of the company, and two further + revisions (V7 and V8) were created by Graham Nelson after the company's + demise. The specification is now quite well documented; this version of + Frotz supports version 1.0. + + This version of Frotz fully supports all these versions of the Z-Machine + including the graphical version 6. Graphics and sound are created through + the use of the SDL libraries. AIFF sound effects and music in MOD and OGG + formats are supported when packaged in Blorb container files or optionally + from individual files. + ''; + homepage = "https://davidgriffith.gitlab.io/frotz/"; + changelog = "https://gitlab.com/DavidGriffith/frotz/-/raw/${version}/NEWS"; + license = licenses.gpl2; + maintainers = with maintainers; [ ddelabru ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5c1828cac658..a2649c3eabbc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24597,6 +24597,8 @@ in service-wrapper = callPackage ../os-specific/linux/service-wrapper { }; + sfrotz = callPackage ../games/sfrotz { }; + sgtpuzzles = callPackage (callPackage ../games/sgt-puzzles) { }; shattered-pixel-dungeon = callPackage ../games/shattered-pixel-dungeon { }; From 76ee4f6dbc20080d5ddd95bd22402fb809d30522 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 6 Aug 2020 12:02:07 -0700 Subject: [PATCH 069/143] discord-ptb: 0.0.20 -> 0.0.21 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 595f5691832b..643e32cbd649 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -17,10 +17,10 @@ in { pname = "discord-ptb"; binaryName = "DiscordPTB"; desktopName = "Discord PTB"; - version = "0.0.20"; + version = "0.0.21"; src = fetchurl { url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; - sha256 = "0wn2qdv0a4n59xl451y7fcq11klp2g63qwx40qkshllvnf5lzzsx"; + sha256 = "1i164wpi07d45w19i7l5hs47crc29k3plg4y9kc97x75rhh4xym1"; }; }; canary = callPackage ./base.nix rec { From 9fbbe30a44e31db059cd95de6046c01879f8c3dd Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 6 Aug 2020 12:03:44 -0700 Subject: [PATCH 070/143] discord-canary: 0.0.105 -> 0.0.106 --- .../networking/instant-messengers/discord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/discord/default.nix b/pkgs/applications/networking/instant-messengers/discord/default.nix index 643e32cbd649..b10e2ed1a1db 100644 --- a/pkgs/applications/networking/instant-messengers/discord/default.nix +++ b/pkgs/applications/networking/instant-messengers/discord/default.nix @@ -27,10 +27,10 @@ in { pname = "discord-canary"; binaryName = "DiscordCanary"; desktopName = "Discord Canary"; - version = "0.0.105"; + version = "0.0.106"; src = fetchurl { url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "1jc2zr8q33ras5mkifg19kcxpb84vsqx01rj66w62hsjw1nsbidg"; + sha256 = "1bqlf7iixdy6c7lhbva4lizvhd6w0xqn69izxcy26wk35xcqgfh8"; }; }; }.${branch} From 677125876e1ee623f2f79a799f791c1f40202052 Mon Sep 17 00:00:00 2001 From: Dominic Delabruere Date: Sat, 1 Aug 2020 14:11:36 -0400 Subject: [PATCH 071/143] frotz: 2.44 -> 2.52 As a bonus, this new derivation also adds unicode support, which the current nixpkgs build lacks. --- pkgs/games/frotz/default.nix | 33 ++++++++++++++++++++++++--------- 1 file changed, 24 insertions(+), 9 deletions(-) diff --git a/pkgs/games/frotz/default.nix b/pkgs/games/frotz/default.nix index 40b6748693d1..800da177a3dc 100644 --- a/pkgs/games/frotz/default.nix +++ b/pkgs/games/frotz/default.nix @@ -1,25 +1,40 @@ -{ stdenv, fetchFromGitHub, ncurses }: +{ fetchFromGitLab +, libao +, libmodplug +, libsamplerate +, libsndfile +, libvorbis +, ncurses +, stdenv }: stdenv.mkDerivation rec { - version = "2.44"; + version = "2.52"; pname = "frotz"; - src = fetchFromGitHub { + src = fetchFromGitLab { + domain = "gitlab.com"; owner = "DavidGriffith"; repo = "frotz"; rev = version; - sha256 = "0gjkk4gxzqmxfdirrz2lr0bms6l9fc31vkmlywigkbdlh8wxgypp"; + sha256 = "11ca1dz31b7s5vxjqncwjwmbbcr2m5v2rxjn49g4gnvwd6mqw48y"; }; - makeFlags = [ "CC=cc" "PREFIX=$(out)" "CURSES=-lncurses" ]; - - buildInputs = [ ncurses ]; + buildInputs = [ libao libmodplug libsamplerate libsndfile libvorbis ncurses ]; + preBuild = '' + makeFlagsArray+=( + CC="cc" + CFLAGS="-D_DEFAULT_SOURCE -D_XOPEN_SOURCE=600" + LDFLAGS="-lncursesw -ltinfo" + ) + ''; + installFlags = [ "PREFIX=$(out)" ]; meta = with stdenv.lib; { - homepage = "http://frotz.sourceforge.net/"; + homepage = "https://davidgriffith.gitlab.io/frotz/"; + changelog = "https://gitlab.com/DavidGriffith/frotz/-/raw/${version}/NEWS"; description = "A z-machine interpreter for Infocom games and other interactive fiction."; platforms = platforms.unix; - maintainers = [ maintainers.nicknovitski ]; + maintainers = with maintainers; [ nicknovitski ddelabru ]; license = licenses.gpl2; }; } From 048e885b29deeeaa61d717f7bd176ee68f1666c4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Aug 2020 19:25:28 +0000 Subject: [PATCH 072/143] kdeApplications.okteta: 0.26.3 -> 0.26.4 --- pkgs/applications/editors/okteta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/okteta/default.nix b/pkgs/applications/editors/okteta/default.nix index b9d92409198b..382fcd44257e 100644 --- a/pkgs/applications/editors/okteta/default.nix +++ b/pkgs/applications/editors/okteta/default.nix @@ -4,11 +4,11 @@ mkDerivation rec { pname = "okteta"; - version = "0.26.3"; + version = "0.26.4"; src = fetchurl { url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz"; - sha256 = "1454844s76skk18gpcf56y9pkmffs7p4z09ggmy37ifzf7yk1p19"; + sha256 = "00qgzm5mqx0j8f0fznhnw76l9pjyw3lxirvy8ssq59nqqjbb08pg"; }; nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ]; From 8fe906a8e1654e8a1716c9bec6e4f89cf9098b17 Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Mon, 20 Apr 2020 14:57:38 -0700 Subject: [PATCH 073/143] doona: init at unstable-2019-03-08 --- pkgs/tools/security/doona/default.nix | 36 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/tools/security/doona/default.nix diff --git a/pkgs/tools/security/doona/default.nix b/pkgs/tools/security/doona/default.nix new file mode 100644 index 000000000000..5e1233f308c3 --- /dev/null +++ b/pkgs/tools/security/doona/default.nix @@ -0,0 +1,36 @@ +{ fetchFromGitHub +, stdenv +, perl +}: + +stdenv.mkDerivation rec { + pname = "doona"; + version = "unstable-2019-03-08"; + + src = fetchFromGitHub { + owner = "wireghoul"; + repo = pname; + rev = "master"; + sha256 = "0x9irwrw5x2ia6ch6gshadrlqrgdi1ivkadmr7j4m75k04a7nvz1"; + }; + + buildInputs = [ perl ]; + + installPhase = '' + mkdir -p $out/bin + cp -r ${src}/bedmod $out/bin/bedmod + cp ${src}/doona.pl $out/bin/doona + chmod +x $out/bin/doona + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/wireghoul/doona"; + description = "A fork of the Bruteforce Exploit Detector Tool (BED)"; + longDescription = '' + A fork of the Bruteforce Exploit Detector Tool (BED). + BED is a program which is designed to check daemons for potential buffer overflows, format string bugs etc. + ''; + license = licenses.gpl2; + maintainers = with maintainers; [ pamplemousse ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2649c3eabbc..eec4fb4133d7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -955,6 +955,8 @@ in dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { }; + doona = callPackage ../tools/security/doona { }; + ecdsautils = callPackage ../tools/security/ecdsautils { }; sedutil = callPackage ../tools/security/sedutil { }; From bceadafba374d62eb3d9781486c35f5c7c701a4b Mon Sep 17 00:00:00 2001 From: Brandon Black Date: Thu, 6 Aug 2020 14:24:25 -0700 Subject: [PATCH 074/143] fritzing: use Qt's mkDerivation (#89117) --- pkgs/applications/science/electronics/fritzing/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/fritzing/default.nix b/pkgs/applications/science/electronics/fritzing/default.nix index a0442db7fed2..275100ac7fd4 100644 --- a/pkgs/applications/science/electronics/fritzing/default.nix +++ b/pkgs/applications/science/electronics/fritzing/default.nix @@ -1,8 +1,8 @@ -{ stdenv, fetchpatch, fetchFromGitHub, qmake, pkgconfig +{ mkDerivation, stdenv, fetchpatch, fetchFromGitHub, qmake, pkgconfig , qtbase, qtsvg, qtserialport, boost, libgit2 }: -stdenv.mkDerivation rec { +mkDerivation rec { pname = "fritzing"; version = "0.9.3b"; From f3c31c1f356c03487e0d5ba24a488b9282294160 Mon Sep 17 00:00:00 2001 From: Pascal Bach Date: Thu, 6 Aug 2020 23:37:34 +0200 Subject: [PATCH 075/143] marble: switch from qtwebkit to qtwebengine --- pkgs/applications/kde/marble.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/kde/marble.nix b/pkgs/applications/kde/marble.nix index b02e29e33513..f690e453361b 100644 --- a/pkgs/applications/kde/marble.nix +++ b/pkgs/applications/kde/marble.nix @@ -1,6 +1,6 @@ { mkDerivation, lib , extra-cmake-modules, kdoctools -, qtscript, qtsvg, qtquickcontrols, qtwebkit +, qtscript, qtsvg, qtquickcontrols, qtwebengine , krunner, shared-mime-info, kparts, knewstuff , gpsd, perl }: @@ -11,7 +11,7 @@ mkDerivation { outputs = [ "out" "dev" ]; nativeBuildInputs = [ extra-cmake-modules kdoctools perl ]; propagatedBuildInputs = [ - qtscript qtsvg qtquickcontrols qtwebkit shared-mime-info krunner kparts + qtscript qtsvg qtquickcontrols qtwebengine shared-mime-info krunner kparts knewstuff gpsd ]; preConfigure = '' From d55276d7c6c708512454c29bf6d8f733eed29208 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 5 Aug 2020 02:20:23 +0200 Subject: [PATCH 076/143] beets: apply patch to fix incompatibilites with python 3.8 https://github.com/beetbox/beets/pull/3621 https://github.com/python/cpython/pull/20649 --- ...h-breaking-changes-to-the-ast-module.patch | 55 +++++++++++++++++++ pkgs/tools/audio/beets/default.nix | 5 ++ 2 files changed, 60 insertions(+) create mode 100644 pkgs/tools/audio/beets/compatibility-with-breaking-changes-to-the-ast-module.patch diff --git a/pkgs/tools/audio/beets/compatibility-with-breaking-changes-to-the-ast-module.patch b/pkgs/tools/audio/beets/compatibility-with-breaking-changes-to-the-ast-module.patch new file mode 100644 index 000000000000..4865b6f62341 --- /dev/null +++ b/pkgs/tools/audio/beets/compatibility-with-breaking-changes-to-the-ast-module.patch @@ -0,0 +1,55 @@ +From 771ce704ebeac4cd9bd74b3ddde9fb01f3dc7eb4 Mon Sep 17 00:00:00 2001 +From: wisp3rwind <17089248+wisp3rwind@users.noreply.github.com> +Date: Tue, 9 Jun 2020 19:34:31 +0200 +Subject: [PATCH] compatibility with breaking changes to the ast module + +new in 3.10, also backported to 3.8 and 3.9: https://github.com/python/cpython/pull/20649 +In fact, our generation of some Literals has been invalid since Python +3.4, fix that too. +--- + beets/util/functemplate.py | 29 ++++++++++++++++++++--------- + 1 file changed, 20 insertions(+), 9 deletions(-) + +diff --git a/beets/util/functemplate.py b/beets/util/functemplate.py +index af22b790..266534a9 100644 +--- a/beets/util/functemplate.py ++++ b/beets/util/functemplate.py +@@ -73,15 +73,26 @@ def ex_literal(val): + """An int, float, long, bool, string, or None literal with the given + value. + """ +- if val is None: +- return ast.Name('None', ast.Load()) +- elif isinstance(val, six.integer_types): +- return ast.Num(val) +- elif isinstance(val, bool): +- return ast.Name(bytes(val), ast.Load()) +- elif isinstance(val, six.string_types): +- return ast.Str(val) +- raise TypeError(u'no literal for {0}'.format(type(val))) ++ if sys.version_info[:2] < (3, 4): ++ if val is None: ++ return ast.Name('None', ast.Load()) ++ elif isinstance(val, six.integer_types): ++ return ast.Num(val) ++ elif isinstance(val, bool): ++ return ast.Name(bytes(val), ast.Load()) ++ elif isinstance(val, six.string_types): ++ return ast.Str(val) ++ raise TypeError(u'no literal for {0}'.format(type(val))) ++ elif sys.version_info[:2] < (3, 6): ++ if val in [None, True, False]: ++ return ast.NameConstant(val) ++ elif isinstance(val, six.integer_types): ++ return ast.Num(val) ++ elif isinstance(val, six.string_types): ++ return ast.Str(val) ++ raise TypeError(u'no literal for {0}'.format(type(val))) ++ else: ++ return ast.Constant(val) + + + def ex_varassign(name, expr): +-- +2.27.0 + diff --git a/pkgs/tools/audio/beets/default.nix b/pkgs/tools/audio/beets/default.nix index 0f73b353169e..776eca999989 100644 --- a/pkgs/tools/audio/beets/default.nix +++ b/pkgs/tools/audio/beets/default.nix @@ -190,6 +190,11 @@ in pythonPackages.buildPythonApplication rec { url = "https://github.com/beetbox/beets/commit/d43d54e21cde97f57f19486925ab56b419254cc8.patch"; sha256 = "13n2gzmcgfi0m2ycl2r1hpczgksplnkc3y6b66vg57rx5y8nnv5c"; }) + + # Fixes 548 tests due to breaking changes to the ast module + # https://github.com/beetbox/beets/pull/3621 + # Can be dropped after 1.4.9 + ./compatibility-with-breaking-changes-to-the-ast-module.patch ]; postPatch = '' From 5144ec19c77d4615fe35532ae92c957edee75030 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 6 Aug 2020 15:21:59 -0700 Subject: [PATCH 077/143] jetbrains.rider: fix dotnet location --- pkgs/applications/editors/jetbrains/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 4e609462eaae..a4c0353af506 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -224,7 +224,8 @@ let interpreter=$(echo ${stdenv.glibc.out}/lib/ld-linux*.so.2) patchelf --set-interpreter "$interpreter" lib/ReSharperHost/linux-x64/mono/bin/mono-sgen rm -rf lib/ReSharperHost/linux-x64/dotnet - ln -s ${dotnet-sdk_3} lib/ReSharperHost/linux-x64/dotnet + mkdir -p lib/ReSharperHost/linux-x64/dotnet/ + ln -s ${dotnet-sdk_3}/bin/dotnet lib/ReSharperHost/linux-x64/dotnet/dotnet ''); }); From 8bb50e72d690362e6b5c6d504bcb392e6eba12b7 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 16 Feb 2020 15:22:43 -0800 Subject: [PATCH 078/143] Allow jdiskreport to build on Darwin --- pkgs/tools/misc/jdiskreport/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix index 094c42b59dd2..5e6c0bdd5968 100644 --- a/pkgs/tools/misc/jdiskreport/default.nix +++ b/pkgs/tools/misc/jdiskreport/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { homepage = "http://www.jgoodies.com/freeware/jdiskreport/"; description = "A graphical utility to visualize disk usage"; license = licenses.unfreeRedistributable; #TODO freedist, libs under BSD-3 - platforms = [ "x86_64-linux" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; maintainers = with maintainers; [ kylesferrazza ]; }; } From 7cd05de015b6b125c249f5012881249f5645a4d2 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Thu, 20 Feb 2020 17:51:16 -0800 Subject: [PATCH 079/143] multitail: add pkg-config dependency, needed for darwin builds --- pkgs/tools/misc/multitail/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/multitail/default.nix b/pkgs/tools/misc/multitail/default.nix index e0ac18a76b2d..db92d9830891 100644 --- a/pkgs/tools/misc/multitail/default.nix +++ b/pkgs/tools/misc/multitail/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses }: +{ stdenv, fetchurl, ncurses, pkg-config }: stdenv.mkDerivation rec { version = "6.5.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1vd9vdxyxsccl64ilx542ya5vlw2bpg6gnkq1x8cfqy6vxvmx7dj"; }; - buildInputs = [ ncurses ]; + buildInputs = [ ncurses pkg-config ]; makeFlags = stdenv.lib.optionals stdenv.isDarwin [ "-f" "makefile.macosx" ]; From ef3cb36ba4c237842f74039cb105afe4d291fb93 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Sun, 10 May 2020 14:52:15 -0700 Subject: [PATCH 080/143] torsocks: Fix the Darwin build --- pkgs/tools/security/tor/torsocks.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index 2ce4c9806eb3..381377032d6e 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, libcap }: +{ stdenv, fetchgit, fetchurl, autoreconfHook, libcap }: stdenv.mkDerivation rec { pname = "torsocks"; @@ -12,10 +12,19 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; + patches = stdenv.lib.optional stdenv.isDarwin + (fetchurl { + url = "https://trac.torproject.org/projects/tor/raw-attachment/ticket/28538/0001-Fix-macros-for-accept4-2.patch"; + sha256 = "97881f0b59b3512acc4acb58a0d6dfc840d7633ead2f400fad70dda9b2ba30b0"; + }); + postPatch = '' # Patch torify_app() sed -i \ -e 's,\(local app_path\)=`which $1`,\1=`type -P $1`,' \ + src/bin/torsocks.in + '' + stdenv.lib.optionalString stdenv.isLinux '' + sed -i \ -e 's,\(local getcap\)=.*,\1=${libcap}/bin/getcap,' \ src/bin/torsocks.in ''; From 6a359b2333d626ab7053605dcc5b56b9668665f7 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Wed, 24 Jun 2020 08:20:13 -0700 Subject: [PATCH 081/143] libxml2Python: Darwin builds require libintl (better fix) --- pkgs/development/libraries/libxml2/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 9ea7dc6c9d53..5e290b25832d 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchpatch -, zlib, xz, python, gettext, ncurses, findXMLCatalogs +, zlib, xz, libintl, python, gettext, ncurses, findXMLCatalogs , pythonSupport ? stdenv.buildPlatform == stdenv.hostPlatform , icuSupport ? false, icu ? null , enableShared ? stdenv.hostPlatform.libc != "msvcrt" @@ -46,6 +46,8 @@ stdenv.mkDerivation rec { buildInputs = lib.optional pythonSupport python ++ lib.optional (pythonSupport && python?isPy2 && python.isPy2) gettext ++ lib.optional (pythonSupport && python?isPy3 && python.isPy3) ncurses + ++ lib.optional (stdenv.isDarwin && + pythonSupport && python?isPy2 && python.isPy2) libintl # Libxml2 has an optional dependency on liblzma. However, on impure # platforms, it may end up using that from /usr/lib, and thus lack a # RUNPATH for that, leading to undefined references for its users. diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index abba2623a575..94204a91d1c2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13904,9 +13904,7 @@ in python = python3; }; - libxml2Python = let - libxml2 = python2Packages.libxml2; - in pkgs.buildEnv { # slightly hacky + libxml2Python = pkgs.buildEnv { # slightly hacky name = "libxml2+py-${res.libxml2.version}"; paths = with libxml2; [ dev bin py ]; inherit (libxml2) passthru; From 6dbeed2d1d355b16145255a18321eacd32d93852 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 6 Aug 2020 22:52:35 +0200 Subject: [PATCH 082/143] factorio: add .desktop file --- pkgs/games/factorio/default.nix | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index d8770addf660..fb69b9d3819e 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper +{ stdenv, fetchurl, makeWrapper, makeDesktopItem , alsaLib, libpulseaudio, libX11, libXcursor, libXinerama, libXrandr, libXi, libGL , libSM, libICE, libXext, factorio-utils , releaseType @@ -45,6 +45,16 @@ let Note the ultimate "_" is replaced with "-" in the --name arg! ''; + desktopItem = makeDesktopItem { + name = "factorio"; + desktopName = "Factorio"; + comment = "A game in which you build and maintain factories."; + exec = "factorio"; + icon = "factorio"; + type = "Application"; + categories = "Game"; + }; + branch = if experimental then "experimental" else "stable"; # NB `experimental` directs us to take the latest build, regardless of its branch; @@ -148,6 +158,11 @@ let patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ $out/bin/factorio + + mkdir -p $out/share/icons/hicolor/{64x64,128x128}/apps + cp -a data/core/graphics/factorio-icon.png $out/share/icons/hicolor/64x64/apps/factorio.png + cp -a data/core/graphics/factorio-icon@2x.png $out/share/icons/hicolor/128x128/apps/factorio.png + ln -s ${desktopItem}/share/applications $out/share/ ''; meta = { From 98e8c6be063099baf42bdf37924df73b0edd5e65 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Aug 2020 01:20:21 +0000 Subject: [PATCH 083/143] pdns-recursor: 4.3.2 -> 4.3.3 --- pkgs/servers/dns/pdns-recursor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index 02f6c2a96214..051e619af4e4 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -8,11 +8,11 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.3.2"; + version = "4.3.3"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "1qb18mx0ci3gbm4ssdg6sf2zg1p6xqi0v061ffww6ph0snabmbpw"; + sha256 = "020mx8mh6zrixkhsc2p1c2ccl9zfypay988jjxbk6ql020flig0b"; }; nativeBuildInputs = [ pkgconfig ]; From 1365b9ac700aabe8dc959e9897bc1376e416c553 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 7 Aug 2020 03:27:42 +0200 Subject: [PATCH 084/143] nixos/manual: Fix build In fd9eb16b249aad1d5e231b8329035abfab5fc0eb, the option "services.nextcloud.nginx.enable" has been removed since the module now exclusively supports nginx only. Unfortunately, with the option gone from the manual, the link in the Nextcloud-specific documentation referencing the NixOS option also became a dead link and thus the manual will no longer build. I also removed a second reference to this option in the Nextcloud- specific documentation, which while it doesn't lead to a build error in the manual is nevertheless a good idea to remove as well to ensure we don't present outdated information to readers of the manual. Signed-off-by: aszlig Cc: @DavHau, @Ma27 --- nixos/modules/services/web-apps/nextcloud.xml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/web-apps/nextcloud.xml b/nixos/modules/services/web-apps/nextcloud.xml index 332e4d1ff3e8..f8b92244c891 100644 --- a/nixos/modules/services/web-apps/nextcloud.xml +++ b/nixos/modules/services/web-apps/nextcloud.xml @@ -29,7 +29,6 @@ services.nextcloud = { enable = true; hostName = "nextcloud.tld"; - nginx.enable = true; config = { dbtype = "pgsql"; dbuser = "nextcloud"; @@ -61,9 +60,8 @@ - The options hostName and nginx.enable - are used internally to configure an HTTP server using - PHP-FPM + The hostName option is used internally to configure an HTTP + server using PHP-FPM and nginx. The config attribute set is used by the imperative installer and all values are written to an additional file to ensure that changes can be applied by changing the module's options. From 846baaa1cdc58e941b63966e62fc44bc4bf2b8cf Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Aug 2020 01:28:10 +0000 Subject: [PATCH 085/143] postgresql11Packages.pgrouting: 3.0.1 -> 3.0.2 --- pkgs/servers/sql/postgresql/ext/pgrouting.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/ext/pgrouting.nix b/pkgs/servers/sql/postgresql/ext/pgrouting.nix index 7a50c45ae69b..79e0e052122f 100644 --- a/pkgs/servers/sql/postgresql/ext/pgrouting.nix +++ b/pkgs/servers/sql/postgresql/ext/pgrouting.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pgrouting"; - version = "3.0.1"; + version = "3.0.2"; nativeBuildInputs = [ cmake perl ]; buildInputs = [ postgresql boost ]; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { owner = "pgRouting"; repo = pname; rev = "v${version}"; - sha256 = "13dis8yy559lkq54bdn34mllwr2yxwayqh6ff9lyd4f8hpj2ra7c"; + sha256 = "10ij3ww0081wc81jzvmkgl8r3qpqp7lcsi9pgn62bqd1c8dw88yg"; }; installPhase = '' From 2a49db6a89efb8825379aa2211b183f734164b31 Mon Sep 17 00:00:00 2001 From: Julien Moutinho Date: Thu, 30 Jul 2020 00:09:44 +0200 Subject: [PATCH 086/143] transmission: apply RFC0042 and harden the service --- nixos/doc/manual/release-notes/rl-2009.xml | 31 ++ .../modules/services/torrent/transmission.nix | 435 ++++++++++++++---- nixos/tests/bittorrent.nix | 24 +- 3 files changed, 378 insertions(+), 112 deletions(-) diff --git a/nixos/doc/manual/release-notes/rl-2009.xml b/nixos/doc/manual/release-notes/rl-2009.xml index 2225619d4816..d5c1a5cb6144 100644 --- a/nixos/doc/manual/release-notes/rl-2009.xml +++ b/nixos/doc/manual/release-notes/rl-2009.xml @@ -680,6 +680,37 @@ systemd.services.nginx.serviceConfig.ReadWritePaths = [ "/var/www" ]; was removed, as udev gained native support to handle FIDO security tokens. + + + The services.transmission module + was enhanced with the new options: + , + , + and . + + + transmission-daemon is now started with additional systemd sandbox/hardening options for better security. + Please report + any use case where this is not working well. + In particular, the RootDirectory option newly set + forbids uploading or downloading a torrent outside of the default directory + configured at settings.download-dir. + If you really need Transmission to access other directories, + you must include those directories into the BindPaths of the service: + +systemd.services.transmission.serviceConfig.BindPaths = [ "/path/to/alternative/download-dir" ]; + + + + Also, connection to the RPC (Remote Procedure Call) of transmission-daemon + is now only available on the local network interface by default. + Use: + +services.transmission.settings.rpc-bind-address = "0.0.0.0"; + + to get the previous behavior of listening on all network interfaces. + + With this release systemd-networkd (when enabled through ) diff --git a/nixos/modules/services/torrent/transmission.nix b/nixos/modules/services/torrent/transmission.nix index 1bfcf2de82f8..92df46083ecc 100644 --- a/nixos/modules/services/torrent/transmission.nix +++ b/nixos/modules/services/torrent/transmission.nix @@ -1,52 +1,51 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, options, ... }: with lib; let cfg = config.services.transmission; + inherit (config.environment) etc; apparmor = config.security.apparmor.enable; - - homeDir = cfg.home; - downloadDirPermissions = cfg.downloadDirPermissions; - downloadDir = "${homeDir}/Downloads"; - incompleteDir = "${homeDir}/.incomplete"; - - settingsDir = "${homeDir}/config"; - settingsFile = pkgs.writeText "settings.json" (builtins.toJSON fullSettings); - - # for users in group "transmission" to have access to torrents - fullSettings = { umask = 2; download-dir = downloadDir; incomplete-dir = incompleteDir; } // cfg.settings; - - preStart = pkgs.writeScript "transmission-pre-start" '' - #!${pkgs.runtimeShell} - set -ex - cp -f ${settingsFile} ${settingsDir}/settings.json - ''; + rootDir = "/run/transmission"; + homeDir = "/var/lib/transmission"; + settingsDir = ".config/transmission-daemon"; + downloadsDir = "Downloads"; + incompleteDir = ".incomplete"; + # TODO: switch to configGen.json once RFC0042 is implemented + settingsFile = pkgs.writeText "settings.json" (builtins.toJSON cfg.settings); in { options = { services.transmission = { - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether or not to enable the headless Transmission BitTorrent daemon. + enable = mkEnableOption ''the headless Transmission BitTorrent daemon. - Transmission daemon can be controlled via the RPC interface using - transmission-remote or the WebUI (http://localhost:9091/ by default). + Transmission daemon can be controlled via the RPC interface using + transmission-remote, the WebUI (http://127.0.0.1:9091/ by default), + or other clients like stig or tremc. - Torrents are downloaded to ${downloadDir} by default and are - accessible to users in the "transmission" group. - ''; - }; + Torrents are downloaded to ${homeDir}/${downloadsDir} by default and are + accessible to users in the "transmission" group''; - settings = mkOption { + settings = mkOption rec { + # TODO: switch to types.config.json as prescribed by RFC0042 once it's implemented type = types.attrs; + apply = recursiveUpdate default; default = { - download-dir = downloadDir; - incomplete-dir = incompleteDir; + download-dir = "${cfg.home}/${downloadsDir}"; + incomplete-dir = "${cfg.home}/${incompleteDir}"; incomplete-dir-enabled = true; + message-level = 1; + peer-port = 51413; + peer-port-random-high = 65535; + peer-port-random-low = 49152; + peer-port-random-on-start = false; + rpc-bind-address = "127.0.0.1"; + rpc-port = 9091; + script-torrent-done-enabled = false; + script-torrent-done-filename = ""; + umask = 2; # 0o002 in decimal as expected by Transmission + utp-enabled = true; }; example = { @@ -56,11 +55,12 @@ in rpc-whitelist = "127.0.0.1,192.168.*.*"; }; description = '' - Attribute set whos fields overwrites fields in settings.json (each - time the service starts). String values must be quoted, integer and + Attribute set whose fields overwrites fields in + .config/transmission-daemon/settings.json + (each time the service starts). String values must be quoted, integer and boolean values must not. - See https://github.com/transmission/transmission/wiki/Editing-Configuration-Files + See Transmission's Wiki for documentation. ''; }; @@ -70,22 +70,32 @@ in default = "770"; example = "775"; description = '' - The permissions to set for download-dir and incomplete-dir. - They will be applied on every service start. + The permissions set by systemd.activationScripts.transmission-daemon + on the directories settings.download-dir + and settings.incomplete-dir. + Note that you may also want to change + settings.umask. ''; }; port = mkOption { - type = types.int; - default = 9091; - description = "TCP port number to run the RPC/web interface."; + type = types.port; + description = '' + TCP port number to run the RPC/web interface. + + If instead you want to change the peer port, + use settings.peer-port + or settings.peer-port-random-on-start. + ''; }; home = mkOption { type = types.path; - default = "/var/lib/transmission"; + default = homeDir; description = '' - The directory where transmission will create files. + The directory where Transmission will create ${settingsDir}. + as well as ${downloadsDir}/ unless settings.download-dir is changed, + and ${incompleteDir}/ unless settings.incomplete-dir is changed. ''; }; @@ -100,32 +110,174 @@ in default = "transmission"; description = "Group account under which Transmission runs."; }; + + credentialsFile = mkOption { + type = types.path; + description = '' + Path to a JSON file to be merged with the settings. + Useful to merge a file which is better kept out of the Nix store + because it contains sensible data like settings.rpc-password. + ''; + default = "/dev/null"; + example = "/var/lib/secrets/transmission/settings.json"; + }; + + openFirewall = mkEnableOption "opening of the peer port(s) in the firewall"; + + performanceNetParameters = mkEnableOption ''tweaking of kernel parameters + to open many more connections at the same time. + + Note that you may also want to increase + settings.peer-limit-global. + And be aware that these settings are quite aggressive + and might not suite your regular desktop use. + For instance, SSH sessions may time out more easily''; }; }; config = mkIf cfg.enable { - systemd.tmpfiles.rules = [ - "d '${homeDir}' 0770 '${cfg.user}' '${cfg.group}' - -" - "d '${settingsDir}' 0700 '${cfg.user}' '${cfg.group}' - -" - "d '${fullSettings.download-dir}' '${downloadDirPermissions}' '${cfg.user}' '${cfg.group}' - -" - "d '${fullSettings.incomplete-dir}' '${downloadDirPermissions}' '${cfg.user}' '${cfg.group}' - -" + # Note that using systemd.tmpfiles would not work here + # because it would fail when creating a directory + # with a different owner than its parent directory, by saying: + # Detected unsafe path transition /home/foo → /home/foo/Downloads during canonicalization of /home/foo/Downloads + # when /home/foo is not owned by cfg.user. + # Note also that using an ExecStartPre= wouldn't work either + # because BindPaths= needs these directories before. + system.activationScripts.transmission-daemon = '' + install -d -m 700 '${cfg.home}/${settingsDir}' + chown -R '${cfg.user}:${cfg.group}' ${cfg.home}/${settingsDir} + install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.download-dir}' + '' + optionalString cfg.settings.incomplete-dir-enabled '' + install -d -m '${cfg.downloadDirPermissions}' -o '${cfg.user}' -g '${cfg.group}' '${cfg.settings.incomplete-dir}' + ''; + + assertions = [ + { assertion = builtins.match "^/.*" cfg.home != null; + message = "`services.transmission.home' must be an absolute path."; + } + { assertion = types.path.check cfg.settings.download-dir; + message = "`services.transmission.settings.download-dir' must be an absolute path."; + } + { assertion = types.path.check cfg.settings.incomplete-dir; + message = "`services.transmission.settings.incomplete-dir' must be an absolute path."; + } + { assertion = cfg.settings.script-torrent-done-filename == "" || types.path.check cfg.settings.script-torrent-done-filename; + message = "`services.transmission.settings.script-torrent-done-filename' must be an absolute path."; + } + { assertion = types.port.check cfg.settings.rpc-port; + message = "${toString cfg.settings.rpc-port} is not a valid port number for `services.transmission.settings.rpc-port`."; + } + # In case both port and settings.rpc-port are explicitely defined: they must be the same. + { assertion = !options.services.transmission.port.isDefined || cfg.port == cfg.settings.rpc-port; + message = "`services.transmission.port' is not equal to `services.transmission.settings.rpc-port'"; + } ]; + services.transmission.settings = + optionalAttrs options.services.transmission.port.isDefined { rpc-port = cfg.port; }; + systemd.services.transmission = { description = "Transmission BitTorrent Service"; after = [ "network.target" ] ++ optional apparmor "apparmor.service"; - requires = mkIf apparmor [ "apparmor.service" ]; + requires = optional apparmor "apparmor.service"; wantedBy = [ "multi-user.target" ]; + environment.CURL_CA_BUNDLE = etc."ssl/certs/ca-certificates.crt".source; - # 1) Only the "transmission" user and group have access to torrents. - # 2) Optionally update/force specific fields into the configuration file. - serviceConfig.ExecStartPre = preStart; - serviceConfig.ExecStart = "${pkgs.transmission}/bin/transmission-daemon -f --port ${toString config.services.transmission.port} --config-dir ${settingsDir}"; - serviceConfig.ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; - serviceConfig.User = cfg.user; - serviceConfig.Group = cfg.group; - # NOTE: transmission has an internal umask that also must be set (in settings.json) - serviceConfig.UMask = "0002"; + serviceConfig = { + # Use "+" because credentialsFile may not be accessible to User= or Group=. + ExecStartPre = [("+" + pkgs.writeShellScript "transmission-prestart" '' + set -eu${lib.optionalString (cfg.settings.message-level >= 3) "x"} + ${pkgs.jq}/bin/jq --slurp add ${settingsFile} '${cfg.credentialsFile}' | + install -D -m 600 -o '${cfg.user}' -g '${cfg.group}' /dev/stdin \ + '${cfg.home}/${settingsDir}/settings.json' + '')]; + ExecStart="${pkgs.transmission}/bin/transmission-daemon -f"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + User = cfg.user; + Group = cfg.group; + # Create rootDir in the host's mount namespace. + RuntimeDirectory = [(baseNameOf rootDir)]; + RuntimeDirectoryMode = "755"; + # Avoid mounting rootDir in the own rootDir of ExecStart='s mount namespace. + InaccessiblePaths = ["-+${rootDir}"]; + # This is for BindPaths= and BindReadOnlyPaths= + # to allow traversal of directories they create in RootDirectory=. + UMask = "0066"; + # Using RootDirectory= makes it possible + # to use the same paths download-dir/incomplete-dir + # (which appear in user's interfaces) without requiring cfg.user + # to have access to their parent directories, + # by using BindPaths=/BindReadOnlyPaths=. + # Note that TemporaryFileSystem= could have been used instead + # but not without adding some BindPaths=/BindReadOnlyPaths= + # that would only be needed for ExecStartPre=, + # because RootDirectoryStartOnly=true would not help. + RootDirectory = rootDir; + RootDirectoryStartOnly = true; + MountAPIVFS = true; + BindPaths = + [ "${cfg.home}/${settingsDir}" + cfg.settings.download-dir + ] ++ + optional cfg.settings.incomplete-dir-enabled + cfg.settings.incomplete-dir; + BindReadOnlyPaths = [ + # No confinement done of /nix/store here like in systemd-confinement.nix, + # an AppArmor profile is provided to get a confinement based upon paths and rights. + builtins.storeDir + "-/etc/hosts" + "-/etc/ld-nix.so.preload" + "-/etc/localtime" + ] ++ + optional (cfg.settings.script-torrent-done-enabled && + cfg.settings.script-torrent-done-filename != "") + cfg.settings.script-torrent-done-filename; + # The following options are only for optimizing: + # systemd-analyze security transmission + AmbientCapabilities = ""; + CapabilityBoundingSet = ""; + # ProtectClock= adds DeviceAllow=char-rtc r + DeviceAllow = ""; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + PrivateMounts = true; + PrivateNetwork = mkDefault false; + PrivateTmp = true; + PrivateUsers = true; + ProtectClock = true; + ProtectControlGroups = true; + # ProtectHome=true would not allow BindPaths= to work accross /home, + # and ProtectHome=tmpfs would break statfs(), + # preventing transmission-daemon to report the available free space. + # However, RootDirectory= is used, so this is not a security concern + # since there would be nothing in /home but any BindPaths= wanted by the user. + ProtectHome = "read-only"; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectSystem = "strict"; + RemoveIPC = true; + # AF_UNIX may become usable one day: + # https://github.com/transmission/transmission/issues/441 + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" ]; + RestrictNamespaces = true; + RestrictRealtime = true; + RestrictSUIDSGID = true; + SystemCallFilter = [ + "@system-service" + # Groups in @system-service which do not contain a syscall + # listed by perf stat -e 'syscalls:sys_enter_*' transmission-daemon -f + # in tests, and seem likely not necessary for transmission-daemon. + "~@aio" "~@chown" "~@keyring" "~@memlock" "~@resources" "~@setuid" "~@timer" + # In the @privileged group, but reached when querying infos through RPC (eg. with stig). + "quotactl" + ]; + SystemCallArchitectures = "native"; + SystemCallErrorNumber = "EPERM"; + }; }; # It's useful to have transmission in path, e.g. for remote control @@ -133,70 +285,153 @@ in users.users = optionalAttrs (cfg.user == "transmission") ({ transmission = { - name = "transmission"; group = cfg.group; uid = config.ids.uids.transmission; description = "Transmission BitTorrent user"; - home = homeDir; - createHome = true; + home = cfg.home; }; }); users.groups = optionalAttrs (cfg.group == "transmission") ({ transmission = { - name = "transmission"; gid = config.ids.gids.transmission; }; }); - # AppArmor profile + networking.firewall = mkIf cfg.openFirewall ( + if cfg.settings.peer-port-random-on-start + then + { allowedTCPPortRanges = + [ { from = cfg.settings.peer-port-random-low; + to = cfg.settings.peer-port-random-high; + } + ]; + allowedUDPPortRanges = + [ { from = cfg.settings.peer-port-random-low; + to = cfg.settings.peer-port-random-high; + } + ]; + } + else + { allowedTCPPorts = [ cfg.settings.peer-port ]; + allowedUDPPorts = [ cfg.settings.peer-port ]; + } + ); + + boot.kernel.sysctl = mkMerge [ + # Transmission uses a single UDP socket in order to implement multiple uTP sockets, + # and thus expects large kernel buffers for the UDP socket, + # https://trac.transmissionbt.com/browser/trunk/libtransmission/tr-udp.c?rev=11956. + # at least up to the values hardcoded here: + (mkIf cfg.settings.utp-enabled { + "net.core.rmem_max" = mkDefault "4194304"; # 4MB + "net.core.wmem_max" = mkDefault "1048576"; # 1MB + }) + (mkIf cfg.performanceNetParameters { + # Increase the number of available source (local) TCP and UDP ports to 49151. + # Usual default is 32768 60999, ie. 28231 ports. + # Find out your current usage with: ss -s + "net.ipv4.ip_local_port_range" = "16384 65535"; + # Timeout faster generic TCP states. + # Usual default is 600. + # Find out your current usage with: watch -n 1 netstat -nptuo + "net.netfilter.nf_conntrack_generic_timeout" = 60; + # Timeout faster established but inactive connections. + # Usual default is 432000. + "net.netfilter.nf_conntrack_tcp_timeout_established" = 600; + # Clear immediately TCP states after timeout. + # Usual default is 120. + "net.netfilter.nf_conntrack_tcp_timeout_time_wait" = 1; + # Increase the number of trackable connections. + # Usual default is 262144. + # Find out your current usage with: conntrack -C + "net.netfilter.nf_conntrack_max" = 1048576; + }) + ]; + security.apparmor.profiles = mkIf apparmor [ (pkgs.writeText "apparmor-transmission-daemon" '' - #include + include ${pkgs.transmission}/bin/transmission-daemon { - #include - #include + include + include - ${getLib pkgs.glibc}/lib/*.so mr, - ${getLib pkgs.libevent}/lib/libevent*.so* mr, - ${getLib pkgs.curl}/lib/libcurl*.so* mr, - ${getLib pkgs.openssl}/lib/libssl*.so* mr, - ${getLib pkgs.openssl}/lib/libcrypto*.so* mr, - ${getLib pkgs.zlib}/lib/libz*.so* mr, - ${getLib pkgs.libssh2}/lib/libssh2*.so* mr, - ${getLib pkgs.systemd}/lib/libsystemd*.so* mr, - ${getLib pkgs.xz}/lib/liblzma*.so* mr, - ${getLib pkgs.libgcrypt}/lib/libgcrypt*.so* mr, - ${getLib pkgs.libgpgerror}/lib/libgpg-error*.so* mr, - ${getLib pkgs.nghttp2}/lib/libnghttp2*.so* mr, - ${getLib pkgs.c-ares}/lib/libcares*.so* mr, - ${getLib pkgs.libcap}/lib/libcap*.so* mr, - ${getLib pkgs.attr}/lib/libattr*.so* mr, - ${getLib pkgs.lz4}/lib/liblz4*.so* mr, - ${getLib pkgs.libkrb5}/lib/lib*.so* mr, - ${getLib pkgs.keyutils}/lib/libkeyutils*.so* mr, - ${getLib pkgs.utillinuxMinimal.out}/lib/libblkid.so.* mr, - ${getLib pkgs.utillinuxMinimal.out}/lib/libmount.so.* mr, - ${getLib pkgs.utillinuxMinimal.out}/lib/libuuid.so.* mr, - ${getLib pkgs.gcc.cc.lib}/lib/libstdc++.so.* mr, - ${getLib pkgs.gcc.cc.lib}/lib/libgcc_s.so.* mr, - - @{PROC}/sys/kernel/random/uuid r, - @{PROC}/sys/vm/overcommit_memory r, - - ${pkgs.openssl.out}/etc/** r, - ${pkgs.transmission}/share/transmission/** r, - - owner ${settingsDir}/** rw, - - ${fullSettings.download-dir}/** rw, - ${optionalString fullSettings.incomplete-dir-enabled '' - ${fullSettings.incomplete-dir}/** rw, + # NOTE: https://github.com/NixOS/nixpkgs/pull/93457 + # will remove the need for these by fixing + r ${etc."hosts".source}, + r /etc/ld-nix.so.preload, + ${lib.optionalString (builtins.hasAttr "ld-nix.so.preload" etc) '' + r ${etc."ld-nix.so.preload".source}, + ${concatMapStrings (p: optionalString (p != "") ("mr ${p},\n")) + (splitString "\n" config.environment.etc."ld-nix.so.preload".text)} ''} + r ${etc."ssl/certs/ca-certificates.crt".source}, + r ${pkgs.tzdata}/share/zoneinfo/**, + r ${pkgs.stdenv.cc.libc}/share/i18n/**, + r ${pkgs.stdenv.cc.libc}/share/locale/**, + + mr ${getLib pkgs.stdenv.cc.cc}/lib/*.so*, + mr ${getLib pkgs.stdenv.cc.libc}/lib/*.so*, + mr ${getLib pkgs.attr}/lib/libattr*.so*, + mr ${getLib pkgs.c-ares}/lib/libcares*.so*, + mr ${getLib pkgs.curl}/lib/libcurl*.so*, + mr ${getLib pkgs.keyutils}/lib/libkeyutils*.so*, + mr ${getLib pkgs.libcap}/lib/libcap*.so*, + mr ${getLib pkgs.libevent}/lib/libevent*.so*, + mr ${getLib pkgs.libgcrypt}/lib/libgcrypt*.so*, + mr ${getLib pkgs.libgpgerror}/lib/libgpg-error*.so*, + mr ${getLib pkgs.libkrb5}/lib/lib*.so*, + mr ${getLib pkgs.libssh2}/lib/libssh2*.so*, + mr ${getLib pkgs.lz4}/lib/liblz4*.so*, + mr ${getLib pkgs.nghttp2}/lib/libnghttp2*.so*, + mr ${getLib pkgs.openssl}/lib/libcrypto*.so*, + mr ${getLib pkgs.openssl}/lib/libssl*.so*, + mr ${getLib pkgs.systemd}/lib/libsystemd*.so*, + mr ${getLib pkgs.utillinuxMinimal.out}/lib/libblkid.so*, + mr ${getLib pkgs.utillinuxMinimal.out}/lib/libmount.so*, + mr ${getLib pkgs.utillinuxMinimal.out}/lib/libuuid.so*, + mr ${getLib pkgs.xz}/lib/liblzma*.so*, + mr ${getLib pkgs.zlib}/lib/libz*.so*, + + r @{PROC}/sys/kernel/random/uuid, + r @{PROC}/sys/vm/overcommit_memory, + # @{pid} is not a kernel variable yet but a regexp + #r @{PROC}/@{pid}/environ, + r @{PROC}/@{pid}/mounts, + rwk /tmp/tr_session_id_*, + + r ${pkgs.openssl.out}/etc/**, + r ${config.systemd.services.transmission.environment.CURL_CA_BUNDLE}, + r ${pkgs.transmission}/share/transmission/**, + + owner rw ${cfg.home}/${settingsDir}/**, + rw ${cfg.settings.download-dir}/**, + ${optionalString cfg.settings.incomplete-dir-enabled '' + rw ${cfg.settings.incomplete-dir}/**, + ''} + profile dirs { + rw ${cfg.settings.download-dir}/**, + ${optionalString cfg.settings.incomplete-dir-enabled '' + rw ${cfg.settings.incomplete-dir}/**, + ''} + } + + ${optionalString (cfg.settings.script-torrent-done-enabled && + cfg.settings.script-torrent-done-filename != "") '' + # Stack transmission_directories profile on top of + # any existing profile for script-torrent-done-filename + # FIXME: to be tested as I'm not sure it works well with NoNewPrivileges= + # https://gitlab.com/apparmor/apparmor/-/wikis/AppArmorStacking#seccomp-and-no_new_privs + px ${cfg.settings.script-torrent-done-filename} -> &@{dirs}, + ''} + + # FIXME: enable customizing using https://github.com/NixOS/nixpkgs/pull/93457 + # include } '') ]; }; + meta.maintainers = with lib.maintainers; [ julm ]; } diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix index 0a97d5556a26..c195b60cd569 100644 --- a/nixos/tests/bittorrent.nix +++ b/nixos/tests/bittorrent.nix @@ -19,6 +19,7 @@ let externalClient2Address = "80.100.100.2"; externalTrackerAddress = "80.100.100.3"; + download-dir = "/var/lib/transmission/Downloads"; transmissionConfig = { ... }: { environment.systemPackages = [ pkgs.transmission ]; services.transmission = { @@ -26,6 +27,7 @@ let settings = { dht-enabled = false; message-level = 3; + inherit download-dir; }; }; }; @@ -117,12 +119,12 @@ in router.wait_for_unit("miniupnpd") # Create the torrent. - tracker.succeed("mkdir /tmp/data") + tracker.succeed("mkdir ${download-dir}/data") tracker.succeed( - "cp ${file} /tmp/data/test.tar.bz2" + "cp ${file} ${download-dir}/data/test.tar.bz2" ) tracker.succeed( - "transmission-create /tmp/data/test.tar.bz2 --private --tracker http://${externalTrackerAddress}:6969/announce --outfile /tmp/test.torrent" + "transmission-create ${download-dir}/data/test.tar.bz2 --private --tracker http://${externalTrackerAddress}:6969/announce --outfile /tmp/test.torrent" ) tracker.succeed("chmod 644 /tmp/test.torrent") @@ -133,18 +135,16 @@ in # Start the initial seeder. tracker.succeed( - "transmission-remote --add /tmp/test.torrent --no-portmap --no-dht --download-dir /tmp/data" + "transmission-remote --add /tmp/test.torrent --no-portmap --no-dht --download-dir ${download-dir}/data" ) # Now we should be able to download from the client behind the NAT. tracker.wait_for_unit("httpd") client1.wait_for_unit("network-online.target") + client1.succeed("transmission-remote --add http://${externalTrackerAddress}/test.torrent >&2 &") + client1.wait_for_file("${download-dir}/test.tar.bz2") client1.succeed( - "transmission-remote --add http://${externalTrackerAddress}/test.torrent --download-dir /tmp >&2 &" - ) - client1.wait_for_file("/tmp/test.tar.bz2") - client1.succeed( - "cmp /tmp/test.tar.bz2 ${file}" + "cmp ${download-dir}/test.tar.bz2 ${file}" ) # Bring down the initial seeder. @@ -154,11 +154,11 @@ in # the first client created a NAT hole in the router. client2.wait_for_unit("network-online.target") client2.succeed( - "transmission-remote --add http://${externalTrackerAddress}/test.torrent --no-portmap --no-dht --download-dir /tmp >&2 &" + "transmission-remote --add http://${externalTrackerAddress}/test.torrent --no-portmap --no-dht >&2 &" ) - client2.wait_for_file("/tmp/test.tar.bz2") + client2.wait_for_file("${download-dir}/test.tar.bz2") client2.succeed( - "cmp /tmp/test.tar.bz2 ${file}" + "cmp ${download-dir}/test.tar.bz2 ${file}" ) ''; }) From 69eb22e4cdde18f00aab9d082668a95171da15a9 Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 6 Aug 2020 22:37:48 -0400 Subject: [PATCH 087/143] nixos/gitlab: fix module after #94454 --- nixos/modules/services/misc/gitlab.nix | 46 ++++++++++++++++---------- 1 file changed, 29 insertions(+), 17 deletions(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index be59b53e5ce0..fa393de3219a 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -618,26 +618,38 @@ in { enable = true; ensureUsers = singleton { name = cfg.databaseUsername; }; }; + # The postgresql module doesn't currently support concepts like # objects owners and extensions; for now we tack on what's needed # here. - systemd.services.postgresql.postStart = mkAfter (optionalString databaseActuallyCreateLocally '' - set -eu + systemd.services.gitlab-postgresql = let pgsql = config.services.postgresql; in mkIf databaseActuallyCreateLocally { + after = [ "postgresql.service" ]; + wantedBy = [ "multi-user.target" ]; + path = [ pgsql.package ]; + script = '' + set -eu - $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${cfg.databaseName}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${cfg.databaseName}" OWNER "${cfg.databaseUsername}"' - current_owner=$($PSQL -tAc "SELECT pg_catalog.pg_get_userbyid(datdba) FROM pg_catalog.pg_database WHERE datname = '${cfg.databaseName}'") - if [[ "$current_owner" != "${cfg.databaseUsername}" ]]; then - $PSQL -tAc 'ALTER DATABASE "${cfg.databaseName}" OWNER TO "${cfg.databaseUsername}"' - if [[ -e "${config.services.postgresql.dataDir}/.reassigning_${cfg.databaseName}" ]]; then - echo "Reassigning ownership of database ${cfg.databaseName} to user ${cfg.databaseUsername} failed on last boot. Failing..." - exit 1 - fi - touch "${config.services.postgresql.dataDir}/.reassigning_${cfg.databaseName}" - $PSQL "${cfg.databaseName}" -tAc "REASSIGN OWNED BY \"$current_owner\" TO \"${cfg.databaseUsername}\"" - rm "${config.services.postgresql.dataDir}/.reassigning_${cfg.databaseName}" - fi - $PSQL '${cfg.databaseName}' -tAc "CREATE EXTENSION IF NOT EXISTS pg_trgm" - ''); + PSQL="${pkgs.utillinux}/bin/runuser -u ${pgsql.superUser} -- psql --port=${toString pgsql.port}" + + $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = '${cfg.databaseName}'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "${cfg.databaseName}" OWNER "${cfg.databaseUsername}"' + current_owner=$($PSQL -tAc "SELECT pg_catalog.pg_get_userbyid(datdba) FROM pg_catalog.pg_database WHERE datname = '${cfg.databaseName}'") + if [[ "$current_owner" != "${cfg.databaseUsername}" ]]; then + $PSQL -tAc 'ALTER DATABASE "${cfg.databaseName}" OWNER TO "${cfg.databaseUsername}"' + if [[ -e "${config.services.postgresql.dataDir}/.reassigning_${cfg.databaseName}" ]]; then + echo "Reassigning ownership of database ${cfg.databaseName} to user ${cfg.databaseUsername} failed on last boot. Failing..." + exit 1 + fi + touch "${config.services.postgresql.dataDir}/.reassigning_${cfg.databaseName}" + $PSQL "${cfg.databaseName}" -tAc "REASSIGN OWNED BY \"$current_owner\" TO \"${cfg.databaseUsername}\"" + rm "${config.services.postgresql.dataDir}/.reassigning_${cfg.databaseName}" + fi + $PSQL '${cfg.databaseName}' -tAc "CREATE EXTENSION IF NOT EXISTS pg_trgm" + ''; + + serviceConfig = { + Type = "oneshot"; + }; + }; # Use postfix to send out mails. services.postfix.enable = mkDefault true; @@ -767,7 +779,7 @@ in { }; systemd.services.gitlab = { - after = [ "gitlab-workhorse.service" "gitaly.service" "network.target" "postgresql.service" "redis.service" ]; + after = [ "gitlab-workhorse.service" "gitaly.service" "network.target" "gitlab-postgresql.service" "redis.service" ]; requires = [ "gitlab-sidekiq.service" ]; wantedBy = [ "multi-user.target" ]; environment = gitlabEnv; From d525a689bd7d2335b7dbd21ef126731e18ac797c Mon Sep 17 00:00:00 2001 From: Greg Roodt Date: Fri, 7 Aug 2020 12:43:43 +1000 Subject: [PATCH 088/143] argo: 2.9.4 -> 2.9.5 --- pkgs/applications/networking/cluster/argo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/argo/default.nix b/pkgs/applications/networking/cluster/argo/default.nix index e2c7436a8ac1..3dc96f5a5e3d 100644 --- a/pkgs/applications/networking/cluster/argo/default.nix +++ b/pkgs/applications/networking/cluster/argo/default.nix @@ -19,13 +19,13 @@ let in buildGoModule rec { pname = "argo"; - version = "2.9.4"; + version = "2.9.5"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo"; rev = "v${version}"; - sha256 = "156102xqwmsq3g9jammfib0ri22a0nzk96zrv5774gidjvy2xb55"; + sha256 = "1x44mgvnbn47a33xnhnh9bxxvj1vsr32lvh9bq6w5hpmxb7qbq4f"; }; vendorSha256 = "1vqmzz76lcwwnw89n4lyg4jjf7wbdgn9sdzwsgrjwkj8ax7d48cv"; From 5ca7be38885382f0ea6d865544674c7b8ef705a2 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 7 Aug 2020 13:29:23 +1000 Subject: [PATCH 089/143] .github/workflows/wait-ofborg.yml: 360 -> 540 --- .github/workflows/wait-ofborg.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/wait-ofborg.yml b/.github/workflows/wait-ofborg.yml index 7b1518896f42..6ddf00bb1ef5 100644 --- a/.github/workflows/wait-ofborg.yml +++ b/.github/workflows/wait-ofborg.yml @@ -31,7 +31,7 @@ jobs: if: github.repository_owner == 'NixOS' env: BASE_BRANCH: ${{ github.base_ref }} - COUNTDOWN: 360 # wait for ~30min... + COUNTDOWN: 540 # wait for ~45min... GITHUB_TOKEN: ${{ github.token }} COMMIT: ${{ github.event.pull_request.head.sha }} OFBORG_APP_ID: 20500 From ed2e74d9dba47ff5cbb2c33762fe9b0a9721ae1a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 5 Aug 2020 19:50:47 +1000 Subject: [PATCH 090/143] ocamlPackages.gmetadom: use patch file extension --- pkgs/development/ocaml-modules/gmetadom/default.nix | 2 +- .../ocaml-modules/gmetadom/{gcc-4.3.dpatch => gcc-4.3.patch} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/ocaml-modules/gmetadom/{gcc-4.3.dpatch => gcc-4.3.patch} (100%) diff --git a/pkgs/development/ocaml-modules/gmetadom/default.nix b/pkgs/development/ocaml-modules/gmetadom/default.nix index d47ad8ce8590..f01f3e8cad53 100644 --- a/pkgs/development/ocaml-modules/gmetadom/default.nix +++ b/pkgs/development/ocaml-modules/gmetadom/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0skmlv0pnqvg99wzzzi1h4zhwzd82xg7xpkj1kwpfy7bzinjh7ig"; }; - patches = [ ./gcc-4.3.dpatch ]; + patches = [ ./gcc-4.3.patch ]; dontDisableStatic = true; diff --git a/pkgs/development/ocaml-modules/gmetadom/gcc-4.3.dpatch b/pkgs/development/ocaml-modules/gmetadom/gcc-4.3.patch similarity index 100% rename from pkgs/development/ocaml-modules/gmetadom/gcc-4.3.dpatch rename to pkgs/development/ocaml-modules/gmetadom/gcc-4.3.patch From 32e87e8b02e0574438ac1a695c0934d244aa2707 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Wed, 5 Aug 2020 19:53:41 +1000 Subject: [PATCH 091/143] cproto: use patch file extension --- .../tools/misc/cproto/{cproto_patch => cproto.patch} | 0 pkgs/development/tools/misc/cproto/default.nix | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename pkgs/development/tools/misc/cproto/{cproto_patch => cproto.patch} (100%) diff --git a/pkgs/development/tools/misc/cproto/cproto_patch b/pkgs/development/tools/misc/cproto/cproto.patch similarity index 100% rename from pkgs/development/tools/misc/cproto/cproto_patch rename to pkgs/development/tools/misc/cproto/cproto.patch diff --git a/pkgs/development/tools/misc/cproto/default.nix b/pkgs/development/tools/misc/cproto/default.nix index 0b9321bc029d..ef0e2cab7771 100644 --- a/pkgs/development/tools/misc/cproto/default.nix +++ b/pkgs/development/tools/misc/cproto/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; # patch made by Joe Khoobyar copied from gentoo bugs - patches = ./cproto_patch; + patches = [ ./cproto.patch ]; nativeBuildInputs = [ flex bison ]; From 866752ce03a044628bc99f2a6c512ccc70ed363d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 6 Aug 2020 11:13:54 +1000 Subject: [PATCH 092/143] yasr: use patch file extension --- ...arations => 10_fix_openpty_forkpty_declarations.patch} | 0 .../audio/yasr/{20_maxpathlen => 20_maxpathlen.patch} | 0 pkgs/applications/audio/yasr/{30_conf => 30_conf.patch} | 0 ...alk_extended_chars => 40_dectalk_extended_chars.patch} | 0 pkgs/applications/audio/yasr/default.nix | 8 ++++---- 5 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/applications/audio/yasr/{10_fix_openpty_forkpty_declarations => 10_fix_openpty_forkpty_declarations.patch} (100%) rename pkgs/applications/audio/yasr/{20_maxpathlen => 20_maxpathlen.patch} (100%) rename pkgs/applications/audio/yasr/{30_conf => 30_conf.patch} (100%) rename pkgs/applications/audio/yasr/{40_dectalk_extended_chars => 40_dectalk_extended_chars.patch} (100%) diff --git a/pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations b/pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations.patch similarity index 100% rename from pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations rename to pkgs/applications/audio/yasr/10_fix_openpty_forkpty_declarations.patch diff --git a/pkgs/applications/audio/yasr/20_maxpathlen b/pkgs/applications/audio/yasr/20_maxpathlen.patch similarity index 100% rename from pkgs/applications/audio/yasr/20_maxpathlen rename to pkgs/applications/audio/yasr/20_maxpathlen.patch diff --git a/pkgs/applications/audio/yasr/30_conf b/pkgs/applications/audio/yasr/30_conf.patch similarity index 100% rename from pkgs/applications/audio/yasr/30_conf rename to pkgs/applications/audio/yasr/30_conf.patch diff --git a/pkgs/applications/audio/yasr/40_dectalk_extended_chars b/pkgs/applications/audio/yasr/40_dectalk_extended_chars.patch similarity index 100% rename from pkgs/applications/audio/yasr/40_dectalk_extended_chars rename to pkgs/applications/audio/yasr/40_dectalk_extended_chars.patch diff --git a/pkgs/applications/audio/yasr/default.nix b/pkgs/applications/audio/yasr/default.nix index 68423197f3c8..fed2ee0d8f75 100644 --- a/pkgs/applications/audio/yasr/default.nix +++ b/pkgs/applications/audio/yasr/default.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { }; patches = [ - ./10_fix_openpty_forkpty_declarations - ./20_maxpathlen - ./30_conf - ./40_dectalk_extended_chars + ./10_fix_openpty_forkpty_declarations.patch + ./20_maxpathlen.patch + ./30_conf.patch + ./40_dectalk_extended_chars.patch ]; # taken from the debian yasr package meta = { From 95ec8d2bd7196bec238bfd5a27b83ecf0952a85a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 6 Aug 2020 22:06:49 +1000 Subject: [PATCH 093/143] minikube: 1.12.1 -> 1.12.2 --- pkgs/applications/networking/cluster/minikube/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index 6467ed609526..01dc86db97ab 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -11,15 +11,15 @@ buildGoModule rec { pname = "minikube"; - version = "1.12.1"; + version = "1.12.2"; - vendorSha256 = "0v2lnzdv5nmg4jf10hqyvrsyz5yg7brm4p3gil7n88w6n100phfn"; + vendorSha256 = "0smjj2sq09k1ai79lk74gi056hfls7qy8x08wkq2g24fxi06cr94"; src = fetchFromGitHub { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "0ya6mp081vs48c0nh4nys9z04kz79mjfpm4gs0hlmh2kpa5kmc9h"; + sha256 = "1x28s6d2nibm76qd3kjsa7wkyhqvnwdy9rfwk9xf45hzrx9700sm"; }; nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; From 1a83aa1190b6b67be0c777ba521428fd1305197d Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 7 Aug 2020 04:15:29 +1000 Subject: [PATCH 094/143] go_1_13: 1.13.14 -> 1.13.15 --- pkgs/development/compilers/go/1.13.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.13.nix b/pkgs/development/compilers/go/1.13.nix index e082628aaa2a..fcc7758e3f8e 100644 --- a/pkgs/development/compilers/go/1.13.nix +++ b/pkgs/development/compilers/go/1.13.nix @@ -30,11 +30,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.13.14"; + version = "1.13.15"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "01mbqzn1hj8idbyn2f9gghvirfnw348dcf7pjs3ymschfblk6wqr"; + sha256 = "0pfgixca3a0svblzivkia11q79l8bzai6yg64m1piy3c0iqk3d2z"; }; # perl is used for testing go vet From e4f471da97235b168e5a67b8a9d455b1b9f50c89 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Thu, 6 Aug 2020 21:42:52 -0700 Subject: [PATCH 095/143] packet-cli: 0.0.7 -> 0.0.8 --- pkgs/development/tools/packet-cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/packet-cli/default.nix b/pkgs/development/tools/packet-cli/default.nix index 40561671c593..aeb54c2212df 100644 --- a/pkgs/development/tools/packet-cli/default.nix +++ b/pkgs/development/tools/packet-cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "packet-cli"; - version = "0.0.7"; + version = "0.0.8"; src = fetchFromGitHub { owner = "packethost"; repo = pname; rev = version; - sha256 = "1ixdqq0xwy2l2m1w93rzqw5gfrzw7w03r42qab3n733m4jkf4ni1"; + sha256 = "0ys6zyhyi65g0sj15pb6rslgbjgkh73y32gc0yvhfd6xmgzaxpxf"; }; - vendorSha256 = "10praxaiscxq4v3zknrabldxl7rpklkr5wdlwa5lxsx0if8mrvp7"; + vendorSha256 = "1h9p3hrr61hwkhkh4qbw0ld3hd5xi75qm8rwfrpz5z06jba1ll25"; meta = with stdenv.lib; { description = "Official Packet CLI"; From 3a2d677b0b5691f898bab5ef6767e5b3d793d3cd Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Thu, 6 Aug 2020 22:02:44 -0700 Subject: [PATCH 096/143] v4l-utils: fix by patchShebangs on cec-gen.pl --- pkgs/os-specific/linux/v4l-utils/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 6a46db0dbac6..2c9b395949aa 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -41,6 +41,7 @@ in stdenv.mkDerivation rec { postPatch = '' patchShebangs utils/cec-ctl/msg2ctl.pl + patchShebangs utils/libcecutil/cec-gen.pl ''; meta = with stdenv.lib; { From dc5428e70b0ae9c7470c7d0e44bc0239fd1a4fd4 Mon Sep 17 00:00:00 2001 From: Cole Mickens Date: Thu, 6 Aug 2020 22:39:43 -0700 Subject: [PATCH 097/143] packet-cli: alias packet-cli as packet --- pkgs/development/tools/packet-cli/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/tools/packet-cli/default.nix b/pkgs/development/tools/packet-cli/default.nix index aeb54c2212df..9a716a72eb01 100644 --- a/pkgs/development/tools/packet-cli/default.nix +++ b/pkgs/development/tools/packet-cli/default.nix @@ -13,6 +13,10 @@ buildGoModule rec { vendorSha256 = "1h9p3hrr61hwkhkh4qbw0ld3hd5xi75qm8rwfrpz5z06jba1ll25"; + postInstall = '' + ln -s $out/bin/packet-cli $out/bin/packet + ''; + meta = with stdenv.lib; { description = "Official Packet CLI"; homepage = "https://github.com/packethost/packet-cli"; From 20032b1ef692447d80420e649cd94da3cf655fe4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Aug 2020 04:38:05 +0000 Subject: [PATCH 098/143] python37Packages.cfgv: 3.1.0 -> 3.2.0 --- pkgs/development/python-modules/cfgv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cfgv/default.nix b/pkgs/development/python-modules/cfgv/default.nix index e1b3dfc8e2b1..ab9a97729a1d 100644 --- a/pkgs/development/python-modules/cfgv/default.nix +++ b/pkgs/development/python-modules/cfgv/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "cfgv"; - version = "3.1.0"; + version = "3.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "c8e8f552ffcc6194f4e18dd4f68d9aef0c0d58ae7e7be8c82bee3c5e9edfa513"; + sha256 = "cf22deb93d4bcf92f345a5c3cd39d3d41d6340adc60c78bbbd6588c384fda6a1"; }; propagatedBuildInputs = [ six ]; From bfac8637280d5963dcfc9faa92e985c8cb37a6c4 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Aug 2020 04:10:33 +0000 Subject: [PATCH 099/143] python27Packages.cli-helpers: 2.0.1 -> 2.1.0 --- pkgs/development/python-modules/cli-helpers/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/cli-helpers/default.nix b/pkgs/development/python-modules/cli-helpers/default.nix index 5fff93b5bc68..1dc04d707882 100644 --- a/pkgs/development/python-modules/cli-helpers/default.nix +++ b/pkgs/development/python-modules/cli-helpers/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "cli_helpers"; - version = "2.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "18f7d8c5a22d85fc685d56a9f301d8b9f7f0d7d4e9033a27563b066c2ab41833"; + sha256 = "dd6f164310f7d86fa3da1f82043a9c784e44a02ad49be932a80624261e56979b"; }; propagatedBuildInputs = [ From 4b5bae260ab43a8f25ef9741a79b0e254e069c16 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 4 Aug 2020 20:20:20 -0500 Subject: [PATCH 100/143] python3Packages.itemloaders: init at 1.0.1 --- .../python-modules/itemloaders/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/itemloaders/default.nix diff --git a/pkgs/development/python-modules/itemloaders/default.nix b/pkgs/development/python-modules/itemloaders/default.nix new file mode 100644 index 000000000000..0c891a861342 --- /dev/null +++ b/pkgs/development/python-modules/itemloaders/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy27 +, w3lib +, parsel +, jmespath +, itemadapter +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "itemloaders"; + version = "1.0.1"; + + disabled = isPy27; + + # Tests not included in PyPI tarball + src = fetchFromGitHub { + owner = "scrapy"; + repo = pname; + rev = "v${version}"; + sha256 = "0frs0s876ddha844vhnhhiggyk3qbhhngrwkvgg3c0mrnn282f6k"; + }; + + propagatedBuildInputs = [ w3lib parsel jmespath itemadapter ]; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Base library for scrapy's ItemLoader"; + homepage = "https://github.com/scrapy/itemloaders"; + license = licenses.bsd3; + maintainers = [ maintainers.marsam ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5d1936056863..e8869085d277 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -900,6 +900,8 @@ in { itemadapter = callPackage ../development/python-modules/itemadapter { }; + itemloaders = callPackage ../development/python-modules/itemloaders { }; + iterm2 = callPackage ../development/python-modules/iterm2 { }; janus = callPackage ../development/python-modules/janus { }; From cf5bc04fcf447731c74df915a1d65642a4201987 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Tue, 4 Aug 2020 20:21:20 -0500 Subject: [PATCH 101/143] python3Packages.scrapy: 2.2.1 -> 2.3.0 --- pkgs/development/python-modules/scrapy/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/scrapy/default.nix b/pkgs/development/python-modules/scrapy/default.nix index 177531e64f77..db91528da632 100644 --- a/pkgs/development/python-modules/scrapy/default.nix +++ b/pkgs/development/python-modules/scrapy/default.nix @@ -24,10 +24,11 @@ , pytest-twisted , botocore , itemadapter +, itemloaders }: buildPythonPackage rec { - version = "2.2.1"; + version = "2.3.0"; pname = "Scrapy"; disabled = isPy27; @@ -57,22 +58,24 @@ buildPythonPackage rec { zope_interface protego itemadapter + itemloaders ]; LC_ALL = "en_US.UTF-8"; # Disable doctest plugin—enabled in the shipped pytest.ini—because it causes pytest to hang # Ignore proxy tests because requires mitmproxy + # Ignore utils_display tests because it requires pygments # Ignore test_retry_dns_error because tries to resolve an invalid dns and weirdly fails with "Reactor was unclean" # Ignore xml encoding test on darwin because lxml can't find encodings https://bugs.launchpad.net/lxml/+bug/707396 checkPhase = '' substituteInPlace pytest.ini --replace "--doctest-modules" "" - pytest --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py --deselect tests/test_crawl.py::CrawlTestCase::test_retry_dns_error ${lib.optionalString stdenv.isDarwin "--deselect tests/test_utils_iterators.py::LxmlXmliterTestCase::test_xmliter_encoding"} + pytest --ignore=tests/test_linkextractors_deprecated.py --ignore=tests/test_proxy_connect.py --ignore=tests/test_utils_display.py --deselect tests/test_crawl.py::CrawlTestCase::test_retry_dns_error ${lib.optionalString stdenv.isDarwin "--deselect tests/test_utils_iterators.py::LxmlXmliterTestCase::test_xmliter_encoding"} ''; src = fetchPypi { inherit pname version; - sha256 = "6a09beb5190bfdee2d72cf261822eae5d92fe8a86ac9ee1f55fc44b4864ca583"; + sha256 = "b4d08cdacb615563c291d053ef1ba2dc08d9d4b6d81578684eaa1cf7b832f90c"; }; postInstall = '' From 4d67cf18d80b9bde71b851c414d80242a393ee3e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Aug 2020 03:53:18 +0000 Subject: [PATCH 102/143] python27Packages.azure-mgmt-monitor: 0.10.0 -> 0.11.0 --- .../development/python-modules/azure-mgmt-monitor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix index edd7abd11a78..038ed52d768c 100644 --- a/pkgs/development/python-modules/azure-mgmt-monitor/default.nix +++ b/pkgs/development/python-modules/azure-mgmt-monitor/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-monitor"; - version = "0.10.0"; + version = "0.11.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0r3l55mhd00zx8sw13d7i9l7r214946s1y3wxcswxad7q5660zfm"; + sha256 = "c6e1fe83dd2ddffa7f6d90c7aa63b3128042396a3893c14dc4816ad28cb15016"; }; propagatedBuildInputs = [ From c542d21686f1ff8d779e32cac08c46f02f240c5a Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 2 Aug 2020 07:10:58 +0000 Subject: [PATCH 103/143] mockgen: 1.4.3 -> 1.4.4 --- pkgs/development/tools/mockgen/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/mockgen/default.nix b/pkgs/development/tools/mockgen/default.nix index 13a66422a46e..df5c9a1ea3ef 100644 --- a/pkgs/development/tools/mockgen/default.nix +++ b/pkgs/development/tools/mockgen/default.nix @@ -1,14 +1,14 @@ { buildGoModule, lib, fetchFromGitHub }: buildGoModule rec { pname = "mockgen"; - version = "1.4.3"; + version = "1.4.4"; src = fetchFromGitHub { owner = "golang"; repo = "mock"; rev = "v${version}"; - sha256 = "1p37xnja1dgq5ykx24n7wincwz2gahjh71b95p8vpw7ss2g8j8wx"; + sha256 = "1lj0dvd6div4jaq1s0afpwqaq9ah8cxhkq93wii2ably1xmp2l0a"; }; - vendorSha256 = "1kpiij3pimwv3gn28rbrdvlw9q5c76lzw6zpa12q6pgck76acdw4"; + vendorSha256 = "1md4cg1zzhc276sc7i2v0xvg5pf6gzy0n9ga2g1lx3d572igq1wy"; subPackages = [ "mockgen" ]; meta = with lib; { From c5564e176a13243358a3f5a8fe8751e0d5c11cc3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 13:46:26 +0000 Subject: [PATCH 104/143] jetty: 9.4.29.v20200521 -> 9.4.31.v20200723 --- pkgs/servers/http/jetty/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index 4f34fde1856c..20370fd37c70 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "9.4.29.v20200521"; + version = "9.4.31.v20200723"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; name = "jetty-distribution-${version}.tar.gz"; - sha256 = "0ir7rzr5479k7whgy0fx6bjj7x978ghx4fxc64i39hg2kzcp5dbi"; + sha256 = "1j1dhlrlj7xnijp55c1hd9r47m6bq37vpjkaf8f9fg7q9m2z9x6x"; }; phases = [ "unpackPhase" "installPhase" ]; From 002ecd07e128b7ee5dc4ed23f1da4abbe9007880 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 07:25:01 +0000 Subject: [PATCH 105/143] geekbench: 5.2.1 -> 5.2.3 --- pkgs/tools/misc/geekbench/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/geekbench/default.nix b/pkgs/tools/misc/geekbench/default.nix index 78d2e947e39f..aa7a108c0084 100644 --- a/pkgs/tools/misc/geekbench/default.nix +++ b/pkgs/tools/misc/geekbench/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "geekbench"; - version = "5.2.1"; + version = "5.2.3"; src = fetchurl { url = "https://cdn.geekbench.com/Geekbench-${version}-Linux.tar.gz"; - sha256 = "0hmb3ibza2jycnzw2hd1pjzz7hfx0m2m86v4s7zs9vjw00w4r1j9"; + sha256 = "03hasbibw79vbcrpdf2fnm42i2mxc0ia7k96xv012wn6d4dfvr4w"; }; dontConfigure = true; From 585e00a345c33e34df855c4787fb022292b3c6ba Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 13:08:10 +0000 Subject: [PATCH 106/143] imgproxy: 2.14.0 -> 2.14.1 --- pkgs/servers/imgproxy/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/imgproxy/default.nix b/pkgs/servers/imgproxy/default.nix index 2243dc5fc3cf..10b213fb0d78 100644 --- a/pkgs/servers/imgproxy/default.nix +++ b/pkgs/servers/imgproxy/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "imgproxy"; - version = "2.14.0"; + version = "2.14.1"; src = fetchFromGitHub { owner = pname; repo = pname; - sha256 = "1vmjdybrkxs1h19g14dhc49xpshwa5mwr5pbpb7mq56awqcj0r11"; + sha256 = "048bfkazjijf7p0wb5y09qhl7pgg297xxshgmkfyr025d7d50lf4"; rev = "v${version}"; }; - vendorSha256 = "1vdl19qf20l13wnacpfficww4a2hdkhgnh15ib45v9k3raam7s7i"; + vendorSha256 = "1pvyr3lazza89njdl6q3h2nd0mkvjvbryyrfqv11kd3s52055ckz"; nativeBuildInputs = [ pkg-config ]; From 0ca9e6b2b5401ed72ca212bf4c0f44e5772eca15 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 07:35:13 +0000 Subject: [PATCH 107/143] ghq: 1.1.2 -> 1.1.5 --- .../version-management/git-and-tools/ghq/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/pkgs/applications/version-management/git-and-tools/ghq/default.nix index ad128e9f0274..c45249e8bcb0 100644 --- a/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "ghq"; - version = "1.1.2"; + version = "1.1.5"; src = fetchFromGitHub { owner = "x-motemen"; repo = "ghq"; rev = "v${version}"; - sha256 = "1qzrycmd26f4q36z3rblfxp7jngqgmspb9385vpfwv9laiw3sqrg"; + sha256 = "098fik155viylq07az7crzbgswcvhpx0hr68xpvyx0rpri792jbq"; }; - vendorSha256 = "0x347ljj9q3zi0zf8x13dhvsydv9vg4qc5l1kc2y56v0w8hlb4p7"; + vendorSha256 = "0gll132g111vn1hdmdjpkha9rbyppz0qj1ld89gwlk2mqd57jxkd"; buildFlagsArray = '' -ldflags= From 31e67d684c85203663cf77f190a2324022d64f5e Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 06:56:29 +0000 Subject: [PATCH 108/143] giada: 0.16.3 -> 0.16.3.1 --- pkgs/applications/audio/giada/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/giada/default.nix b/pkgs/applications/audio/giada/default.nix index 5934b0746d15..ce3f3df84a43 100644 --- a/pkgs/applications/audio/giada/default.nix +++ b/pkgs/applications/audio/giada/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "giada"; - version = "0.16.3"; + version = "0.16.3.1"; src = fetchFromGitHub { owner = "monocasual"; repo = pname; rev = "v${version}"; - sha256 = "1sysv5d0wq6ib47bqsn3wdzkqzjpzjrgzg15bkllbm67hiz9abhh"; + sha256 = "0z1jrkggdn630i3j59j30apaa9s242y1wiawqp4g1n9dkg3r9a1j"; }; configureFlags = [ From 6e276d3612662eafc15d7fdd55c5b88be086212d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 19:59:23 +0000 Subject: [PATCH 109/143] dbmate: 1.9.0 -> 1.9.1 --- pkgs/development/tools/database/dbmate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/database/dbmate/default.nix b/pkgs/development/tools/database/dbmate/default.nix index 329d92a9fa58..c34889b4a651 100644 --- a/pkgs/development/tools/database/dbmate/default.nix +++ b/pkgs/development/tools/database/dbmate/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dbmate"; - version = "1.9.0"; + version = "1.9.1"; src = fetchFromGitHub { owner = "amacneil"; repo = "dbmate"; rev = "v${version}"; - sha256 = "0v00k658b4ca9bpn2yiiy3gq5gr6hms8mlk31wf8svwsjyzjibzr"; + sha256 = "0s7ymw1r1k1s8kwyg6nxpgak6kh9z3649a0axdfpjnm62v283shd"; }; vendorSha256 = "00vp925vf9clk5bkw5fvj34id4v548rlssizh52z9psvdizj8q5p"; From 30469ea4c55cd23175d9972dd244262699a33769 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 12:57:40 +0000 Subject: [PATCH 110/143] grml-zsh-config: 0.17.3 -> 0.17.4 --- pkgs/shells/zsh/grml-zsh-config/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/zsh/grml-zsh-config/default.nix b/pkgs/shells/zsh/grml-zsh-config/default.nix index 2012e27e5386..6af16271d383 100644 --- a/pkgs/shells/zsh/grml-zsh-config/default.nix +++ b/pkgs/shells/zsh/grml-zsh-config/default.nix @@ -5,13 +5,13 @@ with lib; stdenv.mkDerivation rec { pname = "grml-zsh-config"; - version = "0.17.3"; + version = "0.17.4"; src = fetchFromGitHub { owner = "grml"; repo = "grml-etc-core"; rev = "v${version}"; - sha256 = "1d5d68gflf67hsg1gy2ywssfdx61j1kl799akhvlwi5c0vvszvpi"; + sha256 = "09c3f7s2r0cb8g9kgh3xhc8dhr1656g1q9s9i3s5imvknwqii6as"; }; buildInputs = [ zsh coreutils txt2tags procps ] From 37e6ac0410d0baa4eebc4420f195359def03d723 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 08:56:16 +0000 Subject: [PATCH 111/143] flyctl: 0.0.135 -> 0.0.137 --- pkgs/development/web/flyctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix index bab57353e6d2..eb7a543f3bfa 100644 --- a/pkgs/development/web/flyctl/default.nix +++ b/pkgs/development/web/flyctl/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.135"; + version = "0.0.137"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "0gxd32pb901hlr493gp736rjd5fpwgqvmlir6b5r0fzyv22f8x2d"; + sha256 = "0zlcfmraf5v1crfkgxjgdjshkasyngmq1jqh7kzy3csm0p1a4sxx"; }; preBuild = '' From 9175f114fe52c01fdac048257247fdcc38895dee Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 04:47:24 +0000 Subject: [PATCH 112/143] fwts: 20.06.01 -> 20.07.00 --- pkgs/os-specific/linux/fwts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index d25c12294707..fd62f07cd9c5 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "fwts"; - version = "20.06.01"; + version = "20.07.00"; src = fetchzip { url = "http://fwts.ubuntu.com/release/${pname}-V${version}.tar.gz"; - sha256 = "04wxhmibykhm7jjw3xdmbn0rn25dsr11cig77k2jkhp7nwwqdm11"; + sha256 = "0azhcnlfziwn8wvw3fly2jfjyg53m8zba3jlcxgzrasgb0kvzb1c"; stripRoot = false; }; From c337ad413ab5cf348ce469cb329f7f9b46122b32 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 31 Jul 2020 18:46:24 +0000 Subject: [PATCH 113/143] cockroachdb: 20.1.2 -> 20.1.3 --- pkgs/servers/sql/cockroachdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/cockroachdb/default.nix b/pkgs/servers/sql/cockroachdb/default.nix index 25e2b0ae1272..852f1ea61ddc 100644 --- a/pkgs/servers/sql/cockroachdb/default.nix +++ b/pkgs/servers/sql/cockroachdb/default.nix @@ -14,13 +14,13 @@ let in buildGoPackage rec { pname = "cockroach"; - version = "20.1.2"; + version = "20.1.3"; goPackagePath = "github.com/cockroachdb/cockroach"; src = fetchurl { url = "https://binaries.cockroachdb.com/cockroach-v${version}.src.tgz"; - sha256 = "1xmb516xr0bhkzj6yigcrxbghvh0dis85dq7n5hi49mn951ad5yn"; + sha256 = "0bg60rcfn2d4awg5al8d5xvk8h7bab986qlbpl9bkv6zpw9wipfb"; }; NIX_CFLAGS_COMPILE = stdenv.lib.optionals stdenv.cc.isGNU [ "-Wno-error=deprecated-copy" "-Wno-error=redundant-move" "-Wno-error=pessimizing-move" ]; From 014d494e0511d91c52cefc90e46161a125deccf2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 1 Aug 2020 23:32:14 +0000 Subject: [PATCH 114/143] faudio: 20.07 -> 20.08 --- pkgs/development/libraries/faudio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/faudio/default.nix b/pkgs/development/libraries/faudio/default.nix index d139aca92b10..eb6ed5e21014 100644 --- a/pkgs/development/libraries/faudio/default.nix +++ b/pkgs/development/libraries/faudio/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "faudio"; - version = "20.07"; + version = "20.08"; src = fetchFromGitHub { owner = "FNA-XNA"; repo = "FAudio"; rev = version; - sha256 = "14fi0jwax9qzn2k89qazdkhxvklk5zcwhbi6pxi1l5i9zk4ly2h7"; + sha256 = "1fs0h5wl0ndix61mz7h59c15kpqikrk7nn1rc7m2a44jiw8mzdnx"; }; nativeBuildInputs = [cmake]; From 3a49eaa77c38a11bb6a5bbc00abe58ac977643d8 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 25 Jul 2020 12:33:04 +0000 Subject: [PATCH 115/143] mnemosyne: 2.7.1 -> 2.7.2 --- pkgs/games/mnemosyne/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/mnemosyne/default.nix b/pkgs/games/mnemosyne/default.nix index 44bd396e9fab..4a92b8c1014a 100644 --- a/pkgs/games/mnemosyne/default.nix +++ b/pkgs/games/mnemosyne/default.nix @@ -5,11 +5,11 @@ python.pkgs.buildPythonApplication rec { pname = "mnemosyne"; - version = "2.7.1"; + version = "2.7.2"; src = fetchurl { url = "mirror://sourceforge/project/mnemosyne-proj/mnemosyne/mnemosyne-${version}/Mnemosyne-${version}.tar.gz"; - sha256 = "0dhvg9cxc6m6kzk75h363h1g0bl80cqz11cijh0zpz9f4w6lnqsq"; + sha256 = "09yp9zc00xrc9dmjbsscnkb3hsv3yj46sxikc0r6s9cbghn3nypy"; }; nativeBuildInputs = with python.pkgs; [ pyqtwebengine.wrapQtAppsHook ]; From 6d85f8d55bfd0172efdffd3e11ab08fb738f435c Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 7 Aug 2020 02:26:23 +0000 Subject: [PATCH 116/143] python27Packages.braintree: 4.2.0 -> 4.3.0 --- pkgs/development/python-modules/braintree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/braintree/default.nix b/pkgs/development/python-modules/braintree/default.nix index 3722a294b20e..1965d256fdf7 100644 --- a/pkgs/development/python-modules/braintree/default.nix +++ b/pkgs/development/python-modules/braintree/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "braintree"; - version = "4.2.0"; + version = "4.3.0"; src = fetchPypi { inherit pname version; - sha256 = "0aw5n1hqrg5pb5xmcr1b8y9i7v8zj23q9k2p4b6bwnq2c2fqi8wr"; + sha256 = "d2b5ead45dbfe98b6099d387c7f12b7d2994ae0efb60679e6bb0929a06027e16"; }; propagatedBuildInputs = [ requests ]; From 585aa266d36fc6cc5f300d6f0696f89168f38c3c Mon Sep 17 00:00:00 2001 From: Max Wittig Date: Fri, 7 Aug 2020 11:24:58 +0200 Subject: [PATCH 117/143] gitlab-runner: 13.2.0 -> 13.2.2 (#94818) --- .../continuous-integration/gitlab-runner/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index 298e5e6f9caa..07803d6bd7c7 100644 --- a/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "13.2.0"; + version = "13.2.2"; # Gitlab runner embeds some docker images these are prebuilt for arm and x86_64 docker_x86_64 = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-x86_64.tar.xz"; - sha256 = "0cvcil96gww68abdj5ni7w69ss5ncz3ixh00k1a9nlqggf0ifaav"; + sha256 = "1m45jipn0lmlc4ynmm7g4nd1ryr5bzz1wvr8spd6gxvq5577i4pk"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/helper-images/prebuilt-arm.tar.xz"; - sha256 = "1j2z1wk4qs089mvx7y14al28pzhhnzs17n1ijpahsln2jn7b2s5m"; + sha256 = "10nx0gjhbl4gz2n3yl8m7w60pmgdywgzins6y2pa7wvj5dkm04ax"; }; in buildGoPackage rec { @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "0bgrh1yckc879qq155dvdqsr7673g1r1hbwf489ngabj8f8l3l23"; + sha256 = "1jii9rm11kcdh7hg9rif27b7rlj2cip6q9viknvs3ha1rf9fw96q"; }; patches = [ ./fix-shell-path.patch ]; From febbcb62cecd6d52fb51ae7367c2854011a8e47d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 6 Aug 2020 14:48:16 +0000 Subject: [PATCH 118/143] nim: 1.2.4 -> 1.2.6 --- pkgs/development/compilers/nim/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/nim/default.nix b/pkgs/development/compilers/nim/default.nix index 9fa2270b1dde..543a6120577f 100644 --- a/pkgs/development/compilers/nim/default.nix +++ b/pkgs/development/compilers/nim/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "nim"; - version = "1.2.4"; + version = "1.2.6"; src = fetchurl { url = "https://nim-lang.org/download/${pname}-${version}.tar.xz"; - sha256 = "0dnn60slvp3ynlx3zhv3cjkanv8zglljxws0db8g0rdyz8r8zwgf"; + sha256 = "0zk5qzxayqjw7kq6p92j4008g9bbyilyymhdc5xq9sln5rqym26z"; }; enableParallelBuilding = true; From 0ca30931296b22a12842487041c0d60d0aa5fd4a Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Aug 2020 12:44:58 +0200 Subject: [PATCH 119/143] snapper: 0.8.10 -> 0.8.12 --- pkgs/tools/misc/snapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index fc834c65a9dc..ab4aad485567 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "snapper"; - version = "0.8.10"; + version = "0.8.12"; src = fetchFromGitHub { owner = "openSUSE"; repo = "snapper"; rev = "v${version}"; - sha256 = "0bw8aal3a9823zcwini3an9zdxmf7vm912jbyb95rjac0wilqfw7"; + sha256 = "0vkzncgyf1l2wcr5qd615qbd0hmclfrblg38mx52m707z3wyv88v"; }; nativeBuildInputs = [ From 3012ed98c2ef39b624b29e0e85ca66c0d9bff910 Mon Sep 17 00:00:00 2001 From: Evils Date: Thu, 6 Aug 2020 08:23:18 +0200 Subject: [PATCH 120/143] waybar: 0.9.2 -> 0.9.3 and remove libinput as their readme says it was never used https://github.com/Alexays/Waybar/commit/74db69dcb7cc9ef46c6036d0474c42e90a47fb82 --- pkgs/applications/misc/waybar/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix index 7ecaabe9a922..259eb93771b3 100644 --- a/pkgs/applications/misc/waybar/default.nix +++ b/pkgs/applications/misc/waybar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, pkgconfig, ninja, wrapGAppsHook -, wayland, wlroots, gtkmm3, libinput, libsigcxx, jsoncpp, fmt, scdoc, spdlog, gtk-layer-shell +, wayland, wlroots, gtkmm3, libsigcxx, jsoncpp, fmt, scdoc, spdlog, gtk-layer-shell , howard-hinnant-date, cmake , traySupport ? true, libdbusmenu-gtk3 , pulseSupport ? false, libpulseaudio @@ -11,13 +11,13 @@ }: stdenv.mkDerivation rec { pname = "waybar"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "Alexays"; repo = "Waybar"; rev = version; - sha256 = "1gfxyjzwfqznyrpyr3322z3w844i1lh77kly4hcpy9y5gsfmlafy"; + sha256 = "0ks719khhg2zwpyiwa2079i6962qcxpapm28hmr4ckpsp2n659ck"; }; nativeBuildInputs = [ @@ -32,7 +32,7 @@ strictDeps = false; buildInputs = with stdenv.lib; - [ wayland wlroots gtkmm3 libinput libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ] + [ wayland wlroots gtkmm3 libsigcxx jsoncpp fmt spdlog gtk-layer-shell howard-hinnant-date ] ++ optional traySupport libdbusmenu-gtk3 ++ optional pulseSupport libpulseaudio ++ optional nlSupport libnl From 6c2f1e7f6b22ede8b8f1c8f0afabb15592a44934 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Fri, 7 Aug 2020 12:53:54 +0200 Subject: [PATCH 121/143] octopus: 9.2 -> 10.0 --- pkgs/applications/science/chemistry/octopus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/chemistry/octopus/default.nix b/pkgs/applications/science/chemistry/octopus/default.nix index adb31d326509..f8eb064e1fd7 100644 --- a/pkgs/applications/science/chemistry/octopus/default.nix +++ b/pkgs/applications/science/chemistry/octopus/default.nix @@ -6,13 +6,13 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "octopus"; - version = "9.2"; + version = "10.0"; src = fetchFromGitLab { owner = "octopus-code"; repo = "octopus"; rev = version; - sha256 = "083z51sjv70asr04rv53wb9gf4396nblq1zl22qw7jdr28hji4is"; + sha256 = "1c6q20y0x9aacwa7vp6gj3yvfzain7hnk6skxmvg3wazp02l91kn"; }; nativeBuildInputs = [ perl procps autoreconfHook ]; From ba930d8679a3945e9a2196f22bda8a1f06972438 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 7 Aug 2020 14:43:58 +0100 Subject: [PATCH 122/143] nixos/modules: remove trailing whitespace This leads to ci failure otherwise if the file gets changed. git-blame can ignore whitespace changes. --- nixos/modules/config/appstream.nix | 8 ++--- nixos/modules/hardware/tuxedo-keyboard.nix | 4 +-- nixos/modules/i18n/input-method/uim.nix | 2 +- nixos/modules/programs/autojump.nix | 4 +-- nixos/modules/programs/freetds.nix | 4 +-- nixos/modules/services/audio/icecast.nix | 4 +-- nixos/modules/services/backup/bacula.nix | 36 +++++++++---------- nixos/modules/services/backup/restic.nix | 2 +- .../modules/services/computing/torque/mom.nix | 2 +- .../services/computing/torque/server.nix | 2 +- nixos/modules/services/databases/riak-cs.nix | 2 +- .../services/games/minetest-server.nix | 16 ++++----- nixos/modules/services/games/terraria.nix | 2 +- nixos/modules/services/hardware/thinkfan.nix | 2 +- nixos/modules/services/hardware/trezord.nix | 4 +-- .../modules/services/misc/matrix-synapse.nix | 2 +- nixos/modules/services/misc/siproxd.nix | 8 ++--- nixos/modules/services/misc/tzupdate.nix | 4 +-- .../modules/services/monitoring/cadvisor.nix | 2 +- .../services/monitoring/dd-agent/dd-agent.nix | 4 +-- .../services/monitoring/teamviewer.nix | 2 +- .../modules/services/networking/bitcoind.nix | 4 +-- nixos/modules/services/networking/gateone.nix | 2 +- nixos/modules/services/networking/mstpd.nix | 2 +- .../services/networking/nghttpx/default.nix | 6 ++-- .../modules/services/networking/onedrive.nix | 2 +- nixos/modules/services/networking/prosody.nix | 2 +- .../services/networking/supplicant.nix | 26 +++++++------- .../modules/services/networking/trickster.nix | 2 +- .../services/networking/websockify.nix | 6 ++-- nixos/modules/services/security/haveged.nix | 18 +++++----- .../services/web-apps/pgpkeyserver-lite.nix | 2 +- nixos/modules/services/web-apps/trilium.nix | 2 +- .../services/web-servers/shellinabox.nix | 2 +- .../services/x11/display-managers/default.nix | 2 +- .../services/x11/window-managers/qtile.nix | 2 +- nixos/modules/system/boot/initrd-openvpn.nix | 18 +++++----- .../boot/loader/systemd-boot/systemd-boot.nix | 4 +-- nixos/modules/system/boot/systemd-nspawn.nix | 6 ++-- nixos/modules/tasks/bcache.nix | 2 +- nixos/modules/virtualisation/azure-image.nix | 2 +- nixos/modules/virtualisation/railcar.nix | 12 +++---- 42 files changed, 120 insertions(+), 120 deletions(-) diff --git a/nixos/modules/config/appstream.nix b/nixos/modules/config/appstream.nix index 483ac9c3cd76..a72215c2f561 100644 --- a/nixos/modules/config/appstream.nix +++ b/nixos/modules/config/appstream.nix @@ -7,18 +7,18 @@ with lib; type = types.bool; default = true; description = '' - Whether to install files to support the + Whether to install files to support the AppStream metadata specification. ''; }; }; config = mkIf config.appstream.enable { - environment.pathsToLink = [ + environment.pathsToLink = [ # per component metadata - "/share/metainfo" + "/share/metainfo" # legacy path for above - "/share/appdata" + "/share/appdata" ]; }; diff --git a/nixos/modules/hardware/tuxedo-keyboard.nix b/nixos/modules/hardware/tuxedo-keyboard.nix index 898eed244935..97af7c61f3c9 100644 --- a/nixos/modules/hardware/tuxedo-keyboard.nix +++ b/nixos/modules/hardware/tuxedo-keyboard.nix @@ -2,7 +2,7 @@ with lib; -let +let cfg = config.hardware.tuxedo-keyboard; tuxedo-keyboard = config.boot.kernelPackages.tuxedo-keyboard; in @@ -27,7 +27,7 @@ in ''; }; - config = mkIf cfg.enable + config = mkIf cfg.enable { boot.kernelModules = ["tuxedo_keyboard"]; boot.extraModulePackages = [ tuxedo-keyboard ]; diff --git a/nixos/modules/i18n/input-method/uim.nix b/nixos/modules/i18n/input-method/uim.nix index 7ad68bf851fe..459294657e0a 100644 --- a/nixos/modules/i18n/input-method/uim.nix +++ b/nixos/modules/i18n/input-method/uim.nix @@ -2,7 +2,7 @@ with lib; -let +let cfg = config.i18n.inputMethod.uim; in { diff --git a/nixos/modules/programs/autojump.nix b/nixos/modules/programs/autojump.nix index 3a8feec4bb45..ecfc2f658079 100644 --- a/nixos/modules/programs/autojump.nix +++ b/nixos/modules/programs/autojump.nix @@ -18,7 +18,7 @@ in ''; }; }; - }; + }; ###### implementation @@ -26,7 +26,7 @@ in environment.pathsToLink = [ "/share/autojump" ]; environment.systemPackages = [ pkgs.autojump ]; - programs.bash.interactiveShellInit = "source ${pkgs.autojump}/share/autojump/autojump.bash"; + programs.bash.interactiveShellInit = "source ${pkgs.autojump}/share/autojump/autojump.bash"; programs.zsh.interactiveShellInit = mkIf prg.zsh.enable "source ${pkgs.autojump}/share/autojump/autojump.zsh"; programs.fish.interactiveShellInit = mkIf prg.fish.enable "source ${pkgs.autojump}/share/autojump/autojump.fish"; }; diff --git a/nixos/modules/programs/freetds.nix b/nixos/modules/programs/freetds.nix index e0860a242b74..b4b657e391bf 100644 --- a/nixos/modules/programs/freetds.nix +++ b/nixos/modules/programs/freetds.nix @@ -25,7 +25,7 @@ in '''; } ''; - description = + description = '' Configure freetds database entries. Each attribute denotes a section within freetds.conf, and the value (a string) is the config @@ -47,7 +47,7 @@ in environment.variables.FREETDS = "/etc/freetds.conf"; environment.variables.SYBASE = "${pkgs.freetds}"; - environment.etc."freetds.conf" = { text = + environment.etc."freetds.conf" = { text = (concatStrings (mapAttrsToList (name: value: '' [${name}] diff --git a/nixos/modules/services/audio/icecast.nix b/nixos/modules/services/audio/icecast.nix index 6a8a0f9975b3..f40ea6be29d4 100644 --- a/nixos/modules/services/audio/icecast.nix +++ b/nixos/modules/services/audio/icecast.nix @@ -23,7 +23,7 @@ let ${toString cfg.listen.port} ${cfg.listen.address} - + 0 @@ -70,7 +70,7 @@ in { description = "Base directory used for logging."; default = "/var/log/icecast"; }; - + listen = { port = mkOption { type = types.int; diff --git a/nixos/modules/services/backup/bacula.nix b/nixos/modules/services/backup/bacula.nix index cef304734aee..3d69a69038a3 100644 --- a/nixos/modules/services/backup/bacula.nix +++ b/nixos/modules/services/backup/bacula.nix @@ -18,7 +18,7 @@ let Pid Directory = "/run"; ${fd_cfg.extraClientConfig} } - + ${concatStringsSep "\n" (mapAttrsToList (name: value: '' Director { Name = "${name}"; @@ -26,7 +26,7 @@ let Monitor = "${value.monitor}"; } '') fd_cfg.director)} - + Messages { Name = Standard; syslog = all, !skipped, !restored @@ -35,7 +35,7 @@ let ''; sd_cfg = config.services.bacula-sd; - sd_conf = pkgs.writeText "bacula-sd.conf" + sd_conf = pkgs.writeText "bacula-sd.conf" '' Storage { Name = "${sd_cfg.name}"; @@ -80,7 +80,7 @@ let ''; dir_cfg = config.services.bacula-dir; - dir_conf = pkgs.writeText "bacula-dir.conf" + dir_conf = pkgs.writeText "bacula-dir.conf" '' Director { Name = "${dir_cfg.name}"; @@ -125,10 +125,10 @@ let The password is plain text. It is not generated through any special process but as noted above, it is better to use random text for - security reasons. + security reasons. ''; }; - + monitor = mkOption { default = "no"; example = "yes"; @@ -140,7 +140,7 @@ let Please note that if this director is being used by a Monitor, we highly recommend to set this directive to yes to avoid serious - security problems. + security problems. ''; }; }; @@ -163,7 +163,7 @@ let type of autochanger, what you specify here can vary. This directive is optional. See the Using AutochangersAutochangersChapter chapter of this manual for more details of using this and the following - autochanger directives. + autochanger directives. ''; }; @@ -200,7 +200,7 @@ let Extra configuration to be passed in Autochanger directive. ''; example = '' - + ''; }; }; @@ -222,7 +222,7 @@ let if you are archiving to disk storage. In this case, you must supply the full absolute path to the directory. When specifying a tape device, it is preferable that the "non-rewind" variant of the device - file name be given. + file name be given. ''; }; @@ -290,7 +290,7 @@ in { Whether to enable the Bacula File Daemon. ''; }; - + name = mkOption { default = "${config.networking.hostName}-fd"; description = '' @@ -300,7 +300,7 @@ in { Clients. This directive is required. ''; }; - + port = mkOption { default = 9102; type = types.int; @@ -310,7 +310,7 @@ in { the Client resource of the Director's configuration file. ''; }; - + director = mkOption { default = {}; description = '' @@ -349,14 +349,14 @@ in { Whether to enable Bacula Storage Daemon. ''; }; - + name = mkOption { default = "${config.networking.hostName}-sd"; description = '' Specifies the Name of the Storage daemon. ''; }; - + port = mkOption { default = 9103; type = types.int; @@ -410,7 +410,7 @@ in { console = all ''; }; - + }; services.bacula-dir = { @@ -429,7 +429,7 @@ in { required. ''; }; - + port = mkOption { default = 9101; type = types.int; @@ -442,7 +442,7 @@ in { specify DirAddresses (N.B plural) directive. ''; }; - + password = mkOption { # TODO: required? description = '' diff --git a/nixos/modules/services/backup/restic.nix b/nixos/modules/services/backup/restic.nix index c38fd361d353..d869835bf07e 100644 --- a/nixos/modules/services/backup/restic.nix +++ b/nixos/modules/services/backup/restic.nix @@ -55,7 +55,7 @@ in Configuration for the rclone remote being used for backup. See the remote's specific options under rclone's docs at . When specifying - option names, use the "config" name specified in the docs. + option names, use the "config" name specified in the docs. For example, to set --b2-hard-delete for a B2 remote, use hard_delete = true in the attribute set. diff --git a/nixos/modules/services/computing/torque/mom.nix b/nixos/modules/services/computing/torque/mom.nix index 83772539a7ab..0c5f43cf3e6a 100644 --- a/nixos/modules/services/computing/torque/mom.nix +++ b/nixos/modules/services/computing/torque/mom.nix @@ -60,4 +60,4 @@ in }; }; -} +} diff --git a/nixos/modules/services/computing/torque/server.nix b/nixos/modules/services/computing/torque/server.nix index 655d1500497e..21c5a4f46724 100644 --- a/nixos/modules/services/computing/torque/server.nix +++ b/nixos/modules/services/computing/torque/server.nix @@ -93,4 +93,4 @@ in }; }; -} +} diff --git a/nixos/modules/services/databases/riak-cs.nix b/nixos/modules/services/databases/riak-cs.nix index 2cb204f729a7..fa6ac8863318 100644 --- a/nixos/modules/services/databases/riak-cs.nix +++ b/nixos/modules/services/databases/riak-cs.nix @@ -35,7 +35,7 @@ in Name of the Erlang node. ''; }; - + anonymousUserCreation = mkOption { type = types.bool; default = false; diff --git a/nixos/modules/services/games/minetest-server.nix b/nixos/modules/services/games/minetest-server.nix index 98e69c6dc0ea..f52079fc1ef6 100644 --- a/nixos/modules/services/games/minetest-server.nix +++ b/nixos/modules/services/games/minetest-server.nix @@ -5,12 +5,12 @@ with lib; let cfg = config.services.minetest-server; flag = val: name: if val != null then "--${name} ${val} " else ""; - flags = [ - (flag cfg.gameId "gameid") - (flag cfg.world "world") - (flag cfg.configPath "config") - (flag cfg.logPath "logfile") - (flag cfg.port "port") + flags = [ + (flag cfg.gameId "gameid") + (flag cfg.world "world") + (flag cfg.configPath "config") + (flag cfg.logPath "logfile") + (flag cfg.port "port") ]; in { @@ -26,7 +26,7 @@ in type = types.nullOr types.str; default = null; description = '' - Id of the game to use. To list available games run + Id of the game to use. To list available games run `minetestserver --gameid list`. If only one game exists, this option can be null. @@ -59,7 +59,7 @@ in type = types.nullOr types.path; default = null; description = '' - Path to logfile for logging. + Path to logfile for logging. If set to null, logging will be output to stdout which means all output will be catched by systemd. diff --git a/nixos/modules/services/games/terraria.nix b/nixos/modules/services/games/terraria.nix index a59b74c0b4c4..413660321ec3 100644 --- a/nixos/modules/services/games/terraria.nix +++ b/nixos/modules/services/games/terraria.nix @@ -7,7 +7,7 @@ let worldSizeMap = { small = 1; medium = 2; large = 3; }; valFlag = name: val: optionalString (val != null) "-${name} \"${escape ["\\" "\""] (toString val)}\""; boolFlag = name: val: optionalString val "-${name}"; - flags = [ + flags = [ (valFlag "port" cfg.port) (valFlag "maxPlayers" cfg.maxPlayers) (valFlag "password" cfg.password) diff --git a/nixos/modules/services/hardware/thinkfan.nix b/nixos/modules/services/hardware/thinkfan.nix index 7c105e99ca54..3bda61ed1a93 100644 --- a/nixos/modules/services/hardware/thinkfan.nix +++ b/nixos/modules/services/hardware/thinkfan.nix @@ -67,7 +67,7 @@ in { type = types.bool; default = false; description = '' - Whether to build thinkfan with SMART support to read temperatures + Whether to build thinkfan with SMART support to read temperatures directly from hard disks. ''; }; diff --git a/nixos/modules/services/hardware/trezord.nix b/nixos/modules/services/hardware/trezord.nix index c517e9fbb2bd..2594ac743710 100644 --- a/nixos/modules/services/hardware/trezord.nix +++ b/nixos/modules/services/hardware/trezord.nix @@ -10,7 +10,7 @@ in { meta = { doc = ./trezord.xml; }; - + ### interface options = { @@ -40,7 +40,7 @@ in { }; }; }; - + ### implementation config = mkIf cfg.enable { diff --git a/nixos/modules/services/misc/matrix-synapse.nix b/nixos/modules/services/misc/matrix-synapse.nix index e982eb16fa70..3eb1073387fe 100644 --- a/nixos/modules/services/misc/matrix-synapse.nix +++ b/nixos/modules/services/misc/matrix-synapse.nix @@ -675,7 +675,7 @@ in { } ]; - users.users.matrix-synapse = { + users.users.matrix-synapse = { group = "matrix-synapse"; home = cfg.dataDir; createHome = true; diff --git a/nixos/modules/services/misc/siproxd.nix b/nixos/modules/services/misc/siproxd.nix index ae7b27de8e70..0e87fc461d3f 100644 --- a/nixos/modules/services/misc/siproxd.nix +++ b/nixos/modules/services/misc/siproxd.nix @@ -38,7 +38,7 @@ in type = types.bool; default = false; description = '' - Whether to enable the Siproxd SIP + Whether to enable the Siproxd SIP proxy/masquerading daemon. ''; }; @@ -111,7 +111,7 @@ in type = types.int; default = 300; description = '' - Timeout for an RTP stream. If for the specified + Timeout for an RTP stream. If for the specified number of seconds no data is relayed on an active stream, it is considered dead and will be killed. ''; @@ -122,7 +122,7 @@ in default = 46; description = '' DSCP (differentiated services) value to be assigned - to RTP packets. Allows QOS aware routers to handle + to RTP packets. Allows QOS aware routers to handle different types traffic with different priorities. ''; }; @@ -132,7 +132,7 @@ in default = 0; description = '' DSCP (differentiated services) value to be assigned - to SIP packets. Allows QOS aware routers to handle + to SIP packets. Allows QOS aware routers to handle different types traffic with different priorities. ''; }; diff --git a/nixos/modules/services/misc/tzupdate.nix b/nixos/modules/services/misc/tzupdate.nix index 570982ced29a..eac1e1112a5a 100644 --- a/nixos/modules/services/misc/tzupdate.nix +++ b/nixos/modules/services/misc/tzupdate.nix @@ -11,7 +11,7 @@ in { default = false; description = '' Enable the tzupdate timezone updating service. This provides - a one-shot service which can be activated with systemctl to + a one-shot service which can be activated with systemctl to update the timezone. ''; }; @@ -21,7 +21,7 @@ in { # We need to have imperative time zone management for this to work. # This will give users an error if they have set an explicit time # zone, which is better than silently overriding it. - time.timeZone = null; + time.timeZone = null; # We provide a one-shot service which can be manually run. We could # provide a service that runs on startup, but it's tricky to get diff --git a/nixos/modules/services/monitoring/cadvisor.nix b/nixos/modules/services/monitoring/cadvisor.nix index 655a6934a266..da051dbe4655 100644 --- a/nixos/modules/services/monitoring/cadvisor.nix +++ b/nixos/modules/services/monitoring/cadvisor.nix @@ -90,7 +90,7 @@ in { default = []; description = '' Additional cadvisor options. - + See for available options. ''; }; diff --git a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix index e91717fb2054..a290dae8d4b9 100644 --- a/nixos/modules/services/monitoring/dd-agent/dd-agent.nix +++ b/nixos/modules/services/monitoring/dd-agent/dd-agent.nix @@ -97,11 +97,11 @@ let "dd-agent/conf.d/nginx.yaml".source = nginxConfig; }) // (optionalAttrs (cfg.mongoConfig != null) - { + { "dd-agent/conf.d/mongo.yaml".source = mongoConfig; }) // (optionalAttrs (cfg.processConfig != null) - { + { "dd-agent/conf.d/process.yaml".source = processConfig; }) // (optionalAttrs (cfg.jmxConfig != null) diff --git a/nixos/modules/services/monitoring/teamviewer.nix b/nixos/modules/services/monitoring/teamviewer.nix index dd98ecab828d..8d781d82d086 100644 --- a/nixos/modules/services/monitoring/teamviewer.nix +++ b/nixos/modules/services/monitoring/teamviewer.nix @@ -15,7 +15,7 @@ in options = { services.teamviewer.enable = mkEnableOption "TeamViewer daemon"; - + }; ###### implementation diff --git a/nixos/modules/services/networking/bitcoind.nix b/nixos/modules/services/networking/bitcoind.nix index 38537ad2de72..ba9281cf6f02 100644 --- a/nixos/modules/services/networking/bitcoind.nix +++ b/nixos/modules/services/networking/bitcoind.nix @@ -183,8 +183,8 @@ in } ]) eachBitcoind); - environment.systemPackages = flatten (mapAttrsToList (bitcoindName: cfg: [ - cfg.package + environment.systemPackages = flatten (mapAttrsToList (bitcoindName: cfg: [ + cfg.package ]) eachBitcoind); systemd.services = mapAttrs' (bitcoindName: cfg: ( diff --git a/nixos/modules/services/networking/gateone.nix b/nixos/modules/services/networking/gateone.nix index 4456a95402ed..56f2ba21a125 100644 --- a/nixos/modules/services/networking/gateone.nix +++ b/nixos/modules/services/networking/gateone.nix @@ -56,4 +56,4 @@ config = mkIf cfg.enable { }; }; } - + diff --git a/nixos/modules/services/networking/mstpd.nix b/nixos/modules/services/networking/mstpd.nix index 5d1fc4a65427..bd71010ce549 100644 --- a/nixos/modules/services/networking/mstpd.nix +++ b/nixos/modules/services/networking/mstpd.nix @@ -5,7 +5,7 @@ in with lib; { options.services.mstpd = { - + enable = mkOption { default = false; type = types.bool; diff --git a/nixos/modules/services/networking/nghttpx/default.nix b/nixos/modules/services/networking/nghttpx/default.nix index 881a2670f5db..b8a0a24e3aad 100644 --- a/nixos/modules/services/networking/nghttpx/default.nix +++ b/nixos/modules/services/networking/nghttpx/default.nix @@ -60,7 +60,7 @@ let # NB: nghttpx doesn't accept "tls", you must omit "no-tls" for # the default behavior of turning on TLS. params1 = lib.remove "tls" params0; - + sections = [ host] ++ params1; formattedSections = lib.concatStringsSep ";" sections; in @@ -90,7 +90,7 @@ in { imports = [ ./nghttpx-options.nix ]; - + config = lib.mkIf cfg.enable { users.groups.nghttpx = { }; @@ -98,7 +98,7 @@ in group = config.users.groups.nghttpx.name; isSystemUser = true; }; - + systemd.services = { nghttpx = { diff --git a/nixos/modules/services/networking/onedrive.nix b/nixos/modules/services/networking/onedrive.nix index a945250fa9e6..210d2217b27f 100644 --- a/nixos/modules/services/networking/onedrive.nix +++ b/nixos/modules/services/networking/onedrive.nix @@ -23,7 +23,7 @@ in { ### Documentation # meta.doc = ./onedrive.xml; - ### Interface + ### Interface options.services.onedrive = { enable = lib.mkOption { diff --git a/nixos/modules/services/networking/prosody.nix b/nixos/modules/services/networking/prosody.nix index cdd341c9fb62..e53d7093be86 100644 --- a/nixos/modules/services/networking/prosody.nix +++ b/nixos/modules/services/networking/prosody.nix @@ -772,7 +772,7 @@ in }; disco_items = { - ${ lib.concatStringsSep "\n" (builtins.map (x: ''{ "${x.url}", "${x.description}"};'') discoItems)} + ${ lib.concatStringsSep "\n" (builtins.map (x: ''{ "${x.url}", "${x.description}"};'') discoItems)} }; allow_registration = ${toLua cfg.allowRegistration} diff --git a/nixos/modules/services/networking/supplicant.nix b/nixos/modules/services/networking/supplicant.nix index b5b9989ce186..20704be9b36f 100644 --- a/nixos/modules/services/networking/supplicant.nix +++ b/nixos/modules/services/networking/supplicant.nix @@ -76,9 +76,9 @@ in networking.supplicant = mkOption { type = with types; attrsOf (submodule { options = { - + configFile = { - + path = mkOption { type = types.nullOr types.path; default = null; @@ -89,7 +89,7 @@ in precedence over options defined in configFile. ''; }; - + writable = mkOption { type = types.bool; default = false; @@ -98,9 +98,9 @@ in wpa_supplicant. ''; }; - + }; - + extraConf = mkOption { type = types.lines; default = ""; @@ -126,7 +126,7 @@ in use the configFile instead. ''; }; - + extraCmdArgs = mkOption { type = types.str; default = ""; @@ -134,21 +134,21 @@ in description = "Command line arguments to add when executing wpa_supplicant."; }; - + driver = mkOption { type = types.nullOr types.str; default = "nl80211,wext"; description = "Force a specific wpa_supplicant driver."; }; - + bridge = mkOption { type = types.str; default = ""; description = "Name of the bridge interface that wpa_supplicant should listen at."; }; - + userControlled = { - + enable = mkOption { type = types.bool; default = false; @@ -159,20 +159,20 @@ in access points. ''; }; - + socketDir = mkOption { type = types.str; default = "/run/wpa_supplicant"; description = "Directory of sockets for controlling wpa_supplicant."; }; - + group = mkOption { type = types.str; default = "wheel"; example = "network"; description = "Members of this group can control wpa_supplicant."; }; - + }; }; }); diff --git a/nixos/modules/services/networking/trickster.nix b/nixos/modules/services/networking/trickster.nix index 705204ce49fa..bcf5a04ae5fc 100644 --- a/nixos/modules/services/networking/trickster.nix +++ b/nixos/modules/services/networking/trickster.nix @@ -106,7 +106,7 @@ in Restart = "always"; }; }; - }; + }; meta.maintainers = with maintainers; [ maintainers."1000101" ]; diff --git a/nixos/modules/services/networking/websockify.nix b/nixos/modules/services/networking/websockify.nix index d9177df65bd6..27cb47be12f7 100644 --- a/nixos/modules/services/networking/websockify.nix +++ b/nixos/modules/services/networking/websockify.nix @@ -5,12 +5,12 @@ with lib; let cfg = config.services.networking.websockify; in { options = { services.networking.websockify = { - enable = mkOption { + enable = mkOption { description = "Whether to enable websockify to forward websocket connections to TCP connections."; - default = false; + default = false; - type = types.bool; + type = types.bool; }; sslCert = mkOption { diff --git a/nixos/modules/services/security/haveged.nix b/nixos/modules/services/security/haveged.nix index eca529188810..22ece1883446 100644 --- a/nixos/modules/services/security/haveged.nix +++ b/nixos/modules/services/security/haveged.nix @@ -21,11 +21,11 @@ in type = types.bool; default = false; description = '' - Whether to enable to haveged entropy daemon, which refills + Whether to enable to haveged entropy daemon, which refills /dev/random when low. ''; }; - + refill_threshold = mkOption { type = types.int; default = 1024; @@ -34,16 +34,16 @@ in haveged should refill the entropy pool. ''; }; - + }; - + }; - - + + ###### implementation - + config = mkIf cfg.enable { - + systemd.services.haveged = { description = "Entropy Harvesting Daemon"; unitConfig.Documentation = "man:haveged(8)"; @@ -63,5 +63,5 @@ in }; }; - + } diff --git a/nixos/modules/services/web-apps/pgpkeyserver-lite.nix b/nixos/modules/services/web-apps/pgpkeyserver-lite.nix index ad70ba70bbef..838fd19ad294 100644 --- a/nixos/modules/services/web-apps/pgpkeyserver-lite.nix +++ b/nixos/modules/services/web-apps/pgpkeyserver-lite.nix @@ -33,7 +33,7 @@ in description = " Which hostname to set the vHost to that is proxying to sks. "; - }; + }; hkpAddress = mkOption { default = builtins.head sksCfg.hkpAddress; diff --git a/nixos/modules/services/web-apps/trilium.nix b/nixos/modules/services/web-apps/trilium.nix index 6f47193c62b9..3fa8dad04908 100644 --- a/nixos/modules/services/web-apps/trilium.nix +++ b/nixos/modules/services/web-apps/trilium.nix @@ -83,7 +83,7 @@ in }; }; - config = lib.mkIf cfg.enable (lib.mkMerge [ + config = lib.mkIf cfg.enable (lib.mkMerge [ { meta.maintainers = with lib.maintainers; [ kampka ]; diff --git a/nixos/modules/services/web-servers/shellinabox.nix b/nixos/modules/services/web-servers/shellinabox.nix index 58a02ac59c35..c7c51f873eba 100644 --- a/nixos/modules/services/web-servers/shellinabox.nix +++ b/nixos/modules/services/web-servers/shellinabox.nix @@ -51,7 +51,7 @@ in Whether or not to enable SSL (https) support. ''; }; - + certDirectory = mkOption { type = types.nullOr types.path; default = null; diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index e990a66d198f..b8b36aa05324 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -353,7 +353,7 @@ in }; }; }; - + default = {}; description = '' Auto login configuration attrset. diff --git a/nixos/modules/services/x11/window-managers/qtile.nix b/nixos/modules/services/x11/window-managers/qtile.nix index ad3b65150b01..cadc316bbc4f 100644 --- a/nixos/modules/services/x11/window-managers/qtile.nix +++ b/nixos/modules/services/x11/window-managers/qtile.nix @@ -19,7 +19,7 @@ in waitPID=$! ''; }]; - + environment.systemPackages = [ pkgs.qtile ]; }; } diff --git a/nixos/modules/system/boot/initrd-openvpn.nix b/nixos/modules/system/boot/initrd-openvpn.nix index 7553c2aebb10..e59bc7b6678f 100644 --- a/nixos/modules/system/boot/initrd-openvpn.nix +++ b/nixos/modules/system/boot/initrd-openvpn.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.boot.initrd.network.openvpn; - + in { @@ -16,17 +16,17 @@ in type = types.bool; default = false; description = '' - Starts an OpenVPN client during initrd boot. It can be used to e.g. - remotely accessing the SSH service controlled by - or other network services + Starts an OpenVPN client during initrd boot. It can be used to e.g. + remotely accessing the SSH service controlled by + or other network services included. Service is killed when stage-1 boot is finished. ''; }; - + boot.initrd.network.openvpn.configuration = mkOption { type = types.path; # Same type as boot.initrd.secrets description = '' - The configuration file for OpenVPN. + The configuration file for OpenVPN. @@ -47,7 +47,7 @@ in message = "You should specify a configuration for initrd OpenVPN"; } ]; - + # Add kernel modules needed for OpenVPN boot.initrd.kernelModules = [ "tun" "tap" ]; @@ -60,11 +60,11 @@ in cp -pv ${pkgs.glibc}/lib/libresolv.so.2 $out/lib cp -pv ${pkgs.glibc}/lib/libnss_dns.so.2 $out/lib ''; - + boot.initrd.secrets = { "/etc/initrd.ovpn" = cfg.configuration; }; - + # openvpn --version would exit with 1 instead of 0 boot.initrd.extraUtilsCommandsTest = '' $out/bin/openvpn --show-gateway diff --git a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix index 22d459ceb04f..f0bd76a3c1d2 100644 --- a/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix +++ b/nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix @@ -64,10 +64,10 @@ in { example = 120; type = types.nullOr types.int; description = '' - Maximum number of latest generations in the boot menu. + Maximum number of latest generations in the boot menu. Useful to prevent boot partition running out of disk space. - null means no limit i.e. all generations + null means no limit i.e. all generations that were not garbage collected yet. ''; }; diff --git a/nixos/modules/system/boot/systemd-nspawn.nix b/nixos/modules/system/boot/systemd-nspawn.nix index 06ea5ee49f72..b450d77429b2 100644 --- a/nixos/modules/system/boot/systemd-nspawn.nix +++ b/nixos/modules/system/boot/systemd-nspawn.nix @@ -113,9 +113,9 @@ in { config = let units = mapAttrs' (n: v: let nspawnFile = "${n}.nspawn"; in nameValuePair nspawnFile (instanceToUnit nspawnFile v)) cfg; - in + in mkMerge [ - (mkIf (cfg != {}) { + (mkIf (cfg != {}) { environment.etc."systemd/nspawn".source = mkIf (cfg != {}) (generateUnits' false "nspawn" units [] []); }) { @@ -123,7 +123,7 @@ in { # Workaround for https://github.com/NixOS/nixpkgs/pull/67232#issuecomment-531315437 and https://github.com/systemd/systemd/issues/13622 # Once systemd fixes this upstream, we can re-enable -U - systemd.services."systemd-nspawn@".serviceConfig.ExecStart = [ + systemd.services."systemd-nspawn@".serviceConfig.ExecStart = [ "" # deliberately empty. signals systemd to override the ExecStart # Only difference between upstream is that we do not pass the -U flag "${config.systemd.package}/bin/systemd-nspawn --quiet --keep-unit --boot --link-journal=try-guest --network-veth --settings=override --machine=%i" diff --git a/nixos/modules/tasks/bcache.nix b/nixos/modules/tasks/bcache.nix index 8bab91c721fd..41fb7664f3d1 100644 --- a/nixos/modules/tasks/bcache.nix +++ b/nixos/modules/tasks/bcache.nix @@ -8,6 +8,6 @@ boot.initrd.extraUdevRulesCommands = '' cp -v ${pkgs.bcache-tools}/lib/udev/rules.d/*.rules $out/ - ''; + ''; } diff --git a/nixos/modules/virtualisation/azure-image.nix b/nixos/modules/virtualisation/azure-image.nix index 21fd58e5c902..60fed3222ef3 100644 --- a/nixos/modules/virtualisation/azure-image.nix +++ b/nixos/modules/virtualisation/azure-image.nix @@ -6,7 +6,7 @@ let in { imports = [ ./azure-common.nix ]; - + options = { virtualisation.azureImage.diskSize = mkOption { type = with types; int; diff --git a/nixos/modules/virtualisation/railcar.nix b/nixos/modules/virtualisation/railcar.nix index 12da1c75fc38..527bf8558a91 100644 --- a/nixos/modules/virtualisation/railcar.nix +++ b/nixos/modules/virtualisation/railcar.nix @@ -29,9 +29,9 @@ let default = "none"; description = '' The type of the filesystem to be mounted. - Linux: filesystem types supported by the kernel as listed in - `/proc/filesystems` (e.g., "minix", "ext2", "ext3", "jfs", "xfs", - "reiserfs", "msdos", "proc", "nfs", "iso9660"). For bind mounts + Linux: filesystem types supported by the kernel as listed in + `/proc/filesystems` (e.g., "minix", "ext2", "ext3", "jfs", "xfs", + "reiserfs", "msdos", "proc", "nfs", "iso9660"). For bind mounts (when options include either bind or rbind), the type is a dummy, often "none" (not listed in /proc/filesystems). ''; @@ -45,9 +45,9 @@ let default = [ "bind" ]; description = '' Mount options of the filesystem to be used. - - Support optoions are listed in the mount(8) man page. Note that - both filesystem-independent and filesystem-specific options + + Support optoions are listed in the mount(8) man page. Note that + both filesystem-independent and filesystem-specific options are listed. ''; }; From 49ef0fd51a366a1256b85c150a47f88ba638aec4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Fri, 7 Aug 2020 16:49:18 +0200 Subject: [PATCH 123/143] rocclr: fix build (no OpenCL library is required) rocclr builds fail since CMake was upgraded to 3.18. This version introduces the REQUIRED option of find_library. However rocclr only needs OpenCL headers. This change makes finding an OpenCL library optional again. --- pkgs/development/libraries/rocclr/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocclr/default.nix b/pkgs/development/libraries/rocclr/default.nix index f1917b8f2c70..6b561b3c9dd5 100644 --- a/pkgs/development/libraries/rocclr/default.nix +++ b/pkgs/development/libraries/rocclr/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake rocm-cmake ]; - buildInputs = [ clang rocm-comgr rocm-runtime rocm-thunk clang ]; + buildInputs = [ clang rocm-comgr rocm-runtime rocm-thunk ]; propagatedBuildInputs = [ libelf libglvnd libX11 ]; @@ -34,7 +34,8 @@ stdenv.mkDerivation rec { --replace 'set(ROCCLR_EXPORTS_FILE "''${CMAKE_CURRENT_BINARY_DIR}/amdrocclr_staticTargets.cmake")' \ 'set(ROCCLR_EXPORTS_FILE "''${CMAKE_INSTALL_LIBDIR}/cmake/amdrocclr_staticTargets.cmake")' \ --replace 'set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ''${CMAKE_CURRENT_BINARY_DIR}/lib)' \ - 'set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ''${CMAKE_INSTALL_LIBDIR})' + 'set (CMAKE_LIBRARY_OUTPUT_DIRECTORY ''${CMAKE_INSTALL_LIBDIR})' \ + --replace 'find_library( OpenCL REQUIRED' 'find_library( OpenCL' substituteInPlace device/comgrctx.cpp \ --replace "libamd_comgr.so" "${rocm-comgr}/lib/libamd_comgr.so" ''; From 3f13e1af0d1874a258b7ec09f7f862e687058719 Mon Sep 17 00:00:00 2001 From: Matt Huszagh Date: Sun, 20 Oct 2019 18:02:10 -0700 Subject: [PATCH 124/143] openmpi: enable C++ bindings --- pkgs/development/libraries/openmpi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 61e3165dd3f8..d6f23a9060ff 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -13,7 +13,6 @@ # Enable libfabric support (necessary for Omnipath networks) on x86_64 linux , fabricSupport ? stdenv.isLinux && stdenv.isx86_64 - }: assert !cudaSupport || cudatoolkit != null; @@ -59,6 +58,7 @@ in stdenv.mkDerivation rec { "--with-libnl=${libnl.dev}" "--with-pmix=${pmix}" "--with-pmix-libdir=${pmix}/lib" + "--enable-mpi-cxx" ] ++ lib.optional enableSGE "--with-sge" ++ lib.optional enablePrefix "--enable-mpirun-prefix-by-default" # TODO: add UCX support, which is recommended to use with cuda for the most robust OpenMPI build From da88c6eee5cb1c8583db1cdc9daef1df85cb5be7 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Fri, 7 Aug 2020 17:58:02 +0200 Subject: [PATCH 125/143] nixos/railcar: fix typo --- nixos/modules/virtualisation/railcar.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/railcar.nix b/nixos/modules/virtualisation/railcar.nix index 527bf8558a91..3f188fc68e55 100644 --- a/nixos/modules/virtualisation/railcar.nix +++ b/nixos/modules/virtualisation/railcar.nix @@ -46,7 +46,7 @@ let description = '' Mount options of the filesystem to be used. - Support optoions are listed in the mount(8) man page. Note that + Support options are listed in the mount(8) man page. Note that both filesystem-independent and filesystem-specific options are listed. ''; From 9bae9409ac3683c97fbec4936df0f412f68e91e6 Mon Sep 17 00:00:00 2001 From: gnidorah Date: Fri, 7 Aug 2020 19:03:39 +0300 Subject: [PATCH 126/143] mame: 0.222 -> 0.223 (#94853) --- pkgs/misc/emulators/mame/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/mame/default.nix b/pkgs/misc/emulators/mame/default.nix index a7bce745984a..ea5e97762265 100644 --- a/pkgs/misc/emulators/mame/default.nix +++ b/pkgs/misc/emulators/mame/default.nix @@ -7,7 +7,7 @@ with stdenv; let majorVersion = "0"; - minorVersion = "222"; + minorVersion = "223"; desktopItem = makeDesktopItem { name = "MAME"; @@ -26,7 +26,7 @@ in mkDerivation { owner = "mamedev"; repo = "mame"; rev = "mame${majorVersion}${minorVersion}"; - sha256 = "1ij08h7cflr76qzyhhj21948275lqkpzi9r4pbc7h2avrlpsijx4"; + sha256 = "1lh5cmz4f6km2d8fn3m9ns7fc4wzbdp71v0s6vjcynycpyhy3yl1"; }; hardeningDisable = [ "fortify" ]; From 2b09ecd1681675c70fa8b1de997de2092762af62 Mon Sep 17 00:00:00 2001 From: Evan Stoll Date: Tue, 28 Jul 2020 17:08:50 -0400 Subject: [PATCH 127/143] pythonPackages.cot: init at 2.2.1 --- .../python-modules/cot/default.nix | 56 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/python-packages.nix | 2 + 3 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/cot/default.nix diff --git a/pkgs/development/python-modules/cot/default.nix b/pkgs/development/python-modules/cot/default.nix new file mode 100644 index 000000000000..8952d79634d7 --- /dev/null +++ b/pkgs/development/python-modules/cot/default.nix @@ -0,0 +1,56 @@ +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, isPy3k +, argcomplete, colorlog, pyvmomi, requests, verboselogs +, psutil, pyopenssl, setuptools +, mock, pytest, pytest-mock, pytestCheckHook, qemu +}: + +buildPythonPackage rec { + pname = "cot"; + version = "2.2.1"; + + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "f4b3553415f90daac656f89d3e82e79b3d751793239bb173a683b4cc0ceb2635"; + }; + + propagatedBuildInputs = [ colorlog pyvmomi requests verboselogs pyopenssl setuptools ] + ++ stdenv.lib.optional (pythonOlder "3.3") psutil; + + checkInputs = [ mock pytestCheckHook pytest-mock qemu ]; + + # Many tests require network access and/or ovftool (https://code.vmware.com/web/tool/ovf) + # try enabling these tests with ovftool once/if it is added to nixpkgs + disabledTests = [ + "HelperGenericTest" + "TestCOTAddDisk" + "TestCOTAddFile" + "TestCOTEditHardware" + "TestCOTEditProduct" + "TestCOTEditProperties" + "TestCOTInjectConfig" + "TestISO" + "TestOVFAPI" + "TestQCOW2" + "TestRAW" + "TestVMDKConversion" + ]; + + + # argparse is part of the standardlib + prePatch = '' + substituteInPlace setup.py --replace "'argparse'," "" + ''; + + meta = with stdenv.lib; { + description = "Common OVF Tool"; + longDescription = '' + COT (the Common OVF Tool) is a tool for editing Open Virtualization Format (.ovf, .ova) virtual appliances, + with a focus on virtualized network appliances such as the Cisco CSR 1000V and Cisco IOS XRv platforms. + ''; + homepage = "https://github.com/glennmatthews/cot"; + license = licenses.mit; + maintainers = with maintainers; [ evanjs ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94204a91d1c2..3614e7b68aa5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1628,6 +1628,8 @@ in compsize = callPackage ../os-specific/linux/compsize { }; + cot = with python3Packages; toPythonApplication cot; + coturn = callPackage ../servers/coturn { }; coursier = callPackage ../development/tools/coursier {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e8869085d277..5e36c715d234 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -631,6 +631,8 @@ in { convertdate = callPackage ../development/python-modules/convertdate { }; + cot = callPackage ../development/python-modules/cot { }; + crc32c = callPackage ../development/python-modules/crc32c { }; curio = callPackage ../development/python-modules/curio { }; From 8af72d55305fe1e0ba8657a2b69fb20ca347fc9a Mon Sep 17 00:00:00 2001 From: notgne2 Date: Thu, 6 Aug 2020 19:01:30 -0700 Subject: [PATCH 128/143] osu-lazer: osu-lazer: 2020.801.0 -> 2020.806.0 --- .../osu-lazer/bypass-tamper-detection.patch | 23 +++++++++++++++++++ pkgs/games/osu-lazer/default.nix | 7 ++++-- pkgs/games/osu-lazer/deps.nix | 4 ++-- 3 files changed, 30 insertions(+), 4 deletions(-) create mode 100644 pkgs/games/osu-lazer/bypass-tamper-detection.patch diff --git a/pkgs/games/osu-lazer/bypass-tamper-detection.patch b/pkgs/games/osu-lazer/bypass-tamper-detection.patch new file mode 100644 index 000000000000..576f83a96c57 --- /dev/null +++ b/pkgs/games/osu-lazer/bypass-tamper-detection.patch @@ -0,0 +1,23 @@ +diff --git a/osu.Game/OsuGameBase.cs b/osu.Game/OsuGameBase.cs +index 98f60d52d..a27ce47ca 100644 +--- a/osu.Game/OsuGameBase.cs ++++ b/osu.Game/OsuGameBase.cs +@@ -135,17 +135,7 @@ public OsuGameBase() + [BackgroundDependencyLoader] + private void load() + { +- try +- { +- using (var str = File.OpenRead(typeof(OsuGameBase).Assembly.Location)) +- VersionHash = str.ComputeMD5Hash(); +- } +- catch +- { +- // special case for android builds, which can't read DLLs from a packed apk. +- // should eventually be handled in a better way. +- VersionHash = $"{Version}-{RuntimeInfo.OS}".ComputeMD5Hash(); +- } ++ VersionHash = "253aa3a3a356a71295bf5b018cd4fda1"; + + Resources.AddStore(new DllResourceStore(OsuResources.ResourceAssembly)); + diff --git a/pkgs/games/osu-lazer/default.nix b/pkgs/games/osu-lazer/default.nix index 81b5e626c8e8..d8197fae1561 100644 --- a/pkgs/games/osu-lazer/default.nix +++ b/pkgs/games/osu-lazer/default.nix @@ -13,15 +13,18 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2020.801.0"; + version = "2020.806.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "02klqc56fskc8r8p3z9d38r1i0rwgglfilb97pdqm1ph8jpr1c20"; + sha256 = "BelmqcDnrGH84fTs6M0krwWz6SHn2hOm7y+PNEOOOZM="; }; + patches = [ ./bypass-tamper-detection.patch ]; + patchFlags = [ "--binary" "-p1" ]; + nativeBuildInputs = [ dotnet-sdk dotnetPackages.Nuget makeWrapper ]; nugetDeps = linkFarmFromDrvs "${pname}-nuget-deps" (import ./deps.nix { diff --git a/pkgs/games/osu-lazer/deps.nix b/pkgs/games/osu-lazer/deps.nix index a7f2214fb5bb..c29035e5724c 100644 --- a/pkgs/games/osu-lazer/deps.nix +++ b/pkgs/games/osu-lazer/deps.nix @@ -586,8 +586,8 @@ }) (fetchNuGet { name = "ppy.osu.Framework"; - version = "2020.730.1"; - sha256 = "0hsrb01rhcpan00bwk9zxzgj1ghsgsmx36g7sd8rlygr3v5sfvmr"; + version = "2020.806.0"; + sha256 = "1d4aprz81xbhk5addl1n7jwj8xxny51s6nvpn37alld0x6n7k8nv"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; From 4efcd73d72ed9909eaa7cbdf1fe57ee3aa9618d8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 6 Aug 2020 23:37:01 -0700 Subject: [PATCH 129/143] azure-cli: pin cryptography --- pkgs/tools/admin/azure-cli/python-packages.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 1f7a0a397429..d76ecc430a8a 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -328,6 +328,19 @@ let ''; }); + cryptography = super.cryptography.overridePythonAttrs(oldAttrs: rec { + version = "2.9.2"; + + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "0af25w5mkd6vwns3r6ai1w5ip9xp0ms9s261zzssbpadzdr05hx0"; + }; + + # prevent cycle with cryptography-vectors + doCheck = false; + }); + knack = super.knack.overridePythonAttrs(oldAttrs: rec { version = "0.7.1"; From ce10e04adff5fd9eac720d1c71ac58d5a5fd6dc8 Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Thu, 30 Jul 2020 16:12:37 -0700 Subject: [PATCH 130/143] cramfsprogs: init at 1.1 Signed-off-by: Pamplemousse --- .../os-specific/linux/cramfsprogs/default.nix | 32 +++++++++++++++++++ .../linux/cramfsprogs/include-sysmacros.patch | 12 +++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 46 insertions(+) create mode 100644 pkgs/os-specific/linux/cramfsprogs/default.nix create mode 100644 pkgs/os-specific/linux/cramfsprogs/include-sysmacros.patch diff --git a/pkgs/os-specific/linux/cramfsprogs/default.nix b/pkgs/os-specific/linux/cramfsprogs/default.nix new file mode 100644 index 000000000000..8633823ab5c5 --- /dev/null +++ b/pkgs/os-specific/linux/cramfsprogs/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, fetchurl +, zlib +}: + +stdenv.mkDerivation rec { + pname = "cramfsprogs"; + version = "1.1"; + + src = fetchurl { + url = "mirror://debian/pool/main/c/cramfs/cramfs_${version}.orig.tar.gz"; + sha256 = "0s13sabykbkbp0pcw8clxddwzxckyq7ywm2ial343ip7qjiaqg0k"; + }; + + # CramFs is unmaintained upstream: https://tracker.debian.org/pkg/cramfs. + # So patch the "missing include" bug ourselves. + patches = [ ./include-sysmacros.patch ]; + + installPhase = '' + install --target $out/bin -D cramfsck mkcramfs + ''; + + buildInputs = [ zlib ]; + + meta = with stdenv.lib; { + description = "Tools to create, check, and extract content of CramFs images"; + homepage = "https://packages.debian.org/jessie/cramfsprogs"; + license = licenses.gpl2; + maintainers = with maintainers; [ pamplemousse ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/os-specific/linux/cramfsprogs/include-sysmacros.patch b/pkgs/os-specific/linux/cramfsprogs/include-sysmacros.patch new file mode 100644 index 000000000000..7c115a66ac90 --- /dev/null +++ b/pkgs/os-specific/linux/cramfsprogs/include-sysmacros.patch @@ -0,0 +1,12 @@ +diff --git a/mkcramfs.c b/mkcramfs.c +index a2ef018959d..bec83c112d1 100644 +--- a/mkcramfs.c ++++ b/mkcramfs.c +@@ -22,6 +22,7 @@ + * If you change the disk format of cramfs, please update fs/cramfs/README. + */ + ++#include + #include + #include + #include diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3614e7b68aa5..072b3218a015 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16963,6 +16963,8 @@ in cryptsetup = callPackage ../os-specific/linux/cryptsetup { }; + cramfsprogs = callPackage ../os-specific/linux/cramfsprogs { }; + cramfsswap = callPackage ../os-specific/linux/cramfsswap { }; crda = callPackage ../os-specific/linux/crda { }; From 07ea06b1430b8b18ecb721dfdc676429746f0810 Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Fri, 31 Jul 2020 09:01:40 -0700 Subject: [PATCH 131/143] cramfsswap: Make binary available Signed-off-by: Pamplemousse --- pkgs/os-specific/linux/cramfsswap/builder.sh | 6 ------ pkgs/os-specific/linux/cramfsswap/default.nix | 15 ++++++++++----- 2 files changed, 10 insertions(+), 11 deletions(-) delete mode 100644 pkgs/os-specific/linux/cramfsswap/builder.sh diff --git a/pkgs/os-specific/linux/cramfsswap/builder.sh b/pkgs/os-specific/linux/cramfsswap/builder.sh deleted file mode 100644 index 51a5b11dda69..000000000000 --- a/pkgs/os-specific/linux/cramfsswap/builder.sh +++ /dev/null @@ -1,6 +0,0 @@ -source $stdenv/setup - -export DESTDIR=$out -mkdir -p $out/usr/bin - -genericBuild diff --git a/pkgs/os-specific/linux/cramfsswap/default.nix b/pkgs/os-specific/linux/cramfsswap/default.nix index eb04761eef47..afb38364c4e6 100644 --- a/pkgs/os-specific/linux/cramfsswap/default.nix +++ b/pkgs/os-specific/linux/cramfsswap/default.nix @@ -1,17 +1,22 @@ {stdenv, fetchurl, zlib}: -stdenv.mkDerivation { - name = "cramfsswap-1.4.1"; - builder = ./builder.sh; +stdenv.mkDerivation rec { + pname = "cramfsswap"; + version = "1.4.1"; + src = fetchurl { - url = "mirror://debian/pool/main/c/cramfsswap/cramfsswap_1.4.1.tar.gz"; + url = "mirror://debian/pool/main/c/cramfsswap/${pname}_${version}.tar.gz"; sha256 = "0c6lbx1inkbcvvhh3y6fvfaq3w7d1zv7psgpjs5f3zjk1jysi9qd"; }; buildInputs = [zlib]; + installPhase = '' + install --target $out/bin -D cramfsswap + ''; + meta = with stdenv.lib; { - description = "swap endianess of a cram filesystem (cramfs)"; + description = "Swap endianess of a cram filesystem (cramfs)"; homepage = "https://packages.debian.org/sid/utils/cramfsswap"; license = licenses.gpl2; platforms = platforms.linux; From 35c702cc40b770e1072cc7e7cb88594f0680dafd Mon Sep 17 00:00:00 2001 From: Pamplemousse Date: Thu, 30 Jul 2020 16:30:44 -0700 Subject: [PATCH 132/143] pythonPackages.binwalk: add dependencies Signed-off-by: Pamplemousse --- pkgs/development/python-modules/binwalk/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index 97c6b957a437..d31113b92147 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -9,6 +9,8 @@ , gnutar , p7zip , cabextract +, cramfsprogs +, cramfsswap , lzma , nose , pycrypto @@ -29,7 +31,7 @@ buildPythonPackage { sha256 = "1bxgj569fzwv6jhcbl864nmlsi9x1k1r20aywjxc8b9b1zgqrlvc"; }; - propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract lzma pycrypto ] + propagatedBuildInputs = [ zlib xz ncompress gzip bzip2 gnutar p7zip cabextract cramfsswap cramfsprogs lzma pycrypto ] ++ stdenv.lib.optional visualizationSupport pyqtgraph; # setup.py only installs version.py during install, not test From e165f4194268ec1ccc634b5b05de6437afd546ad Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 7 Aug 2020 17:26:01 +0200 Subject: [PATCH 133/143] LTS Haskell 16.8 --- .../configuration-hackage2nix.yaml | 44 ++++++++++--------- 1 file changed, 23 insertions(+), 21 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 57c505d0c450..4a737ab1bed0 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -72,7 +72,7 @@ default-package-overrides: # gi-gdkx11-4.x requires gtk-4.x, which is still under development and # not yet available in Nixpkgs - gi-gdkx11 < 4 - # LTS Haskell 16.7 + # LTS Haskell 16.8 - abstract-deque ==0.3 - abstract-par ==0.3.3 - AC-Angle ==1.0 @@ -323,7 +323,7 @@ default-package-overrides: - bins ==0.1.2.0 - bitarray ==0.0.1.1 - bits ==0.5.2 - - bitset-word8 ==0.1.1.1 + - bitset-word8 ==0.1.1.2 - bits-extra ==0.0.2.0 - bitvec ==1.0.3.0 - blake2 ==0.3.0 @@ -439,9 +439,9 @@ default-package-overrides: - cipher-des ==0.0.6 - cipher-rc4 ==0.1.4 - circle-packing ==0.1.0.6 - - clash-ghc ==1.2.3 - - clash-lib ==1.2.3 - - clash-prelude ==1.2.3 + - clash-ghc ==1.2.4 + - clash-lib ==1.2.4 + - clash-prelude ==1.2.4 - classy-prelude ==1.5.0 - classy-prelude-conduit ==1.5.0 - classy-prelude-yesod ==1.5.0 @@ -518,9 +518,9 @@ default-package-overrides: - control-monad-omega ==0.3.2 - convertible ==1.1.1.0 - cookie ==0.4.5 - - core-data ==0.2.1.5 - - core-program ==0.2.4.2 - - core-text ==0.2.3.3 + - core-data ==0.2.1.7 + - core-program ==0.2.4.4 + - core-text ==0.2.3.5 - countable ==1.0 - cpio-conduit ==0.7.0 - cpphs ==1.20.9.1 @@ -787,7 +787,7 @@ default-package-overrides: - file-path-th ==0.1.0.0 - filepattern ==0.1.2 - fileplow ==0.1.0.0 - - filtrable ==0.1.3.0 + - filtrable ==0.1.4.0 - fin ==0.1.1 - FindBin ==0.0.5 - fingertree ==0.1.4.2 @@ -976,6 +976,7 @@ default-package-overrides: - hadoop-streaming ==0.2.0.3 - hakyll ==4.13.4.0 - half ==0.3 + - hall-symbols ==0.1.0.6 - hamtsolo ==1.0.3 - HandsomeSoup ==0.4.2 - hapistrano ==0.4.1.0 @@ -1046,7 +1047,7 @@ default-package-overrides: - hint ==0.9.0.3 - hjsmin ==0.2.0.4 - hkd-default ==1.1.0.0 - - hkgr ==0.2.6 + - hkgr ==0.2.6.1 - hlibcpuid ==0.2.0 - hlibgit2 ==0.18.0.16 - hmatrix ==0.20.0.0 @@ -1144,7 +1145,7 @@ default-package-overrides: - http-link-header ==1.0.3.1 - http-media ==0.8.0.0 - http-reverse-proxy ==0.6.0 - - http-streams ==0.8.7.1 + - http-streams ==0.8.7.2 - http-types ==0.12.3 - human-readable-duration ==0.2.1.4 - HUnit ==1.6.0.0 @@ -1511,7 +1512,7 @@ default-package-overrides: - MusicBrainz ==0.4.1 - mustache ==2.3.1 - mutable-containers ==0.3.4 - - mwc-probability ==2.3.0 + - mwc-probability ==2.3.1 - mwc-random ==0.14.0.0 - mx-state-codes ==1.0.0.0 - mysql ==0.1.7 @@ -1732,11 +1733,11 @@ default-package-overrides: - pretty-class ==1.0.1.1 - pretty-hex ==1.1 - prettyprinter ==1.6.2 - - prettyprinter-ansi-terminal ==1.1.1.2 + - prettyprinter-ansi-terminal ==1.1.2 - prettyprinter-compat-annotated-wl-pprint ==1 - prettyprinter-compat-ansi-wl-pprint ==1.0.1 - prettyprinter-compat-wl-pprint ==1.0.0.1 - - prettyprinter-convert-ansi-wl-pprint ==1.1 + - prettyprinter-convert-ansi-wl-pprint ==1.1.1 - pretty-relative-time ==0.2.0.0 - pretty-show ==1.10 - pretty-simple ==3.2.3.0 @@ -1825,7 +1826,7 @@ default-package-overrides: - rawstring-qm ==0.2.3.0 - raw-strings-qq ==1.1 - rcu ==0.2.4 - - rdf ==0.1.0.3 + - rdf ==0.1.0.4 - rdtsc ==1.3.0.1 - re2 ==0.3 - readable ==0.3.1 @@ -1914,7 +1915,7 @@ default-package-overrides: - salve ==1.0.10 - sample-frame ==0.0.3 - sample-frame-np ==0.0.4.1 - - sampling ==0.3.4 + - sampling ==0.3.5 - say ==0.1.0.1 - sbp ==2.6.3 - scalpel ==0.6.2 @@ -2137,6 +2138,7 @@ default-package-overrides: - syb ==0.7.1 - symbol ==0.2.4 - symengine ==0.1.2.0 + - symmetry-operations-symbols ==0.0.1.4 - sysinfo ==0.1.1 - system-argv0 ==0.1.1 - systemd ==2.3.0 @@ -2231,10 +2233,10 @@ default-package-overrides: - th-nowq ==0.1.0.5 - th-orphans ==0.13.10 - th-printf ==0.7 - - thread-hierarchy ==0.3.0.1 + - thread-hierarchy ==0.3.0.2 - thread-local-storage ==0.2 - threads ==0.5.1.6 - - thread-supervisor ==0.1.0.0 + - thread-supervisor ==0.1.0.1 - threepenny-gui ==0.9.0.0 - th-reify-compat ==0.0.1.5 - th-reify-many ==0.1.9 @@ -2426,9 +2428,9 @@ default-package-overrides: - wave ==0.2.0 - wcwidth ==0.0.2 - webdriver ==0.9.0.1 - - webex-teams-api ==0.2.0.0 - - webex-teams-conduit ==0.2.0.0 - - webex-teams-pipes ==0.2.0.0 + - webex-teams-api ==0.2.0.1 + - webex-teams-conduit ==0.2.0.1 + - webex-teams-pipes ==0.2.0.1 - webrtc-vad ==0.1.0.3 - websockets ==0.12.7.1 - websockets-snap ==0.10.3.1 From 9613e64f67226c2cb5b50c4805edd74eefc1396b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 7 Aug 2020 20:12:27 +0200 Subject: [PATCH 134/143] hackage2nix: update list of broken packages to fix evaluation errors --- .../haskell-modules/configuration-hackage2nix.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 4a737ab1bed0..586415a1db83 100644 --- a/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -3747,6 +3747,7 @@ broken-packages: - chart-histogram - Chart-simple - chart-svg + - chart-svg-various - chart-unit - chatter - chatty-text @@ -7617,6 +7618,7 @@ broken-packages: - mDNSResponder-client - mdp - mealstrom + - mealy - MeanShift - Measure - mecab @@ -8663,6 +8665,8 @@ broken-packages: - postgresql-simple-sop - postgresql-simple-typed - postgresql-syntax + - postgresql-tx-query + - postgresql-tx-squeal - postgresql-typed - postgresql-typed-lifted - postgrest-ws @@ -9336,6 +9340,7 @@ broken-packages: - SCalendar - scalendar - scalp-webhooks + - scalpel-search - scan-vector-machine - scc - scenegraph @@ -10166,6 +10171,7 @@ broken-packages: - taskell - TaskMonad - tasty-auto + - tasty-bdd - tasty-fail-fast - tasty-groundhog-converters - tasty-hedgehog-coverage From 7b3dbe3dd38f55617358c977644f50dae0fcbf82 Mon Sep 17 00:00:00 2001 From: Gabor Greif Date: Sat, 1 Aug 2020 11:17:58 +0200 Subject: [PATCH 135/143] ghc-{8.8.3, 8.8.4, 8.10.1}: fix typos --- pkgs/development/compilers/ghc/8.10.1.nix | 4 ++-- pkgs/development/compilers/ghc/8.8.3.nix | 8 ++++---- pkgs/development/compilers/ghc/8.8.4.nix | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/ghc/8.10.1.nix b/pkgs/development/compilers/ghc/8.10.1.nix index 9da80fa5c207..727fc91451e2 100644 --- a/pkgs/development/compilers/ghc/8.10.1.nix +++ b/pkgs/development/compilers/ghc/8.10.1.nix @@ -24,7 +24,7 @@ enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform # aarch64 outputs otherwise exceed 2GB limit -, enableProfiliedLibs ? !stdenv.targetPlatform.isAarch64 +, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64 , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. @@ -68,7 +68,7 @@ let HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO - '' + stdenv.lib.optionalString (!enableProfiliedLibs) '' + '' + stdenv.lib.optionalString (!enableProfiledLibs) '' GhcLibWays = "v dyn" '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' GhcLibHcOpts += -fPIC diff --git a/pkgs/development/compilers/ghc/8.8.3.nix b/pkgs/development/compilers/ghc/8.8.3.nix index c22327efce36..aa4c378f200b 100644 --- a/pkgs/development/compilers/ghc/8.8.3.nix +++ b/pkgs/development/compilers/ghc/8.8.3.nix @@ -23,6 +23,9 @@ , # If enabled, use -fPIC when compiling static libs. enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform + # aarch64 outputs otherwise exceed 2GB limit +, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64 + , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. enableShared ? !stdenv.targetPlatform.isWindows && !stdenv.targetPlatform.useiOSPrebuilt @@ -30,9 +33,6 @@ , # Whether to build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows - # aarch64 outputs otherwise exceed 2GB limit -, enableProfiliedLibs ? !stdenv.targetPlatform.isAarch64 - , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) @@ -68,7 +68,7 @@ let HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO - '' + stdenv.lib.optionalString (!enableProfiliedLibs) '' + '' + stdenv.lib.optionalString (!enableProfiledLibs) '' GhcLibWays = "v dyn" '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' GhcLibHcOpts += -fPIC diff --git a/pkgs/development/compilers/ghc/8.8.4.nix b/pkgs/development/compilers/ghc/8.8.4.nix index 515ff2d646b8..60c0f2cdd9d1 100644 --- a/pkgs/development/compilers/ghc/8.8.4.nix +++ b/pkgs/development/compilers/ghc/8.8.4.nix @@ -24,7 +24,7 @@ enableRelocatedStaticLibs ? stdenv.targetPlatform != stdenv.hostPlatform # aarch64 outputs otherwise exceed 2GB limit -, enableProfiliedLibs ? !stdenv.targetPlatform.isAarch64 +, enableProfiledLibs ? !stdenv.targetPlatform.isAarch64 , # Whether to build dynamic libs for the standard library (on the target # platform). Static libs are always built. @@ -68,7 +68,7 @@ let HADDOCK_DOCS = NO BUILD_SPHINX_HTML = NO BUILD_SPHINX_PDF = NO - '' + stdenv.lib.optionalString (!enableProfiliedLibs) '' + '' + stdenv.lib.optionalString (!enableProfiledLibs) '' GhcLibWays = "v dyn" '' + stdenv.lib.optionalString enableRelocatedStaticLibs '' GhcLibHcOpts += -fPIC From 81475fabc8546b5874c844c84d5fe1af3e703e9e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 1 Aug 2020 02:30:31 +0200 Subject: [PATCH 136/143] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.15.5-13-g52041eb from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/b1162ac6f1ee3f8b20e868ef387f3d9fdce1796a. --- .../haskell-modules/hackage-packages.nix | 2376 +++++++++++------ 1 file changed, 1530 insertions(+), 846 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 48b675d8dca3..3be168358f01 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -1310,6 +1310,8 @@ self: { pname = "BNFC-meta"; version = "0.6.1"; sha256 = "0snackflcjxza4iqbd85fdsmylwr3bj71nsfrs2s2idc3nlxc7ia"; + revision = "1"; + editedCabalFile = "1lj92qxjf7gbgifhz1p6jw20079x6772gkbhvpd8ba4956dvzna3"; libraryHaskellDepends = [ alex-meta array base fail happy-meta haskell-src-meta syb template-haskell @@ -20586,8 +20588,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.3.5"; - sha256 = "1j8xnb29ad172qjfrnd4mc4v5a4bfd6ka8xadfknb2d5a5d7r5nn"; + version = "0.3.6"; + sha256 = "1zclpawaa1cx1p58asn7lla4lakkr869qnkdvrypxxqki3406hsz"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -23909,31 +23911,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "aeson_1_5_2_0" = callPackage + "aeson_1_5_3_0" = callPackage ({ mkDerivation, attoparsec, base, base-compat , base-compat-batteries, base-orphans, base16-bytestring - , bytestring, containers, deepseq, Diff, directory, dlist, filepath - , generic-deriving, ghc-prim, hashable, hashable-time + , bytestring, containers, data-fix, deepseq, Diff, directory, dlist + , filepath, generic-deriving, ghc-prim, hashable, hashable-time , integer-logarithms, primitive, QuickCheck, quickcheck-instances - , scientific, tagged, tasty, tasty-golden, tasty-hunit + , scientific, strict, tagged, tasty, tasty-golden, tasty-hunit , tasty-quickcheck, template-haskell, text, th-abstraction, these , time, time-compat, unordered-containers, uuid-types, vector }: mkDerivation { pname = "aeson"; - version = "1.5.2.0"; - sha256 = "0awk3dss79mmcxpy147mijnd9icvlnm77bq248ibbbzx9y99hdfd"; + version = "1.5.3.0"; + sha256 = "0slqxmm4rikndzq2rmgydaqgf9qqnni62bgr0zihf25d65mgk3lm"; libraryHaskellDepends = [ - attoparsec base base-compat-batteries bytestring containers deepseq - dlist ghc-prim hashable primitive scientific tagged - template-haskell text th-abstraction these time time-compat - unordered-containers uuid-types vector + attoparsec base base-compat-batteries bytestring containers + data-fix deepseq dlist ghc-prim hashable primitive scientific + strict tagged template-haskell text th-abstraction these time + time-compat unordered-containers uuid-types vector ]; testHaskellDepends = [ attoparsec base base-compat base-orphans base16-bytestring - bytestring containers Diff directory dlist filepath + bytestring containers data-fix Diff directory dlist filepath generic-deriving ghc-prim hashable hashable-time integer-logarithms - QuickCheck quickcheck-instances scientific tagged tasty + QuickCheck quickcheck-instances scientific strict tagged tasty tasty-golden tasty-hunit tasty-quickcheck template-haskell text these time time-compat unordered-containers uuid-types vector ]; @@ -24813,8 +24815,8 @@ self: { }: mkDerivation { pname = "aeson-with"; - version = "0.1.1.1"; - sha256 = "0dfb7ra2gl24vdi5am23rpz7p5mrjig9pxhrb4i7pbqhjlnhhk2g"; + version = "0.1.1.2"; + sha256 = "14sj4zx8g03vb4wdvri41yr3rhilczq4chyy7nl4l2wpk58g246c"; libraryHaskellDepends = [ aeson base hashmap lens lens-aeson mtl scientific text unordered-containers vector @@ -25515,6 +25517,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "alarmclock_0_7_0_5" = callPackage + ({ mkDerivation, async, base, clock, hspec, stm, time + , unbounded-delays + }: + mkDerivation { + pname = "alarmclock"; + version = "0.7.0.5"; + sha256 = "0197phsc4rn5mn155hbmxplxi2ymra1x6lxq16xs6a8zrk4gfkj9"; + libraryHaskellDepends = [ + async base clock stm time unbounded-delays + ]; + testHaskellDepends = [ + async base clock hspec stm time unbounded-delays + ]; + description = "Wake up and perform an action at a certain time"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "alea" = callPackage ({ mkDerivation, base, optparse-applicative, random, text }: mkDerivation { @@ -25585,8 +25606,8 @@ self: { }: mkDerivation { pname = "alex-meta"; - version = "0.3.0.11"; - sha256 = "0pb6m2h9r3j71iy8ch8kgvssblidlr6r7k12fa1q2v7wi5q2mq91"; + version = "0.3.0.12"; + sha256 = "0s0yhkl0ymr50agqnsbscw8926jk4044n6scw086ylhcijx3qmxa"; libraryHaskellDepends = [ array base containers haskell-src-meta QuickCheck template-haskell ]; @@ -29018,9 +29039,7 @@ self: { ]; description = "A simple streamly wrapper for amqp"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {testcontainers = null;}; + }) {}; "amqp-utils" = callPackage ({ mkDerivation, amqp, base, bytestring, connection, containers @@ -30204,6 +30223,18 @@ self: { broken = true; }) {inherit (pkgs) libaosd;}; + "ap-normalize" = callPackage + ({ mkDerivation, base, inspection-testing, transformers }: + mkDerivation { + pname = "ap-normalize"; + version = "0.1.0.0"; + sha256 = "0iqfilamnp0k170af7sw0ydn0cmba7ab06yinkl8vfppf583a4la"; + libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base inspection-testing transformers ]; + description = "Self-normalizing applicative expressions"; + license = stdenv.lib.licenses.mit; + }) {}; + "ap-reflect" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -31235,28 +31266,28 @@ self: { "apply-refact" = callPackage ({ mkDerivation, base, containers, directory, extra, filemanip - , filepath, ghc, ghc-boot-th, ghc-exactprint, mtl - , optparse-applicative, process, refact, silently, syb, tasty - , tasty-expected-failure, tasty-golden, transformers, unix-compat + , filepath, ghc, ghc-boot-th, ghc-exactprint, optparse-applicative + , process, refact, silently, syb, tasty, tasty-expected-failure + , tasty-golden, transformers, unix-compat }: mkDerivation { pname = "apply-refact"; - version = "0.8.2.0"; - sha256 = "0bhf20b5h095d5a6955hk43k7z4ypkiivq755a21y7nc83l8q5x0"; + version = "0.8.2.1"; + sha256 = "12dnwsv37bhla7cnqa3h24mnvdk5199lwd5mf845n1r6xqrh2vvp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base containers directory extra filemanip ghc ghc-exactprint mtl + base containers directory extra filemanip ghc ghc-exactprint process refact syb transformers unix-compat ]; executableHaskellDepends = [ base containers directory extra filemanip filepath ghc ghc-boot-th - ghc-exactprint mtl optparse-applicative process refact syb - transformers unix-compat + ghc-exactprint optparse-applicative process refact syb transformers + unix-compat ]; testHaskellDepends = [ base containers directory extra filemanip filepath ghc ghc-boot-th - ghc-exactprint mtl optparse-applicative process refact silently syb + ghc-exactprint optparse-applicative process refact silently syb tasty tasty-expected-failure tasty-golden transformers unix-compat ]; description = "Perform refactorings specified by the refact library"; @@ -31674,6 +31705,8 @@ self: { pname = "archive-libarchive"; version = "1.0.0.0"; sha256 = "0pqq76gnk6y71c5wwjhq99y2695v6bfyzjb8gakp6h3jivcpd2gb"; + revision = "1"; + editedCabalFile = "12wq8nisyr2i1861v2377llha63nqpiys9vk6dvg9rfz7f6qqdch"; libraryHaskellDepends = [ base bytestring composition-prelude libarchive ]; @@ -33910,8 +33943,8 @@ self: { }: mkDerivation { pname = "atom-conduit"; - version = "0.8.0.0"; - sha256 = "0vakq72n9q6hk6ysl64qcyrrya2gp2l3s97n3vggwv84p167xqwd"; + version = "0.9.0.0"; + sha256 = "0kjdw3x5jsa5hjb36zq93xyp3ac1s4j5vpb52969hckcghmyrabm"; libraryHaskellDepends = [ base-noprelude blaze-builder conduit microlens microlens-th parsers prettyprinter refined relude safe-exceptions text time timerep @@ -35343,8 +35376,8 @@ self: { }: mkDerivation { pname = "avwx"; - version = "0.3.0.2"; - sha256 = "02pvh2i1f96k3pyrmdb3jv2ia7mcp8q5pw067psr8k2sw329qadl"; + version = "0.3.0.3"; + sha256 = "1yvyyvfgga5gpf6bw5wkaxzwqvvvlzbqlq217h454gzlsm8vlv52"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ attoparsec base HTTP lens parsers text ]; @@ -35808,8 +35841,8 @@ self: { }: mkDerivation { pname = "aws-lambda-haskell-runtime"; - version = "3.0.2"; - sha256 = "18gdr7jmaq7csh5c27aam5cbyydw9d0bzv9frnck3ggpfqjnb84i"; + version = "3.0.3"; + sha256 = "0dxzdc4ixl33njind48g014rfk6wxyg0pdcwiarn4vgb30h6h4kq"; libraryHaskellDepends = [ aeson base bytestring case-insensitive http-client http-types path path-io safe-exceptions-checked template-haskell text @@ -35827,8 +35860,8 @@ self: { }: mkDerivation { pname = "aws-lambda-haskell-runtime-wai"; - version = "1.0.1"; - sha256 = "0kzk5nnya39k2h0nn321qg16ss1h6yvymy7r77cbrk015572yck9"; + version = "1.0.2"; + sha256 = "0bjqrwl2kcnxv8yni2bxaz5x3pgs3j6c4rrgqpv5kfs7yn1ins7w"; libraryHaskellDepends = [ aeson aws-lambda-haskell-runtime base binary bytestring case-insensitive http-types iproute network text @@ -36903,6 +36936,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "bank-holidays-england_0_2_0_5" = callPackage + ({ mkDerivation, base, containers, hspec, QuickCheck, time }: + mkDerivation { + pname = "bank-holidays-england"; + version = "0.2.0.5"; + sha256 = "0n7q9s1vsmh5adkhpgycz8y6q49xqf77fpmm73cw0iqgjly4x9hp"; + libraryHaskellDepends = [ base containers time ]; + testHaskellDepends = [ base containers hspec QuickCheck time ]; + description = "Calculation of bank holidays in England and Wales"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "banwords" = callPackage ({ mkDerivation, attoparsec, base, bytestring, data-default, HUnit , test-framework, test-framework-hunit, text, vector @@ -42067,28 +42113,6 @@ self: { }) {inherit (pkgs) gmp;}; "bitset-word8" = callPackage - ({ mkDerivation, base, bytestring, containers, criterion, deepseq - , hspec, QuickCheck, template-haskell, th-lift-instances, vector - }: - mkDerivation { - pname = "bitset-word8"; - version = "0.1.1.1"; - sha256 = "1pjjpqfqjnylfs5npnh7w75h9xk5gpkwzaqx0a972wa9h18gih7z"; - libraryHaskellDepends = [ - base containers template-haskell th-lift-instances - ]; - testHaskellDepends = [ - base containers hspec QuickCheck template-haskell th-lift-instances - ]; - benchmarkHaskellDepends = [ - base bytestring containers criterion deepseq template-haskell - th-lift-instances vector - ]; - description = "Space efficient set of Word8 and some pre-canned sets useful for parsing HTTP"; - license = stdenv.lib.licenses.mit; - }) {}; - - "bitset-word8_0_1_1_2" = callPackage ({ mkDerivation, base, bytestring, containers, criterion, deepseq , hspec, hspec-discover, QuickCheck, template-haskell , th-lift-instances, vector @@ -42110,7 +42134,6 @@ self: { ]; description = "Space efficient set of Word8 and some pre-canned sets useful for parsing HTTP"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "bitspeak" = callPackage @@ -43331,6 +43354,32 @@ self: { broken = true; }) {}; + "bludigon" = callPackage + ({ mkDerivation, base, containers, data-default, deepseq, directory + , filepath, finite-typelits, hspec, libX11, libXrandr, lifted-base + , monad-control, mtl, process, QuickCheck, text, time, transformers + , transformers-base, unix, X11 + }: + mkDerivation { + pname = "bludigon"; + version = "0.1.0.1"; + sha256 = "1c0a6a6ir09vxdjv6nx94c73q381c1wbyf4s7p13cah2zh0y4gw4"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers data-default deepseq directory filepath + finite-typelits lifted-base monad-control mtl process text time + transformers transformers-base unix X11 + ]; + librarySystemDepends = [ libX11 libXrandr ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base data-default deepseq hspec mtl QuickCheck time + ]; + description = "Configurable blue light filter"; + license = stdenv.lib.licenses.bsd3; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXrandr;}; + "bluemix-sdk" = callPackage ({ mkDerivation, aeson, base, bytestring, http-client, http-types , text, vector @@ -44347,25 +44396,23 @@ self: { "box" = callPackage ({ mkDerivation, attoparsec, base, comonad, concurrency - , contravariant, dejafu, doctest, exceptions, foldl, generic-lens - , lens, mmorph, mtl, numhask, optparse-generic, profunctors, random - , streaming, text, time, transformers, transformers-base - , websockets + , contravariant, dejafu, doctest, exceptions, generic-lens, lens + , mmorph, mtl, numhask, optparse-generic, profunctors, random, text + , time, transformers, transformers-base, websockets }: mkDerivation { pname = "box"; - version = "0.5.0"; - sha256 = "1r3jcnrdjyn894y574fjymrpfrpbwgrfmmvxgbkpa0m1ny8j3nln"; + version = "0.6.0"; + sha256 = "0kv3j0fh2ahn4x2lgpghhkrbw5y1cy5mdlrriycqv4slrdzaqyks"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base comonad concurrency contravariant exceptions foldl - lens mmorph numhask profunctors streaming text time transformers - transformers-base + attoparsec base comonad concurrency contravariant exceptions lens + mmorph numhask profunctors text time transformers transformers-base ]; executableHaskellDepends = [ base concurrency dejafu exceptions generic-lens lens mtl numhask - optparse-generic random streaming text transformers websockets + optparse-generic random text transformers websockets ]; testHaskellDepends = [ base doctest numhask ]; description = "boxes"; @@ -44375,16 +44422,15 @@ self: { }) {}; "box-csv" = callPackage - ({ mkDerivation, attoparsec, base, box, doctest, foldl - , generic-lens, lens, numhask, scientific, text, time + ({ mkDerivation, attoparsec, base, box, doctest, generic-lens, lens + , numhask, scientific, text, time }: mkDerivation { pname = "box-csv"; - version = "0.0.1"; - sha256 = "1vyqrc527d4xfv55qw6d0arpsrac3jfzsymh8fqi33s592fnz61d"; + version = "0.0.2"; + sha256 = "09qmxd9mxyag6zx8y5yv7bphycbs35zfkkf7kvkdmjqdk7l7b0fd"; libraryHaskellDepends = [ - attoparsec base box foldl generic-lens lens numhask scientific text - time + attoparsec base box generic-lens lens numhask scientific text time ]; testHaskellDepends = [ base doctest numhask ]; description = "See readme.md"; @@ -44399,8 +44445,8 @@ self: { }: mkDerivation { pname = "box-socket"; - version = "0.0.1"; - sha256 = "1r9ghvhizm468mw3bfwjwrdncggswjvl4hq7pwfxl5c8rp6va74q"; + version = "0.0.2"; + sha256 = "0wf7smpzczqm0yqnphmp46bgm67nyhj0swn0vxhdgb8z0362szsp"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -45637,6 +45683,26 @@ self: { broken = true; }) {}; + "bugzilla-redhat" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, connection + , containers, http-conduit, http-types, iso8601-time, resourcet + , text, time, transformers, unordered-containers, vector + }: + mkDerivation { + pname = "bugzilla-redhat"; + version = "0.3.0"; + sha256 = "1d751f1219ivx9bfdl7xb89w2vns07ciqp4cqcykixnllx2jx18y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring connection containers + http-conduit http-types iso8601-time resourcet text time + transformers unordered-containers vector + ]; + description = "A Haskell interface to the Bugzilla native REST API"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "build" = callPackage ({ mkDerivation, algebraic-graphs, base, containers, extra , filepath, mtl, random, transformers @@ -45896,8 +45962,8 @@ self: { }: mkDerivation { pname = "burrito"; - version = "1.1.0.1"; - sha256 = "197lchafv56g8kcxzfgdgkcygi5f8bddxqzhbsvb8c0gwlv7g270"; + version = "1.1.0.2"; + sha256 = "1k625j5syyiq66i88zy6q0mvwkjl5jsj79sxdmd1rbam3m39whx1"; libraryHaskellDepends = [ base bytestring containers parsec template-haskell text transformers @@ -46436,21 +46502,13 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "bytestring_0_10_10_1" = callPackage - ({ mkDerivation, base, byteorder, deepseq, directory, dlist - , ghc-prim, HUnit, integer-gmp, mtl, QuickCheck, random - , test-framework, test-framework-hunit, test-framework-quickcheck2 - }: + "bytestring_0_10_12_0" = callPackage + ({ mkDerivation, base, deepseq, ghc-prim, integer-gmp }: mkDerivation { pname = "bytestring"; - version = "0.10.10.1"; - sha256 = "1imcy8yw5jag91qncvi1s9n0lldmf2pjkja6qq4mfqyh02f7arvq"; + version = "0.10.12.0"; + sha256 = "1s1kgnqb8ybz223sf2838mmxnlhwsd3lnakng6ap38m058bzzj7d"; libraryHaskellDepends = [ base deepseq ghc-prim integer-gmp ]; - testHaskellDepends = [ - base byteorder deepseq directory dlist ghc-prim HUnit mtl - QuickCheck random test-framework test-framework-hunit - test-framework-quickcheck2 - ]; description = "Fast, compact, strict and lazy byte strings with a list interface"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -47535,6 +47593,31 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "cabal-debian_5_1" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bifunctors, Cabal + , containers, data-default, debian, deepseq, Diff, directory + , exceptions, filepath, hsemail, HUnit, lens, mtl, network-uri + , newtype-generics, optparse-applicative, parsec, pretty, process + , pureMD5, regex-tdfa, syb, text, unix, unliftio, utf8-string + }: + mkDerivation { + pname = "cabal-debian"; + version = "5.1"; + sha256 = "14kh2s61m7wm9h0ms4dlpfvqr2gd8fv0w44ar3c3dg5053hwrvny"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + ansi-wl-pprint base bifunctors Cabal containers data-default debian + deepseq Diff directory exceptions filepath hsemail HUnit lens mtl + network-uri newtype-generics optparse-applicative parsec pretty + process pureMD5 regex-tdfa syb text unix unliftio utf8-string + ]; + executableHaskellDepends = [ base Cabal debian lens mtl pretty ]; + description = "Create a Debianization for a Cabal package"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "cabal-dependency-licenses" = callPackage ({ mkDerivation, base, Cabal, containers, directory, filepath }: mkDerivation { @@ -47597,8 +47680,8 @@ self: { pname = "cabal-doctest"; version = "1.0.8"; sha256 = "03if74imlhhk7m56nci5f1wclniwqdmwl4hl177040j1gnlac9i0"; - revision = "1"; - editedCabalFile = "0z0r7h2y5six2zgfylcwr9g4j78qph35zqglk9lz4za1klvgdprl"; + revision = "2"; + editedCabalFile = "05v1awad3d1wvc763xcgvxm4n6n7bs7byc6s14kdbw35zcaddlcb"; libraryHaskellDepends = [ base Cabal directory filepath ]; description = "A Setup.hs helper for doctests running"; license = stdenv.lib.licenses.bsd3; @@ -48789,6 +48872,22 @@ self: { broken = true; }) {}; + "caerbannog" = callPackage + ({ mkDerivation, base, binary, bytestring, hspec, QuickCheck + , random + }: + mkDerivation { + pname = "caerbannog"; + version = "0.6.0.3"; + sha256 = "0mv10cc50365kz2ad36wivvhcyl43bwxjp71f0n9vq2ndrmb4dna"; + libraryHaskellDepends = [ base binary bytestring ]; + testHaskellDepends = [ + base binary bytestring hspec QuickCheck random + ]; + description = "That rabbit's got a vicious streak a mile wide!"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "caf" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -52125,20 +52224,19 @@ self: { "chart-svg" = callPackage ({ mkDerivation, attoparsec, base, Color, containers, doctest - , foldl, generic-lens, lens, lucid, numhask, numhask-space - , pretty-simple, scientific, tagsoup, text, time, transformers + , generic-lens, lens, lucid, numhask, numhask-space, pretty-simple + , scientific, tagsoup, text, time, transformers , unordered-containers, web-rep }: mkDerivation { pname = "chart-svg"; - version = "0.1.1"; - sha256 = "0k3z2950dv5cj5mzxkipfkav44jckv60xj0b9zlli8xnj1gzrx58"; + version = "0.1.3"; + sha256 = "0b3hpxm7xjw8pjhpcla46jdsjhqxxb3ga0jmmj97wn6w971yphi1"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base Color foldl generic-lens lens lucid numhask - numhask-space pretty-simple scientific tagsoup text time - transformers web-rep + attoparsec base Color generic-lens lens lucid numhask numhask-space + pretty-simple scientific tagsoup text time transformers web-rep ]; executableHaskellDepends = [ base containers generic-lens lens lucid numhask numhask-space text @@ -52151,6 +52249,31 @@ self: { broken = true; }) {}; + "chart-svg-various" = callPackage + ({ mkDerivation, base, box, box-csv, box-socket, chart-svg + , concurrency, doctest, foldl, lens, lucid, mealy, numhask + , numhask-array, numhask-space, text, time, transformers + , unordered-containers, web-rep + }: + mkDerivation { + pname = "chart-svg-various"; + version = "0.0.1"; + sha256 = "0ajmm6xhzxay715c4zds6lcjnhp8l9qf78rzhymd4hc6vz9v0pi1"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base box box-csv box-socket chart-svg concurrency foldl lens lucid + mealy numhask numhask-array numhask-space text time transformers + unordered-containers web-rep + ]; + executableHaskellDepends = [ base numhask ]; + testHaskellDepends = [ base doctest numhask ]; + description = "See readme.md"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "chart-unit" = callPackage ({ mkDerivation, base, colour, data-default, diagrams-lib , diagrams-svg, doctest, foldl, formatting, generic-lens, lens @@ -53972,34 +54095,6 @@ self: { }) {}; "clash-ghc" = callPackage - ({ mkDerivation, array, base, bifunctors, bytestring, Cabal - , clash-lib, clash-prelude, concurrent-supply, containers, deepseq - , directory, filepath, ghc, ghc-boot, ghc-prim, ghc-typelits-extra - , ghc-typelits-knownnat, ghc-typelits-natnormalise, ghci, hashable - , haskeline, integer-gmp, lens, mtl, primitive, process, reflection - , split, template-haskell, text, time, transformers, uniplate, unix - , unordered-containers, utf8-string, vector - }: - mkDerivation { - pname = "clash-ghc"; - version = "1.2.3"; - sha256 = "1ifd8skqbgqcsclm5sxaikc25gwv5da5dv64kjy23r45sxlv11by"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - array base bifunctors bytestring Cabal clash-lib clash-prelude - concurrent-supply containers deepseq directory filepath ghc - ghc-boot ghc-prim ghc-typelits-extra ghc-typelits-knownnat - ghc-typelits-natnormalise ghci hashable haskeline integer-gmp lens - mtl primitive process reflection split template-haskell text time - transformers uniplate unix unordered-containers utf8-string vector - ]; - executableHaskellDepends = [ base ]; - description = "CAES Language for Synchronous Hardware"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "clash-ghc_1_2_4" = callPackage ({ mkDerivation, array, base, bifunctors, bytestring, Cabal , clash-lib, clash-prelude, concurrent-supply, containers, deepseq , directory, filepath, ghc, ghc-boot, ghc-prim, ghc-typelits-extra @@ -54025,46 +54120,9 @@ self: { executableHaskellDepends = [ base ]; description = "CAES Language for Synchronous Hardware"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-lib" = callPackage - ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, binary - , bytestring, clash-prelude, concurrent-supply, containers - , data-binary-ieee754, data-default, deepseq, directory, dlist - , errors, exceptions, extra, filepath, ghc, ghc-boot-th - , ghc-typelits-knownnat, hashable, haskell-src-exts - , haskell-src-meta, hint, integer-gmp, interpolate, lens, mtl - , ordered-containers, parsers, prettyprinter, primitive, process - , reducers, tasty, tasty-hunit, template-haskell, temporary - , terminal-size, text, text-show, time, transformers, trifecta - , unordered-containers, vector, vector-binary-instances - }: - mkDerivation { - pname = "clash-lib"; - version = "1.2.3"; - sha256 = "0cxhw8wgzvpmg7kfyjf9ys38n98vynndr1fn1pzyc03s4mn2rszm"; - enableSeparateDataOutput = true; - libraryHaskellDepends = [ - aeson ansi-terminal attoparsec base binary bytestring clash-prelude - concurrent-supply containers data-binary-ieee754 data-default - deepseq directory dlist errors exceptions extra filepath ghc - ghc-boot-th hashable haskell-src-meta hint integer-gmp interpolate - lens mtl ordered-containers parsers prettyprinter primitive process - reducers template-haskell temporary terminal-size text text-show - time transformers trifecta unordered-containers vector - vector-binary-instances - ]; - testHaskellDepends = [ - base clash-prelude concurrent-supply containers data-default - deepseq ghc ghc-typelits-knownnat haskell-src-exts lens tasty - tasty-hunit template-haskell text transformers unordered-containers - ]; - description = "CAES Language for Synchronous Hardware - As a Library"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "clash-lib_1_2_4" = callPackage ({ mkDerivation, aeson, ansi-terminal, attoparsec, base, binary , bytestring, clash-prelude, concurrent-supply, containers , data-binary-ieee754, data-default, deepseq, directory, dlist @@ -54099,7 +54157,6 @@ self: { ]; description = "CAES Language for Synchronous Hardware - As a Library"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-multisignal" = callPackage @@ -54119,43 +54176,6 @@ self: { }) {}; "clash-prelude" = callPackage - ({ mkDerivation, array, base, bifunctors, binary, bytestring, Cabal - , cabal-doctest, constraints, containers, criterion - , data-binary-ieee754, data-default-class, deepseq, doctest - , ghc-prim, ghc-typelits-extra, ghc-typelits-knownnat - , ghc-typelits-natnormalise, half, hashable, hint, integer-gmp - , interpolate, lens, QuickCheck, quickcheck-classes-base - , recursion-schemes, reflection, singletons, tasty, tasty-hunit - , tasty-quickcheck, template-haskell, text, text-show - , th-abstraction, th-lift, th-orphans, time, transformers - , type-errors, uniplate, vector - }: - mkDerivation { - pname = "clash-prelude"; - version = "1.2.3"; - sha256 = "0k3xariqr314c9s53jcf1w6azivcdrq0lnnsbj889453ys0sw9jg"; - setupHaskellDepends = [ base Cabal cabal-doctest ]; - libraryHaskellDepends = [ - array base bifunctors binary bytestring constraints containers - data-binary-ieee754 data-default-class deepseq ghc-prim - ghc-typelits-extra ghc-typelits-knownnat ghc-typelits-natnormalise - half hashable integer-gmp interpolate lens QuickCheck - recursion-schemes reflection singletons template-haskell text - text-show th-abstraction th-lift th-orphans time transformers - type-errors uniplate vector - ]; - testHaskellDepends = [ - base doctest ghc-typelits-knownnat hint quickcheck-classes-base - tasty tasty-hunit tasty-quickcheck template-haskell - ]; - benchmarkHaskellDepends = [ - base criterion deepseq template-haskell - ]; - description = "CAES Language for Synchronous Hardware - Prelude library"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "clash-prelude_1_2_4" = callPackage ({ mkDerivation, array, base, bifunctors, binary, bytestring, Cabal , cabal-doctest, constraints, containers, criterion , data-binary-ieee754, data-default-class, deepseq, doctest @@ -54190,7 +54210,6 @@ self: { ]; description = "CAES Language for Synchronous Hardware - Prelude library"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "clash-prelude-quickcheck" = callPackage @@ -57617,8 +57636,8 @@ self: { }: mkDerivation { pname = "commonmark"; - version = "0.1.0.1"; - sha256 = "1p5z52n795ncrx94q9v1kyw3y1fqdi6vdz5iyg6n9pis7raqiy0i"; + version = "0.1.0.2"; + sha256 = "00rqy02pn4gg0wpwvxyqxvzqg75lvb1qawn4m8rnjq6v43c4g23l"; libraryHaskellDepends = [ base bytestring containers parsec text transformers ]; @@ -62276,8 +62295,8 @@ self: { }: mkDerivation { pname = "core-data"; - version = "0.2.1.5"; - sha256 = "17lvpbyrr9wm93qprk45n5gf3f6k47f9wf7ays0bfk0hx23chc1n"; + version = "0.2.1.7"; + sha256 = "19fcbp6ccwggpv1lm1z03m3innk9agiwbz03whiivr3zg2gzcglh"; libraryHaskellDepends = [ aeson base bytestring containers core-text hashable prettyprinter prettyprinter-ansi-terminal scientific text unordered-containers @@ -62287,15 +62306,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "core-data_0_2_1_7" = callPackage + "core-data_0_2_1_8" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, core-text , hashable, prettyprinter, prettyprinter-ansi-terminal, scientific , text, unordered-containers, vector }: mkDerivation { pname = "core-data"; - version = "0.2.1.7"; - sha256 = "19fcbp6ccwggpv1lm1z03m3innk9agiwbz03whiivr3zg2gzcglh"; + version = "0.2.1.8"; + sha256 = "1hgvvkk3m3ykdndmf2hbm59v0pim68jwgl2a6n5hw1dv4xwd3fay"; libraryHaskellDepends = [ aeson base bytestring containers core-text hashable prettyprinter prettyprinter-ansi-terminal scientific text unordered-containers @@ -62332,8 +62351,8 @@ self: { }: mkDerivation { pname = "core-program"; - version = "0.2.4.2"; - sha256 = "0zs62mn87fdrjwi1dp11hkr7nbb7v3ikxk1ph6cnjdk0di9hrr6a"; + version = "0.2.4.4"; + sha256 = "1mkhwfw4h5q2dly1gm082k3s9jsq2wb0xksfa6xv8ghvxpvypvck"; libraryHaskellDepends = [ async base bytestring chronologique core-data core-text directory exceptions filepath fsnotify hashable hourglass mtl prettyprinter @@ -62344,7 +62363,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "core-program_0_2_4_4" = callPackage + "core-program_0_2_4_5" = callPackage ({ mkDerivation, async, base, bytestring, chronologique, core-data , core-text, directory, exceptions, filepath, fsnotify, hashable , hourglass, mtl, prettyprinter, prettyprinter-ansi-terminal @@ -62353,8 +62372,8 @@ self: { }: mkDerivation { pname = "core-program"; - version = "0.2.4.4"; - sha256 = "1mkhwfw4h5q2dly1gm082k3s9jsq2wb0xksfa6xv8ghvxpvypvck"; + version = "0.2.4.5"; + sha256 = "1a2zjdywmgniwcj649f43hri55bh30vz2s00r3yqj3gvhhighi86"; libraryHaskellDepends = [ async base bytestring chronologique core-data core-text directory exceptions filepath fsnotify hashable hourglass mtl prettyprinter @@ -62373,8 +62392,8 @@ self: { }: mkDerivation { pname = "core-text"; - version = "0.2.3.3"; - sha256 = "0bnbl34fzy497a8ljgcydp490j3684yw8r32jijqyix7y9q2cl2d"; + version = "0.2.3.5"; + sha256 = "085w21vh5rgl1pc7731ih47gh8gszjj0xfgkr3acy0r9rbh33m9c"; libraryHaskellDepends = [ base bytestring deepseq fingertree hashable prettyprinter prettyprinter-ansi-terminal template-haskell text text-short @@ -62383,15 +62402,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "core-text_0_2_3_5" = callPackage + "core-text_0_2_3_6" = callPackage ({ mkDerivation, base, bytestring, deepseq, fingertree, hashable , prettyprinter, prettyprinter-ansi-terminal, template-haskell , text, text-short }: mkDerivation { pname = "core-text"; - version = "0.2.3.5"; - sha256 = "085w21vh5rgl1pc7731ih47gh8gszjj0xfgkr3acy0r9rbh33m9c"; + version = "0.2.3.6"; + sha256 = "13sdgym8xhljpc465bq1h066mrcvk77568viklhib255skjl56gn"; libraryHaskellDepends = [ base bytestring deepseq fingertree hashable prettyprinter prettyprinter-ansi-terminal template-haskell text text-short @@ -64992,8 +65011,8 @@ self: { }: mkDerivation { pname = "csound-expression"; - version = "5.3.2"; - sha256 = "1v3ssy2rfgwz9wwv8kmaifyrphyl5w66p9zmrg1bi0vbzwxnr57q"; + version = "5.3.3"; + sha256 = "0g6djh3ijvka6hkw4nhb7vhhyl4i268rdxvnwmm6ayg6a8kg8p0g"; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic csound-expression-opcodes csound-expression-typed data-default @@ -65005,15 +65024,16 @@ self: { "csound-expression-dynamic" = callPackage ({ mkDerivation, array, base, Boolean, containers, data-default - , data-fix, data-fix-cse, hashable, transformers, wl-pprint + , data-fix, data-fix-cse, deriving-compat, hashable, transformers + , wl-pprint }: mkDerivation { pname = "csound-expression-dynamic"; - version = "0.3.3"; - sha256 = "0k4pk96cx2f6rhz18mrdkkz7ic2fdzpqkxf1x596990az7pjg7g3"; + version = "0.3.5"; + sha256 = "07xykqpym48bvvs7sa0m12psahsn7z245cd89akv9flkgwjwaa29"; libraryHaskellDepends = [ array base Boolean containers data-default data-fix data-fix-cse - hashable transformers wl-pprint + deriving-compat hashable transformers wl-pprint ]; description = "dynamic core for csound-expression library"; license = stdenv.lib.licenses.bsd3; @@ -65042,8 +65062,8 @@ self: { }: mkDerivation { pname = "csound-expression-typed"; - version = "0.2.2.0"; - sha256 = "19cplqpyd7vhn28z0k8mxmscja05w9xb8q4bbvq5qd0h8liqxsqg"; + version = "0.2.3.1"; + sha256 = "02zd41sz1y8qfchdyhgiddi6s1p5081nr5haq04qdmbz5bgpdmbq"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base Boolean colour containers csound-expression-dynamic @@ -65479,11 +65499,12 @@ self: { }: mkDerivation { pname = "cuckoo"; - version = "0.2.0.1"; - sha256 = "1q070hzrsm0f1lfxnsk4jmmb9pay98522k2lqncvzg09fm2a687j"; + version = "0.2.1"; + sha256 = "1bv39vfg0yzancyya1cdbrcdc0gasp0djcc9ryiwrc3kf9y0nbzn"; libraryHaskellDepends = [ base memory primitive random vector ]; testHaskellDepends = [ - base bytestring cryptonite doctest hashable memory stopwatch + base bytestring cryptonite doctest hashable memory primitive + stopwatch ]; benchmarkHaskellDepends = [ base bytestring criterion memory QuickCheck stopwatch @@ -66051,31 +66072,35 @@ self: { "cut-the-crap" = callPackage ({ mkDerivation, base, exceptions, generic-lens, hspec, hspec-core - , lens, optparse-applicative, regex-tdfa, shelly, system-filepath - , temporary, text, unliftio-core + , lens, optparse-applicative, pocketsphinx, QuickCheck + , quickcheck-classes, regex-tdfa, shelly, sphinxbase + , system-filepath, temporary, text, time, unliftio-core }: mkDerivation { pname = "cut-the-crap"; - version = "1.3.0"; - sha256 = "1pvqz44panx6xp0zw2wip0hz66gsjz569d0n6gayr4sj8scskasp"; + version = "1.4.0"; + sha256 = "03xip8a9inqir8zm244ffv92ag5r7z8hlh0qz7z4vfdmg54mhhnq"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base exceptions generic-lens lens optparse-applicative regex-tdfa - shelly system-filepath temporary text unliftio-core + shelly system-filepath temporary text time unliftio-core ]; + libraryPkgconfigDepends = [ pocketsphinx sphinxbase ]; executableHaskellDepends = [ base exceptions generic-lens lens optparse-applicative regex-tdfa - shelly system-filepath temporary text unliftio-core + shelly system-filepath temporary text time unliftio-core ]; + executablePkgconfigDepends = [ pocketsphinx sphinxbase ]; testHaskellDepends = [ base exceptions generic-lens hspec hspec-core lens - optparse-applicative regex-tdfa shelly system-filepath temporary - text unliftio-core + optparse-applicative QuickCheck quickcheck-classes regex-tdfa + shelly system-filepath temporary text time unliftio-core ]; + testPkgconfigDepends = [ pocketsphinx sphinxbase ]; description = "Cuts out uninteresting parts of videos by detecting silences"; license = stdenv.lib.licenses.mit; - }) {}; + }) {inherit (pkgs) pocketsphinx; inherit (pkgs) sphinxbase;}; "cutter" = callPackage ({ mkDerivation, base, bytestring, explicit-exception, spreadsheet @@ -67645,8 +67670,8 @@ self: { ({ mkDerivation, base, containers, data-fix, transformers }: mkDerivation { pname = "data-fix-cse"; - version = "0.0.2"; - sha256 = "1xn6qnir5dss23y8d71dsy78sdk7hczwprxir8v6la15c43rf9p2"; + version = "0.0.3"; + sha256 = "1v8ffi5c0sz8q2fla6fab4css3pkjmi0knx5d04mvffhw66bjhbz"; libraryHaskellDepends = [ base containers data-fix transformers ]; description = "Common subexpression elimination for the fixploint types"; license = stdenv.lib.licenses.bsd3; @@ -71900,14 +71925,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall_1_33_1" = callPackage + "dhall_1_34_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, atomic-write , base, bytestring, case-insensitive, cborg, cborg-json, containers , contravariant, cryptonite, data-fix, deepseq, Diff, directory , doctest, dotgen, either, exceptions, filepath, foldl, gauge , generic-random, half, hashable, haskeline, http-client , http-client-tls, http-types, lens-family-core, megaparsec, memory - , mockery, mtl, network-uri, optparse-applicative + , mmorph, mockery, mtl, network-uri, optparse-applicative , parser-combinators, parsers, pretty-simple, prettyprinter , prettyprinter-ansi-terminal, profunctors, QuickCheck , quickcheck-instances, repline, scientific, semigroups, serialise @@ -71918,21 +71943,20 @@ self: { }: mkDerivation { pname = "dhall"; - version = "1.33.1"; - sha256 = "17l6qh5zhy0gnxw0x5v4c6n00dmgk279lfyi65n2hsbpaspw7h2k"; - revision = "2"; - editedCabalFile = "0hxk6ay7kqfi8kwni8hdca4q8qm30xdhfwdgxbl360s3ngps7jg0"; + version = "1.34.0"; + sha256 = "0rqvzvcqbhs9gvga7api6jjblnypm4a33z8kxi578ps63mhn3g0d"; isLibrary = true; isExecutable = true; + enableSeparateDataOutput = true; libraryHaskellDepends = [ aeson aeson-pretty ansi-terminal atomic-write base bytestring case-insensitive cborg cborg-json containers contravariant cryptonite data-fix deepseq Diff directory dotgen either exceptions filepath half hashable haskeline http-client http-client-tls - http-types lens-family-core megaparsec memory mtl network-uri - optparse-applicative parser-combinators parsers pretty-simple - prettyprinter prettyprinter-ansi-terminal profunctors repline - scientific serialise template-haskell text text-manipulate + http-types lens-family-core megaparsec memory mmorph mtl + network-uri optparse-applicative parser-combinators parsers + pretty-simple prettyprinter prettyprinter-ansi-terminal profunctors + repline scientific serialise template-haskell text text-manipulate th-lift-instances transformers transformers-compat unordered-containers uri-encode vector ]; @@ -71978,14 +72002,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-bash_1_0_31" = callPackage + "dhall-bash_1_0_32" = callPackage ({ mkDerivation, base, bytestring, containers, dhall , neat-interpolation, optparse-generic, shell-escape, text }: mkDerivation { pname = "dhall-bash"; - version = "1.0.31"; - sha256 = "10xp159bzbwnzapixrndg7sb0v5bg7li1nkr48akh6h4icpvnfsp"; + version = "1.0.32"; + sha256 = "0y4pjrknbq48j1cnj25zf31k02j5ivjm3h6ffizr3vgr24whfxih"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72021,26 +72045,28 @@ self: { "dhall-docs" = callPackage ({ mkDerivation, base, bytestring, containers, dhall, directory - , doctest, file-embed, filepath, HaXml, lucid, megaparsec, mmark - , mtl, optparse-applicative, path, path-io, pretty, prettyprinter - , tar, tasty, tasty-silver, text + , doctest, file-embed, filepath, foldl, HaXml, lens-family-core + , lucid, megaparsec, mmark, mtl, optparse-applicative, path + , path-io, pretty, prettyprinter, tar, tasty, tasty-hunit + , tasty-silver, text, turtle }: mkDerivation { pname = "dhall-docs"; - version = "0.0.1"; - sha256 = "1cb3xlb27bw8csvg7a73whr4ld608g1w9i5nc7z799ry3pp64m0n"; + version = "1.0.0"; + sha256 = "0kfn3nr0g4x5bpdrkg5lh8qma2536k3gx7bvrsrkn53lyyxnbnvi"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers dhall directory file-embed filepath - lucid megaparsec mmark mtl optparse-applicative path path-io - prettyprinter tar text + lens-family-core lucid megaparsec mmark mtl optparse-applicative + path path-io prettyprinter tar text ]; executableHaskellDepends = [ base dhall ]; testHaskellDepends = [ - base containers directory doctest filepath HaXml path path-io - pretty tasty tasty-silver text + base bytestring containers dhall directory doctest filepath foldl + HaXml path path-io pretty tasty tasty-hunit tasty-silver text + turtle ]; description = "Generate HTML docs from a dhall package"; license = stdenv.lib.licenses.bsd3; @@ -72111,25 +72137,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "dhall-json_1_7_0" = callPackage + "dhall-json_1_7_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, aeson-yaml, ansi-terminal , base, bytestring, containers, dhall, exceptions, filepath - , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal - , scientific, tasty, tasty-hunit, tasty-silver, text - , unordered-containers, vector + , lens-family-core, optparse-applicative, prettyprinter + , prettyprinter-ansi-terminal, scientific, tasty, tasty-hunit + , tasty-silver, text, unordered-containers, vector }: mkDerivation { pname = "dhall-json"; - version = "1.7.0"; - sha256 = "1nk2dibdnzm5wmvlsf82n8hc0zab1chqw339pp9q5n2gavj8kvsi"; - revision = "1"; - editedCabalFile = "1xbr4cphc98frf458vsggx5lh3my7ahlz5fl19hnyy876iwb04hm"; + version = "1.7.1"; + sha256 = "158c9vhxa124r1xqn365wvwqhby5rngkip08ghy8rnjs5ijcxzgf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty aeson-yaml base bytestring containers dhall - exceptions filepath optparse-applicative prettyprinter scientific - text unordered-containers vector + exceptions filepath lens-family-core optparse-applicative + prettyprinter scientific text unordered-containers vector ]; executableHaskellDepends = [ aeson aeson-pretty ansi-terminal base bytestring dhall exceptions @@ -72191,16 +72215,44 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "dhall-lsp-server_1_0_9" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers + , data-default, dhall, dhall-json, directory, doctest, filepath + , haskell-lsp, haskell-lsp-types, hslogger, lens, lens-family-core + , lsp-test, megaparsec, mtl, network-uri, optparse-applicative + , prettyprinter, QuickCheck, rope-utf16-splay, tasty, tasty-hspec + , text, transformers, unordered-containers, uri-encode + }: + mkDerivation { + pname = "dhall-lsp-server"; + version = "1.0.9"; + sha256 = "0zf53pc8rxapmdm9fvp04gfnw2910yv1gm5sm5v5wb606njzk0xn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring containers data-default dhall + dhall-json directory filepath haskell-lsp hslogger lens + lens-family-core megaparsec mtl network-uri prettyprinter + rope-utf16-splay text transformers unordered-containers uri-encode + ]; + executableHaskellDepends = [ base optparse-applicative ]; + testHaskellDepends = [ + base directory doctest filepath haskell-lsp-types lsp-test + QuickCheck tasty tasty-hspec text + ]; + description = "Language Server Protocol (LSP) server for Dhall"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "dhall-nix" = callPackage ({ mkDerivation, base, containers, data-fix, dhall, hnix , lens-family-core, neat-interpolation, optparse-generic, text }: mkDerivation { pname = "dhall-nix"; - version = "1.1.15"; - sha256 = "0ynbl5nrsql9y0nh7kiyvf9h0z61d2d5v1iga8vidaqvdkih383h"; - revision = "1"; - editedCabalFile = "0fkc59w12pdd7wzf11x8glkvvq1jj482dmzzq1d2h1xd8z616zkz"; + version = "1.1.16"; + sha256 = "1p9aizzf7zx92ns292zyzvg01r85dpl3wa61nh6g3q16qjs35bcx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -72216,6 +72268,27 @@ self: { broken = true; }) {}; + "dhall-nixpkgs" = callPackage + ({ mkDerivation, aeson, base, data-fix, dhall, foldl, hnix + , lens-family-core, megaparsec, mmorph, neat-interpolation + , network-uri, optparse-applicative, prettyprinter, text + , transformers, turtle + }: + mkDerivation { + pname = "dhall-nixpkgs"; + version = "1.0.0"; + sha256 = "1bymafh0p0avfsdpcijj76075pgkn81sf6f3y17m7p0lmp8hhh75"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson base data-fix dhall foldl hnix lens-family-core megaparsec + mmorph neat-interpolation network-uri optparse-applicative + prettyprinter text transformers turtle + ]; + description = "Convert Dhall projects to Nix packages"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "dhall-text" = callPackage ({ mkDerivation, base, dhall, optparse-applicative, text }: mkDerivation { @@ -72297,7 +72370,7 @@ self: { broken = true; }) {}; - "dhall-yaml_1_2_0" = callPackage + "dhall-yaml_1_2_1" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, bytestring, dhall , dhall-json, exceptions, HsYAML, HsYAML-aeson , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal @@ -72305,10 +72378,8 @@ self: { }: mkDerivation { pname = "dhall-yaml"; - version = "1.2.0"; - sha256 = "0jvz8xjj2f0g8pxaspgvg7rzhfyccz1rgvp4l3c9zjri3wirxpwp"; - revision = "1"; - editedCabalFile = "0qkwnckzr04442iz6x0cba7m8nclw18pb4icnpxrxnn9fxc7blx5"; + version = "1.2.1"; + sha256 = "18p8a92wiz2zi4q7v5fjvdallxrl21scmwwv706g3mm5dgfgcs5a"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -74362,22 +74433,22 @@ self: { "discord-haskell" = callPackage ({ mkDerivation, aeson, async, base, base64-bytestring, bytestring , containers, data-default, emoji, http-client, iso8601-time - , JuicyPixels, MonadRandom, req, safe-exceptions, text, time - , unordered-containers, vector, websockets, wuss + , JuicyPixels, MonadRandom, mtl, req, safe-exceptions, text, time + , unliftio, unordered-containers, vector, websockets, wuss }: mkDerivation { pname = "discord-haskell"; - version = "1.6.1"; - sha256 = "0id3y2zg1hg0mj6ymjm4khmsdnjdl3i7sm9b7jvw5vy44956cf5y"; + version = "1.7.0"; + sha256 = "1hb2qfljj0xq427657ml8qasg99fhwh0zfsrmryqpaq5ch8aqn20"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson async base base64-bytestring bytestring containers data-default emoji http-client iso8601-time JuicyPixels MonadRandom - req safe-exceptions text time unordered-containers vector - websockets wuss + mtl req safe-exceptions text time unliftio unordered-containers + vector websockets wuss ]; - executableHaskellDepends = [ base text ]; + executableHaskellDepends = [ base text unliftio ]; description = "Write bots for Discord in Haskell"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -75930,8 +76001,8 @@ self: { ({ mkDerivation, base, mmsyn3, mmsyn6ukr, mmsyn7s, vector }: mkDerivation { pname = "dobutokO-poetry"; - version = "0.7.0.0"; - sha256 = "0c2838dn34hwh9z0j1qhz276zf7zypr0gq25ym4m6wzpni14scj7"; + version = "0.9.0.1"; + sha256 = "1wjxmlcz5xyc3avfm9f74f3scjjqa3a8hn0pav2l0lhkf8r6p5i6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base mmsyn3 mmsyn6ukr mmsyn7s vector ]; @@ -79733,14 +79804,36 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "egison-pattern-src_0_2_1_1" = callPackage + ({ mkDerivation, base, containers, free, megaparsec, mtl + , parser-combinators, prettyprinter, recursion-schemes, tasty + , tasty-discover, tasty-hunit, text + }: + mkDerivation { + pname = "egison-pattern-src"; + version = "0.2.1.1"; + sha256 = "0zpaxkskpdhq5nm1h6fh1klww4cslz96a3w4fhlaz0v0wdbkbrfs"; + libraryHaskellDepends = [ + base containers free megaparsec mtl parser-combinators + prettyprinter recursion-schemes text + ]; + testHaskellDepends = [ + base megaparsec mtl tasty tasty-hunit text + ]; + testToolDepends = [ tasty-discover ]; + description = "Manipulating Egison patterns: abstract syntax, parser, and pretty-printer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "egison-pattern-src-haskell-mode" = callPackage ({ mkDerivation, base, egison-pattern-src, haskell-src-exts, mtl , tasty, tasty-discover, tasty-hunit, text }: mkDerivation { pname = "egison-pattern-src-haskell-mode"; - version = "0.2.1.0"; - sha256 = "0lgvvw23ii0g62b8q67h4mfm2bd07akl2m8dp8855hm16q1b8w8n"; + version = "0.2.1.1"; + sha256 = "0k21fi28imqnn2rp5182mjxnrahssbdxay3pzhzj5yyfjp8qymwp"; libraryHaskellDepends = [ base egison-pattern-src haskell-src-exts mtl text ]; @@ -79776,6 +79869,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "egison-pattern-src-th-mode_0_2_1_1" = callPackage + ({ mkDerivation, base, egison-pattern-src, haskell-src-exts + , haskell-src-meta, mtl, pretty, tasty, tasty-discover, tasty-hunit + , template-haskell, text + }: + mkDerivation { + pname = "egison-pattern-src-th-mode"; + version = "0.2.1.1"; + sha256 = "110rykbxkpv9vrqvwdxm0fa73djy2g5swcxzpx61zh6cl4wk949g"; + libraryHaskellDepends = [ + base egison-pattern-src haskell-src-exts haskell-src-meta mtl + pretty template-haskell text + ]; + testHaskellDepends = [ + base egison-pattern-src haskell-src-exts mtl tasty tasty-hunit + template-haskell text + ]; + testToolDepends = [ tasty-discover ]; + description = "Parser and pretty printer for Egison pattern expressions to use with TH"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "egison-quote" = callPackage ({ mkDerivation, base, egison, mtl, parsec, template-haskell }: mkDerivation { @@ -79951,16 +80067,16 @@ self: { "either-result" = callPackage ({ mkDerivation, base, doctest, doctest-discover, hspec - , hspec-discover + , hspec-discover, mtl, transformers }: mkDerivation { pname = "either-result"; - version = "0.1.2.0"; - sha256 = "1ch6m0bimbkq73xchhfczssl6pzszkrhcgbcccbzi752r4vps31s"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base doctest hspec ]; + version = "0.3.0.0"; + sha256 = "1cj6g6b90cpfzfsrkja35bs6qfnqnx9fqxwfrkm5985pp0ii546d"; + libraryHaskellDepends = [ base mtl transformers ]; + testHaskellDepends = [ base doctest hspec transformers ]; testToolDepends = [ doctest-discover hspec-discover ]; - description = "‘Result a’ is a wrapper of ‘Either String a’"; + description = "‘MonadFail’ instance for a wrapper of ‘ExceptT String m a’"; license = stdenv.lib.licenses.asl20; }) {}; @@ -80963,8 +81079,8 @@ self: { }: mkDerivation { pname = "elynx"; - version = "0.3.0"; - sha256 = "15qnsbbfmyyxmhzs5ly84w4yficcmnl3v49wjqhr86836l770rbi"; + version = "0.3.1"; + sha256 = "00fm1aixj31djlrmkzvhsk119w00jch6l1alaxmy97gjcg8kk6hd"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -80977,23 +81093,22 @@ self: { }) {}; "elynx-markov" = callPackage - ({ mkDerivation, base, bytestring, containers, elynx-seq - , elynx-tools, elynx-tree, hmatrix, hspec, hspec-megaparsec - , integration, math-functions, megaparsec, mwc-random, parallel - , primitive, statistics, vector + ({ mkDerivation, async, attoparsec, base, bytestring, containers + , elynx-seq, elynx-tools, hmatrix, hspec, integration + , math-functions, mwc-random, parallel, primitive, statistics + , vector }: mkDerivation { pname = "elynx-markov"; - version = "0.3.0"; - sha256 = "0w889wjyj4g8yr4ysvh2v1jnsf6bpdri8pj9klslnrpmk4b7x14n"; + version = "0.3.1"; + sha256 = "05wjnlz5x6j74m9dc524yagwhj8w3vmxp3x55hkbfq89j44fb6n1"; libraryHaskellDepends = [ - base bytestring containers elynx-seq elynx-tools elynx-tree hmatrix - integration math-functions megaparsec mwc-random parallel primitive - statistics vector + async attoparsec base bytestring containers elynx-seq hmatrix + integration math-functions mwc-random parallel primitive statistics + vector ]; testHaskellDepends = [ - base containers elynx-tools elynx-tree hmatrix hspec - hspec-megaparsec mwc-random vector + base containers elynx-tools hmatrix hspec mwc-random vector ]; description = "Simulate molecular sequences along trees"; license = stdenv.lib.licenses.gpl3Plus; @@ -81002,12 +81117,12 @@ self: { }) {}; "elynx-nexus" = callPackage - ({ mkDerivation, base, bytestring, hspec, megaparsec }: + ({ mkDerivation, attoparsec, base, bytestring, hspec }: mkDerivation { pname = "elynx-nexus"; - version = "0.3.0"; - sha256 = "00aikdx89b0x9zw78srp5qmx564myn9dhwy1k6nq9b411cxsfz0v"; - libraryHaskellDepends = [ base bytestring megaparsec ]; + version = "0.3.1"; + sha256 = "0rqhzwfr8zz7nzvc7kkp6n2jxvq4qn3pv9ipk7mfdpxsfcm46550"; + libraryHaskellDepends = [ attoparsec base bytestring ]; testHaskellDepends = [ base hspec ]; description = "Import and export Nexus files"; license = stdenv.lib.licenses.gpl3Plus; @@ -81016,20 +81131,20 @@ self: { }) {}; "elynx-seq" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, elynx-tools - , hspec, hspec-megaparsec, matrices, megaparsec, mwc-random - , parallel, primitive, vector, vector-th-unbox, word8 + ({ mkDerivation, aeson, attoparsec, base, bytestring, containers + , elynx-tools, hspec, matrices, mwc-random, parallel, primitive + , vector, vector-th-unbox, word8 }: mkDerivation { pname = "elynx-seq"; - version = "0.3.0"; - sha256 = "0y7raavskrxgqmfsszm3f177hsjwnf69302vq3k7anj4fzqydvcn"; + version = "0.3.1"; + sha256 = "0wvp13kcx0fbhhk45ahs18p24dqn4n7wg1194hfj4v3qxg7pqy7q"; libraryHaskellDepends = [ - aeson base bytestring containers elynx-tools matrices megaparsec - mwc-random parallel primitive vector vector-th-unbox word8 + aeson attoparsec base bytestring containers matrices mwc-random + parallel primitive vector vector-th-unbox word8 ]; testHaskellDepends = [ - base bytestring elynx-tools hspec hspec-megaparsec matrices vector + base bytestring elynx-tools hspec matrices vector ]; description = "Handle molecular sequences"; license = stdenv.lib.licenses.gpl3Plus; @@ -81038,23 +81153,22 @@ self: { }) {}; "elynx-tools" = callPackage - ({ mkDerivation, aeson, async, base, base16-bytestring, bytestring - , containers, cryptohash-sha256, deepseq, directory, fast-logger - , hmatrix, matrices, megaparsec, monad-control, monad-logger - , mwc-random, optparse-applicative, parallel, primitive - , template-haskell, text, time, transformers, transformers-base - , vector, zlib + ({ mkDerivation, aeson, attoparsec, base, base16-bytestring + , bytestring, cryptohash-sha256, deepseq, directory, fast-logger + , hmatrix, monad-control, monad-logger, mwc-random + , optparse-applicative, primitive, template-haskell, text, time + , transformers, transformers-base, vector, zlib }: mkDerivation { pname = "elynx-tools"; - version = "0.3.0"; - sha256 = "1ba9vcmzf7kwm8h493m2n9naq1pzhsddd8mv3mp8vb30jgg75vhj"; + version = "0.3.1"; + sha256 = "1h7vg6dh45mc5snk4c9q0xplb3q68gklxhj295pa20d83jarki0x"; libraryHaskellDepends = [ - aeson async base base16-bytestring bytestring containers - cryptohash-sha256 deepseq directory fast-logger hmatrix matrices - megaparsec monad-control monad-logger mwc-random - optparse-applicative parallel primitive template-haskell text time - transformers transformers-base vector zlib + aeson attoparsec base base16-bytestring bytestring + cryptohash-sha256 deepseq directory fast-logger hmatrix + monad-control monad-logger mwc-random optparse-applicative + primitive template-haskell text time transformers transformers-base + vector zlib ]; description = "Tools for ELynx"; license = stdenv.lib.licenses.gpl3Plus; @@ -81063,26 +81177,25 @@ self: { }) {}; "elynx-tree" = callPackage - ({ mkDerivation, aeson, base, bytestring, comonad, containers - , criterion, deepseq, elynx-nexus, elynx-tools, hspec - , hspec-megaparsec, math-functions, megaparsec, mwc-random - , primitive, QuickCheck, statistics, vector + ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad + , containers, criterion, deepseq, double-conversion, elynx-nexus + , elynx-tools, hspec, math-functions, mwc-random, primitive + , QuickCheck, statistics }: mkDerivation { pname = "elynx-tree"; - version = "0.3.0"; - sha256 = "10z7fm5ir91vh3j39kf2ylx02i4fvnwxzk7x9bfpp6f26cr0mfcb"; + version = "0.3.1"; + sha256 = "0ppah6lkzg39z80w30wicz88y4jpfj0z38py9y73srwvqy6a45l3"; libraryHaskellDepends = [ - aeson base bytestring comonad containers deepseq elynx-nexus - elynx-tools math-functions megaparsec mwc-random primitive - statistics vector + aeson attoparsec base bytestring comonad containers deepseq + double-conversion elynx-nexus math-functions mwc-random primitive + statistics ]; testHaskellDepends = [ - base bytestring containers elynx-tools hspec hspec-megaparsec - megaparsec QuickCheck + attoparsec base bytestring containers elynx-tools hspec QuickCheck ]; benchmarkHaskellDepends = [ - base bytestring containers criterion elynx-tools + base bytestring criterion elynx-tools ]; description = "Handle phylogenetic trees"; license = stdenv.lib.licenses.gpl3Plus; @@ -87868,12 +87981,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "fgl_5_7_0_3" = callPackage + ({ mkDerivation, array, base, containers, deepseq, hspec + , microbench, QuickCheck, transformers + }: + mkDerivation { + pname = "fgl"; + version = "5.7.0.3"; + sha256 = "04k5grp5d381wkc7sxgcl0sd3z3nlm6l6mmh103vhzh6p49vhs99"; + libraryHaskellDepends = [ + array base containers deepseq transformers + ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + benchmarkHaskellDepends = [ base deepseq microbench ]; + description = "Martin Erwig's Functional Graph Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "fgl-arbitrary" = callPackage ({ mkDerivation, base, containers, fgl, hspec, QuickCheck }: mkDerivation { pname = "fgl-arbitrary"; - version = "0.2.0.5"; - sha256 = "1wp6v4wb2g6alq4r26da1zmc3g2g2xzca0znf4ldw4552azasaxx"; + version = "0.2.0.6"; + sha256 = "1mykbd1r43gpsn10ys8q3nr0i4wnhn6wq23hcici18mxxji11wkc"; libraryHaskellDepends = [ base fgl QuickCheck ]; testHaskellDepends = [ base containers fgl hspec QuickCheck ]; description = "QuickCheck support for fgl"; @@ -88537,19 +88668,6 @@ self: { }) {}; "filtrable" = callPackage - ({ mkDerivation, base }: - mkDerivation { - pname = "filtrable"; - version = "0.1.3.0"; - sha256 = "1viazb01xnw7siwrsynaxqcjrgc96gqfgmj4vxl5r3lbnb34wdl0"; - revision = "1"; - editedCabalFile = "15ghhsvd9r18ifrqh3x76p6hln4as185dnj5zzanbbfv684j9qsc"; - libraryHaskellDepends = [ base ]; - description = "Class of filtrable containers"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "filtrable_0_1_4_0" = callPackage ({ mkDerivation, base, transformers }: mkDerivation { pname = "filtrable"; @@ -88558,6 +88676,20 @@ self: { libraryHaskellDepends = [ base transformers ]; description = "Class of filtrable containers"; license = stdenv.lib.licenses.bsd3; + }) {}; + + "filtrable_0_1_5_0" = callPackage + ({ mkDerivation, base, smallcheck, tasty, tasty-smallcheck + , transformers + }: + mkDerivation { + pname = "filtrable"; + version = "0.1.5.0"; + sha256 = "0glarxd5yaflyhy8ni6q0kzrhgwi8msr3q4zf6by80g2qd33kvh8"; + libraryHaskellDepends = [ base transformers ]; + testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; + description = "Class of filtrable containers"; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; }) {}; @@ -90103,8 +90235,8 @@ self: { }: mkDerivation { pname = "floskell"; - version = "0.10.3"; - sha256 = "07nr7grav7z378k3v14f21kji0hrgch0q1dwc00iw93zamanda2x"; + version = "0.10.4"; + sha256 = "14cwby2xyv2cviknpji6117jz6zfjrayrfvc75481g229yhcx156"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -90860,20 +90992,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "foldl_1_4_7" = callPackage + "foldl_1_4_8" = callPackage ({ mkDerivation, base, bytestring, comonad, containers , contravariant, criterion, doctest, hashable, mwc-random - , primitive, profunctors, semigroupoids, semigroups, text - , transformers, unordered-containers, vector, vector-builder + , primitive, profunctors, semigroupoids, text, transformers + , unordered-containers, vector, vector-builder }: mkDerivation { pname = "foldl"; - version = "1.4.7"; - sha256 = "0pvdfzap9bv9v2n72gxy1xd1idyyz87h836bh09m84i8baasblxb"; + version = "1.4.8"; + sha256 = "1jlrcj9nq8xwlrsny6fzfizai3ilc1zbw38abgf35ryl23r5j6pd"; + revision = "1"; + editedCabalFile = "09jz01w3brgd8fwya56qgg0riv9vxzc0r9lkkhkx54nflari2rig"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable - mwc-random primitive profunctors semigroupoids semigroups text - transformers unordered-containers vector vector-builder + mwc-random primitive profunctors semigroupoids text transformers + unordered-containers vector vector-builder ]; testHaskellDepends = [ base doctest ]; benchmarkHaskellDepends = [ base criterion ]; @@ -91833,6 +91967,8 @@ self: { pname = "fourmolu"; version = "0.1.0.0"; sha256 = "1kc7hhaqn7sghbcfj9xg8r1pvrmhawy9y2rhizfxzm7z034bgjyk"; + revision = "1"; + editedCabalFile = "1j6g6rzanjbdqf9svhjx0bbsy504xyc6vcn1ac3vgn4vp367wz0y"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -93912,25 +94048,27 @@ self: { }) {}; "functor-combinators" = callPackage - ({ mkDerivation, base, bifunctors, comonad, constraints, containers - , dependent-sum, deriving-compat, free, hedgehog, kan-extensions - , mmorph, mtl, natural-transformation, nonempty-containers, pointed - , profunctors, semigroupoids, tagged, tasty, tasty-hedgehog, these + ({ mkDerivation, assoc, base, bifunctors, comonad, constraints + , containers, contravariant, dependent-sum, deriving-compat, free + , hedgehog, invariant, kan-extensions, mmorph, mtl + , natural-transformation, nonempty-containers, pointed, profunctors + , semigroupoids, sop-core, tagged, tasty, tasty-hedgehog, these , transformers, trivial-constraint, vinyl }: mkDerivation { pname = "functor-combinators"; - version = "0.2.0.0"; - sha256 = "0z8r9z08cayyv2ag748aa8550sd2mnj2zagdkf5i5yn3lvhd0k6j"; + version = "0.3.0.0"; + sha256 = "0bqlmxgq9as0ij11ir2licj3jkq190g56rdrf2g4hsjvk9xjsdkm"; libraryHaskellDepends = [ - base bifunctors comonad constraints containers deriving-compat free - kan-extensions mmorph mtl natural-transformation - nonempty-containers pointed profunctors semigroupoids tagged these - transformers trivial-constraint vinyl + assoc base bifunctors comonad constraints containers contravariant + deriving-compat free invariant kan-extensions mmorph mtl + natural-transformation nonempty-containers pointed profunctors + semigroupoids sop-core tagged these transformers trivial-constraint + vinyl ]; testHaskellDepends = [ base bifunctors dependent-sum free hedgehog nonempty-containers - semigroupoids tasty tasty-hedgehog transformers + semigroupoids tasty tasty-hedgehog transformers trivial-constraint ]; description = "Tools for functor combinator-based program design"; license = stdenv.lib.licenses.bsd3; @@ -94357,10 +94495,10 @@ self: { }: mkDerivation { pname = "fused-effects-th"; - version = "0.1.0.0"; - sha256 = "05apm97hlk1k0h6px5sf25gwb6wnrg5za3z8r64rcxmzcfhd10c9"; + version = "0.1.0.1"; + sha256 = "0yr9gymqna0q47cv9j17cwgbbjc8sjf7f1lm8fbig5zybb6ycpm9"; revision = "1"; - editedCabalFile = "00zyzq1xz78vbnygayvc78i023xqib0k2p0qvxzx4d2908l36g6f"; + editedCabalFile = "0slildsx3al8gn9s8w1dqq55pwsizjbkwmkm1vl742zk0kivax8c"; libraryHaskellDepends = [ base fused-effects template-haskell ]; testHaskellDepends = [ base fused-effects tasty tasty-hunit template-haskell @@ -95964,6 +96102,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "generic-data_0_9_0_0" = callPackage + ({ mkDerivation, ap-normalize, base, base-orphans, Cabal + , cabal-doctest, contravariant, criterion, deepseq, doctest + , generic-lens, ghc-boot-th, inspection-testing, one-liner + , QuickCheck, show-combinators, tasty, tasty-hunit + , template-haskell, unordered-containers + }: + mkDerivation { + pname = "generic-data"; + version = "0.9.0.0"; + sha256 = "1w8qkrl38p2fc38xbhgb973jd0czvm2f3707iqknj7rxf0xhjcfn"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + ap-normalize base base-orphans contravariant ghc-boot-th + show-combinators + ]; + testHaskellDepends = [ + base doctest generic-lens inspection-testing one-liner QuickCheck + show-combinators tasty tasty-hunit template-haskell + unordered-containers + ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + description = "Deriving instances with GHC.Generics and related utilities"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "generic-data-surgery" = callPackage ({ mkDerivation, base, first-class-families, generic-data , show-combinators, tasty, tasty-hunit @@ -101704,6 +101869,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "github-rest_1_0_3" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, bytestring, http-client + , http-client-tls, http-types, jwt, mtl, scientific, tasty + , tasty-golden, tasty-hunit, tasty-quickcheck, text, time + , transformers, unliftio, unliftio-core + }: + mkDerivation { + pname = "github-rest"; + version = "1.0.3"; + sha256 = "0alwix2lvrvv6ba7nrxg6qvvrdci1vbv94yvq29zmsab9lbv6jrb"; + libraryHaskellDepends = [ + aeson base bytestring http-client http-client-tls http-types jwt + mtl scientific text time transformers unliftio unliftio-core + ]; + testHaskellDepends = [ + aeson aeson-qq base bytestring http-client http-client-tls + http-types jwt mtl scientific tasty tasty-golden tasty-hunit + tasty-quickcheck text time transformers unliftio unliftio-core + ]; + description = "Query the GitHub REST API programmatically"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "github-tools" = callPackage ({ mkDerivation, base, bytestring, containers, exceptions, github , groom, html, http-client, http-client-tls, monad-parallel @@ -107480,6 +107669,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) graphviz;}; + "graphviz_2999_20_1_0" = callPackage + ({ mkDerivation, base, bytestring, colour, containers, criterion + , deepseq, directory, dlist, fgl, fgl-arbitrary, filepath, graphviz + , hspec, hspec-discover, mtl, polyparse, process, QuickCheck + , temporary, text, wl-pprint-text + }: + mkDerivation { + pname = "graphviz"; + version = "2999.20.1.0"; + sha256 = "0l0zxgb938hh09qirggbaskq79mgj3s081cnr42y5vm1rp1jir2s"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring colour containers directory dlist fgl filepath mtl + polyparse process temporary text wl-pprint-text + ]; + testHaskellDepends = [ + base containers fgl fgl-arbitrary filepath hspec QuickCheck text + ]; + testSystemDepends = [ graphviz ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ base criterion deepseq text ]; + description = "Bindings to Graphviz for graph visualisation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) graphviz;}; + "graql" = callPackage ({ mkDerivation, aeson, base, containers, hspec, markdown-unlit , process, regex-posix, scientific, text @@ -111991,16 +112207,17 @@ self: { }) {}; "hal" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, envy - , exceptions, http-conduit, http-types, mtl, text, time + ({ mkDerivation, aeson, base, bytestring, conduit, conduit-extra + , containers, envy, exceptions, http-client, http-conduit + , http-types, mtl, text, time }: mkDerivation { pname = "hal"; - version = "0.4.3"; - sha256 = "0iqyayya1j3l1jrb2i68shn4zgrqf63pv3l9v29s0chn3gyyij1r"; + version = "0.4.4"; + sha256 = "0nqxlvbk8lb9c6hh15gn8nd9h2p0rcrllkqjli0ixqil3qpynl76"; libraryHaskellDepends = [ - aeson base bytestring containers envy exceptions http-conduit - http-types mtl text time + aeson base bytestring conduit conduit-extra containers envy + exceptions http-client http-conduit http-types mtl text time ]; description = "A runtime environment for Haskell applications running on AWS Lambda"; license = stdenv.lib.licenses.bsd3; @@ -113559,8 +113776,8 @@ self: { }: mkDerivation { pname = "happy-meta"; - version = "0.2.0.10"; - sha256 = "1w6shcydpca5g9dgnki0w2xqr9mf17xa18s8hxxm3z3dd0sp1db9"; + version = "0.2.0.11"; + sha256 = "1vgv5fx1fya7wfh3zwdgy0hm0lyzp171gnpp6ymfd6kqmqkl3293"; libraryHaskellDepends = [ array base containers fail haskell-src-meta mtl template-haskell ]; @@ -113740,8 +113957,8 @@ self: { }: mkDerivation { pname = "harg"; - version = "0.4.2.0"; - sha256 = "14a5d73klg7da1pg30as9xnky95jxh1kl0qrzihvgd5m2kybsrb0"; + version = "0.4.2.1"; + sha256 = "0fbbf9zxfbyc6mnsybrd81sd87ps6qwks5zv5kmjygc6w8ngh6vh"; libraryHaskellDepends = [ aeson barbies base bytestring directory higgledy optparse-applicative split text yaml @@ -114010,32 +114227,32 @@ self: { "hascard" = callPackage ({ mkDerivation, base, brick, containers, directory, filepath - , microlens, microlens-platform, mwc-random, optparse-applicative - , ordered-containers, parsec, process, random-fu, strict, text - , vector, vty, word-wrap + , megaparsec, microlens, microlens-platform, mwc-random + , optparse-applicative, ordered-containers, process, random-fu + , strict, text, vector, vty, word-wrap }: mkDerivation { pname = "hascard"; - version = "0.2.0.0"; - sha256 = "1khdlkf2n6x3rck9sc7jir08mx7n7dv9p25j80g27q6a1nm0pq91"; + version = "0.2.1.0"; + sha256 = "13f7vmdrd3ibr78pjy7144qj0qa8s07k4j341fzw8w8af83m9wvc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base brick containers directory filepath microlens + base brick containers directory filepath megaparsec microlens microlens-platform mwc-random optparse-applicative - ordered-containers parsec process random-fu strict text vector vty + ordered-containers process random-fu strict text vector vty word-wrap ]; executableHaskellDepends = [ - base brick containers directory filepath microlens + base brick containers directory filepath megaparsec microlens microlens-platform mwc-random optparse-applicative - ordered-containers parsec process random-fu strict text vector vty + ordered-containers process random-fu strict text vector vty word-wrap ]; testHaskellDepends = [ - base brick containers directory filepath microlens + base brick containers directory filepath megaparsec microlens microlens-platform mwc-random optparse-applicative - ordered-containers parsec process random-fu strict text vector vty + ordered-containers process random-fu strict text vector vty word-wrap ]; description = "A TUI for reviewing notes using 'flashcards' written with markdown-like syntax"; @@ -117751,8 +117968,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.37.3"; - sha256 = "1gkgznvx0y30568l2rs0px2pfyzn9sbzqv9vnd5ps5ib33yb853s"; + version = "0.37.5"; + sha256 = "0ac1znif59fzcxcl3nmvrv6v49rzlcgsv138zgjnk7zxarp8alyg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -117793,8 +118010,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.37.3"; - sha256 = "1wz0nwm4izsxaxij9s4vfjdlcqp1jca16g2phdn3k2dp35kyfymi"; + version = "0.37.5"; + sha256 = "1p8hsnwr0h0sbnwg1kwbal36q4bh3s0daz1a5n2c8xal5xdkbdra"; libraryHaskellDepends = [ aeson base bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl network @@ -121227,8 +121444,8 @@ self: { }: mkDerivation { pname = "hedgehog-classes"; - version = "0.2.5"; - sha256 = "0rr9d3xajdlfmx92klq1zyi55wrc5ivf2p1jb0a6vxpyk75gy8wg"; + version = "0.2.5.1"; + sha256 = "0gyq9dr25sz14yw5x8jlb73l2hzv92r1c6cfan7lygq7z0yaiw6b"; libraryHaskellDepends = [ aeson base binary comonad containers hedgehog pretty-show primitive semirings silently transformers vector wl-pprint-annotated @@ -123010,8 +123227,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "hextra"; - version = "0.3.0.3"; - sha256 = "1vqx8wqac0xy1h2g36ylhyikqw9rd1m2704z27vc97g58vmhxbli"; + version = "1.0.0.0"; + sha256 = "17ik20q07if3gvfsifm00k8z6iffcjwmy19n5xyzzc4bd17qffzb"; libraryHaskellDepends = [ base ]; description = "Generic and niche utility functions and more for Haskell"; license = stdenv.lib.licenses.mpl20; @@ -123703,8 +123920,8 @@ self: { }: mkDerivation { pname = "hgrev"; - version = "0.2.5"; - sha256 = "06ikaxxa70x71w4rq7a9rcp4mj12d8wlwzfdxnrapg9x9yr3py85"; + version = "0.2.6"; + sha256 = "1v1niqvqj6w8nkr3pmjwj7va2f2nv8miwsfqsp3lj3b2i9x6asb2"; libraryHaskellDepends = [ aeson base bytestring directory filepath process template-haskell ]; @@ -125609,25 +125826,6 @@ self: { }) {}; "hkgr" = callPackage - ({ mkDerivation, base, directory, extra, filepath, simple-cabal - , simple-cmd, simple-cmd-args, xdg-basedir - }: - mkDerivation { - pname = "hkgr"; - version = "0.2.6"; - sha256 = "0wjq88cg84jiy3mqwhsamd6q57y76fqpyq27yq5jb30w3wrp4wdv"; - isLibrary = false; - isExecutable = true; - enableSeparateDataOutput = true; - executableHaskellDepends = [ - base directory extra filepath simple-cabal simple-cmd - simple-cmd-args xdg-basedir - ]; - description = "Simple Hackage release workflow for package maintainers"; - license = stdenv.lib.licenses.gpl3; - }) {}; - - "hkgr_0_2_6_1" = callPackage ({ mkDerivation, base, directory, extra, filepath, simple-cabal , simple-cmd, simple-cmd-args, xdg-basedir }: @@ -125644,7 +125842,6 @@ self: { ]; description = "Simple Hackage release workflow for package maintainers"; license = stdenv.lib.licenses.gpl3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "hkt" = callPackage @@ -130443,6 +130640,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hs-functors_0_1_7_1" = callPackage + ({ mkDerivation, base, dual, tagged, transformers }: + mkDerivation { + pname = "hs-functors"; + version = "0.1.7.1"; + sha256 = "1cigaggilr05pgizj11g5c40ln38zb5q8p0igliamkhx7fz3axis"; + libraryHaskellDepends = [ base dual tagged transformers ]; + description = "Functors from products of Haskell and its dual to Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hs-gchart" = callPackage ({ mkDerivation, base, mtl }: mkDerivation { @@ -130507,19 +130716,13 @@ self: { }) {}; "hs-ix" = callPackage - ({ mkDerivation, base, base-unicode-symbols, criterion, hs-functors - , smallcheck, tasty, tasty-smallcheck, util - }: + ({ mkDerivation, base, hs-functors }: mkDerivation { pname = "hs-ix"; - version = "0.1.1.0"; - sha256 = "1a1plgzbqk4jhf5lyfx82yillcmy38lzlqwsfhnlka5h6f9j10hx"; - libraryHaskellDepends = [ - base base-unicode-symbols hs-functors util - ]; - testHaskellDepends = [ base smallcheck tasty tasty-smallcheck ]; - benchmarkHaskellDepends = [ base criterion ]; - description = "Indexed monads"; + version = "0.2.0.0"; + sha256 = "04dm8c5ilaw4agljfp7k31ln2j5m1shyg4zb3x36rjkbs807z8sf"; + libraryHaskellDepends = [ base hs-functors ]; + description = "Indexed applicative functors and monads"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -133482,6 +133685,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "hspec-golden_0_1_0_3" = callPackage + ({ mkDerivation, base, directory, hspec, hspec-core + , optparse-applicative, silently + }: + mkDerivation { + pname = "hspec-golden"; + version = "0.1.0.3"; + sha256 = "1d5ab34n0f1wk1q86qlb7x2b49abzzh08jh7j52nbrvnxld2j64l"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base directory hspec-core ]; + executableHaskellDepends = [ base directory optparse-applicative ]; + testHaskellDepends = [ base directory hspec hspec-core silently ]; + description = "Golden tests for hspec"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hspec-golden-aeson" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, directory , filepath, hspec, hspec-core, QuickCheck, quickcheck-arbitrary-adt @@ -134471,10 +134692,8 @@ self: { }: mkDerivation { pname = "hstatistics"; - version = "0.3"; - sha256 = "1v7f2844p6bjzcwc2pnjyb8zl42kw1x021gcn688dvdxs6cgdwvs"; - revision = "1"; - editedCabalFile = "0qcp1kgpwnqphqq1fd92lfp8d0vcf3l6ighsdiqin51qg499xz9w"; + version = "0.3.1"; + sha256 = "0pcx1s15ijdj5kxqbwcqf5qvpa8wxac9ph5013cmg1k1yflnqrzh"; libraryHaskellDepends = [ array base hmatrix hmatrix-gsl-stats random vector ]; @@ -136500,37 +136719,6 @@ self: { }) {}; "http-streams" = callPackage - ({ mkDerivation, aeson, aeson-pretty, attoparsec, base - , base64-bytestring, blaze-builder, bytestring, case-insensitive - , directory, ghc-prim, HsOpenSSL, hspec, hspec-expectations - , http-common, HUnit, io-streams, lifted-base, mtl, network - , network-uri, openssl-streams, snap-core, snap-server - , system-fileio, system-filepath, text, transformers - , unordered-containers - }: - mkDerivation { - pname = "http-streams"; - version = "0.8.7.1"; - sha256 = "0kl668ggxz5wzvziagw9inmmwb0l5x2r00nf4p7wm0pnl8m19l2b"; - libraryHaskellDepends = [ - aeson attoparsec base base64-bytestring blaze-builder bytestring - case-insensitive directory HsOpenSSL http-common io-streams mtl - network network-uri openssl-streams text transformers - unordered-containers - ]; - testHaskellDepends = [ - aeson aeson-pretty attoparsec base base64-bytestring blaze-builder - bytestring case-insensitive directory ghc-prim HsOpenSSL hspec - hspec-expectations http-common HUnit io-streams lifted-base mtl - network network-uri openssl-streams snap-core snap-server - system-fileio system-filepath text transformers - unordered-containers - ]; - description = "An HTTP client using io-streams"; - license = stdenv.lib.licenses.bsd3; - }) {}; - - "http-streams_0_8_7_2" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base64-bytestring, blaze-builder, bytestring, case-insensitive , directory, ghc-prim, HsOpenSSL, hspec, hspec-expectations @@ -136559,7 +136747,6 @@ self: { ]; description = "An HTTP client using io-streams"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "http-test" = callPackage @@ -139652,6 +139839,8 @@ self: { pname = "hyper"; version = "0.1.0.3"; sha256 = "0bc2mvxaggdyikdx51qc1li8idmnlw3ha2n3qli6jf1zz8mlqx0s"; + revision = "1"; + editedCabalFile = "1qfavgvdlmsip57grhxs0mawh82nxrq4m0mv9z3vam1b9j6nw2cc"; libraryHaskellDepends = [ base blaze-html deepseq text ]; description = "Display class for the HyperHaskell graphical Haskell interpreter"; license = stdenv.lib.licenses.bsd3; @@ -140252,8 +140441,8 @@ self: { ({ mkDerivation, base, ghc-prim, transformers }: mkDerivation { pname = "icfpc2020-galaxy"; - version = "0.1.0.1"; - sha256 = "1nd925iwyy73imw2h0xa3n9vi8rr487v541l9mlb834l20v6mpzl"; + version = "0.2.0.0"; + sha256 = "17m8vp3kikpscagb40972r9a8i6ng8wjc697zdslj5zl95rpyrvd"; libraryHaskellDepends = [ base ghc-prim transformers ]; description = "A strange message received at the Pegovka observatory"; license = stdenv.lib.licenses.mit; @@ -148894,6 +149083,30 @@ self: { broken = true; }) {}; + "jsop" = callPackage + ({ mkDerivation, aeson, base, containers, generics-sop, lens + , lens-aeson, monoidal-containers, protolude, string-interpolate + , tasty, tasty-discover, tasty-hspec, text + }: + mkDerivation { + pname = "jsop"; + version = "0.1.0.0"; + sha256 = "0yaxcpxgn00jf3igvncg59ca6hz28sf791872n617v3vh7arv8y3"; + libraryHaskellDepends = [ + aeson base containers generics-sop lens lens-aeson + monoidal-containers protolude string-interpolate tasty + tasty-discover tasty-hspec text + ]; + testHaskellDepends = [ + aeson base containers generics-sop lens lens-aeson + monoidal-containers protolude string-interpolate tasty + tasty-discover tasty-hspec text + ]; + testToolDepends = [ tasty-discover ]; + description = "Cherry picking in JSON objects"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "jspath" = callPackage ({ mkDerivation, base, bytestring, bytestring-trie, JSONb , utf8-string @@ -151256,8 +151469,8 @@ self: { }: mkDerivation { pname = "knit"; - version = "0.1.0.0"; - sha256 = "0ypa7bj89zbkgyryms6nzwhqpp15hs52ynjvisdsng1xpgmf65dy"; + version = "0.2.0.0"; + sha256 = "0a1swv5w9fxissxqr2x61qijqyhdxs71fv21fjz4r0kcqywnvy6x"; libraryHaskellDepends = [ base bytestring containers deepseq hashtables vector ]; @@ -153193,8 +153406,8 @@ self: { }: mkDerivation { pname = "language-dickinson"; - version = "1.1.0.1"; - sha256 = "0j163whdxpzi2aklb5x7f42y61whm941x0rjls02crgmpdaj0z75"; + version = "1.1.0.2"; + sha256 = "1g2d32535vmgjiy1ld4hq8g5il98c3h6ykfdl34fq8329qf9gxxr"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -162229,7 +162442,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "lsp-test_0_11_0_3" = callPackage + "lsp-test_0_11_0_4" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, async, base , bytestring, conduit, conduit-parse, containers, data-default , Diff, directory, filepath, Glob, haskell-lsp, hspec, lens, mtl @@ -162238,8 +162451,8 @@ self: { }: mkDerivation { pname = "lsp-test"; - version = "0.11.0.3"; - sha256 = "065g80nbiw9lrk4rjnbksrnjc79klxxl8vxvpmcsinqmvxcynm8f"; + version = "0.11.0.4"; + sha256 = "0nf0ys44q2n81arg7ll08dkilq8giz0gxarld2lpq5fyhhfvyv7g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -162498,8 +162711,8 @@ self: { ({ mkDerivation, base, lucid }: mkDerivation { pname = "lucid-cdn"; - version = "0.1.1.0"; - sha256 = "1z70mgwa3krd9a4za32psdnqzrvqb9205saqfhxpkny8sd2g14rc"; + version = "0.1.1.1"; + sha256 = "1dl44rc5b3wrgfcllp6h1sw4w18jgglh1grh5w9g37rcxi2cxwll"; libraryHaskellDepends = [ base lucid ]; description = "Curated list of CDN imports for lucid"; license = stdenv.lib.licenses.mit; @@ -165839,6 +166052,23 @@ self: { broken = true; }) {}; + "matrix-as-xyz_0_1_2_1" = callPackage + ({ mkDerivation, base, doctest, hspec, matrix, parsec, QuickCheck + }: + mkDerivation { + pname = "matrix-as-xyz"; + version = "0.1.2.1"; + sha256 = "0k49k16mxp7izkanan0yrrlkzvblw1w7bvfrh486fys83gvkb3x8"; + libraryHaskellDepends = [ base doctest hspec matrix parsec ]; + testHaskellDepends = [ + base doctest hspec matrix parsec QuickCheck + ]; + description = "Read and Display Jones-Faithful notation for spacegroup and planegroup"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "matrix-lens" = callPackage ({ mkDerivation, base, hedgehog, lens, matrix, tasty , tasty-discover, tasty-hedgehog, tasty-hspec, vector @@ -166370,17 +166600,18 @@ self: { "mcmc" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion - , data-default, directory, hspec, hspec-discover, log-domain - , microlens, mwc-random, QuickCheck, statistics, text, time + , data-default, directory, double-conversion, hspec, hspec-discover + , log-domain, microlens, mwc-random, QuickCheck, statistics, time , transformers, vector, zlib }: mkDerivation { pname = "mcmc"; - version = "0.2.0"; - sha256 = "1nybslnvn9g6cha19m2xhs6nba5nap572yxhgv4bjv44dmr6lvf7"; + version = "0.2.1"; + sha256 = "1jh88xqi485ha3bqrp012xsv7cljwsaxxc45l5npcr947g22ln11"; libraryHaskellDepends = [ - aeson base bytestring containers data-default directory log-domain - microlens mwc-random statistics text time transformers vector zlib + aeson base bytestring containers data-default directory + double-conversion log-domain microlens mwc-random statistics time + transformers vector zlib ]; testHaskellDepends = [ base directory hspec hspec-discover log-domain mwc-random @@ -166388,8 +166619,7 @@ self: { ]; testToolDepends = [ hspec-discover ]; benchmarkHaskellDepends = [ - base criterion log-domain microlens mwc-random statistics text - vector + base criterion log-domain microlens mwc-random statistics vector ]; description = "Sample from a posterior using Markov chain Monte Carlo"; license = stdenv.lib.licenses.gpl3Plus; @@ -166549,6 +166779,28 @@ self: { broken = true; }) {}; + "mealy" = callPackage + ({ mkDerivation, adjunctions, backprop, base, containers, doctest + , folds, generic-lens, hmatrix, lens, mwc-probability, mwc-random + , numhask, numhask-array, primitive, profunctors, tdigest, text + , vector, vector-algorithms + }: + mkDerivation { + pname = "mealy"; + version = "0.0.1"; + sha256 = "0z7hf1blzhgrjmrf7s2dpgmg73157j476g17i7m52zgfgq4vmym9"; + libraryHaskellDepends = [ + adjunctions backprop base containers folds generic-lens hmatrix + lens mwc-probability mwc-random numhask numhask-array primitive + profunctors tdigest text vector vector-algorithms + ]; + testHaskellDepends = [ base doctest numhask ]; + description = "See readme.md"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "means" = callPackage ({ mkDerivation, base, semigroups }: mkDerivation { @@ -166657,6 +166909,32 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "medea_1_2_0" = callPackage + ({ mkDerivation, aeson, algebraic-graphs, base, bytestring + , containers, deepseq, directory, filepath, free, hashable, hspec + , hspec-core, megaparsec, microlens-ghc, mtl, nonempty-containers + , parser-combinators, QuickCheck, quickcheck-instances, scientific + , smash, text, unordered-containers, vector, vector-instances + }: + mkDerivation { + pname = "medea"; + version = "1.2.0"; + sha256 = "019jfz29gz3d06b5yi7fygqa79lp6c6vbzxcb5ka7d8w0zv7w60v"; + libraryHaskellDepends = [ + aeson algebraic-graphs base bytestring containers deepseq free + hashable megaparsec microlens-ghc mtl nonempty-containers + parser-combinators scientific smash text unordered-containers + vector vector-instances + ]; + testHaskellDepends = [ + aeson base bytestring directory filepath hspec hspec-core mtl + QuickCheck quickcheck-instances text unordered-containers vector + ]; + description = "A schema language for JSON"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mediabus" = callPackage ({ mkDerivation, array, async, base, binary, bytestring, cereal , conduit, conduit-combinators, conduit-extra, containers @@ -169807,6 +170085,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "mixed-types-num_0_4_0_2" = callPackage + ({ mkDerivation, base, hspec, hspec-smallcheck, mtl, QuickCheck + , smallcheck, template-haskell + }: + mkDerivation { + pname = "mixed-types-num"; + version = "0.4.0.2"; + sha256 = "0kirxpnmwwnbxamwpzrxyx69n482xhifqpr5id73pfni7lrd126p"; + libraryHaskellDepends = [ + base hspec hspec-smallcheck mtl QuickCheck smallcheck + template-haskell + ]; + testHaskellDepends = [ base hspec hspec-smallcheck QuickCheck ]; + description = "Alternative Prelude with numeric and logic expressions typed bottom-up"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "mixpanel-client" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring, hspec , hspec-discover, http-client, http-client-tls, markdown-unlit @@ -170266,6 +170562,24 @@ self: { broken = true; }) {}; + "mock-httpd" = callPackage + ({ mkDerivation, aeson, async, base, bytestring, case-insensitive + , filepath, http-types, relude, text, wai, warp, yaml + }: + mkDerivation { + pname = "mock-httpd"; + version = "0.0.0.0"; + sha256 = "0mv669gvn61by4j7sd4w2hvzr3vpa0szrhgzdciv5g1a0gsh3kk7"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson async base bytestring case-insensitive filepath http-types + relude text wai warp yaml + ]; + description = "A HTTP server for testing HTTP clients"; + license = stdenv.lib.licenses.bsd2; + }) {}; + "mockazo" = callPackage ({ mkDerivation, base, constraints, hspec, multistate, relude , template-haskell @@ -176120,8 +176434,8 @@ self: { }: mkDerivation { pname = "mwc-probability"; - version = "2.3.0"; - sha256 = "1rk5n015a24bv49m2qnc66iv5hcw99zk9zflqv99pxxbpia6kiyj"; + version = "2.3.1"; + sha256 = "15gpvx1rhr24zvj6pfgyy9g2vnhgym5crmz4py3nly2jcmy9k39z"; libraryHaskellDepends = [ base containers mwc-random primitive transformers ]; @@ -178830,6 +179144,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "network_3_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, directory, hspec + , hspec-discover, HUnit, QuickCheck, temporary + }: + mkDerivation { + pname = "network"; + version = "3.1.2.0"; + sha256 = "07zbaaa4f0rnc4xqg5kbzqivmr9lqz2g6bw01gmqkmh9k9svsap0"; + libraryHaskellDepends = [ base bytestring deepseq directory ]; + testHaskellDepends = [ + base bytestring directory hspec HUnit QuickCheck temporary + ]; + testToolDepends = [ hspec-discover ]; + description = "Low-level networking interface"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "network-address" = callPackage ({ mkDerivation, base, Cabal, QuickCheck, test-framework , test-framework-quickcheck2 @@ -180461,8 +180793,8 @@ self: { }: mkDerivation { pname = "ngx-export-tools-extra"; - version = "0.5.4.1"; - sha256 = "153dswxwzai2fgn7k164zm1j2n144rncjyxj1k76mg9bqggplahs"; + version = "0.5.5.0"; + sha256 = "1w7vm0sic1v4zy10m8rkzrgbkvn3wnb4320gkl2dclsfdk70d5b3"; libraryHaskellDepends = [ aeson ansi-wl-pprint array base base64 binary bytestring case-insensitive containers ede enclosed-exceptions http-client @@ -181626,6 +181958,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "nonempty-containers_0_3_4_0" = callPackage + ({ mkDerivation, aeson, base, comonad, containers, deepseq + , hedgehog, hedgehog-fn, nonempty-vector, semigroupoids, tasty + , tasty-hedgehog, text, these, vector + }: + mkDerivation { + pname = "nonempty-containers"; + version = "0.3.4.0"; + sha256 = "1np8gypq49j90clavh17wzxp9y6z23lngal815jsg4p35qc0h01l"; + libraryHaskellDepends = [ + aeson base comonad containers deepseq nonempty-vector semigroupoids + these vector + ]; + testHaskellDepends = [ + base comonad containers hedgehog hedgehog-fn nonempty-vector + semigroupoids tasty tasty-hedgehog text these vector + ]; + description = "Non-empty variants of containers data types, with full API"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "nonempty-lift" = callPackage ({ mkDerivation, base, comonad, hedgehog, hedgehog-classes , semigroupoids @@ -182733,18 +183087,17 @@ self: { "numhask-space" = callPackage ({ mkDerivation, adjunctions, base, containers, distributive - , doctest, foldl, lattices, protolude, semigroupoids, tdigest, text - , time + , doctest, numhask, semigroupoids, tdigest, text, time }: mkDerivation { pname = "numhask-space"; - version = "0.5.0"; - sha256 = "0ygx5qkmsxf9qr1kbv96aqcm2rwb20v57zkn62ibhp01adj8n1gs"; + version = "0.6.0"; + sha256 = "0zm64spljv7pvl68b60y7hr46fa82i44j7yk8q6i33nhr78qv7wy"; libraryHaskellDepends = [ - adjunctions base containers distributive foldl lattices protolude - semigroupoids tdigest text time + adjunctions base containers distributive numhask semigroupoids + tdigest text time ]; - testHaskellDepends = [ base doctest protolude ]; + testHaskellDepends = [ base doctest numhask ]; description = "numerical spaces"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -184343,6 +184696,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "opaleye_0_6_7005_0" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , case-insensitive, containers, contravariant, dotenv, hspec + , hspec-discover, multiset, postgresql-simple, pretty + , product-profunctors, profunctors, QuickCheck, scientific + , semigroups, text, time, time-locale-compat, transformers, uuid + , void + }: + mkDerivation { + pname = "opaleye"; + version = "0.6.7005.0"; + sha256 = "0i5lwfvj7382ayxzdbip1nwjiiy7jn58g7qa33s44x3pnjv3wssy"; + revision = "1"; + editedCabalFile = "0bby89fvbx89b882b2qx07lg8npnfa325qg0gyabrd950510vzr2"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring case-insensitive + contravariant postgresql-simple pretty product-profunctors + profunctors scientific semigroups text time time-locale-compat + transformers uuid void + ]; + testHaskellDepends = [ + aeson base bytestring containers contravariant dotenv hspec + hspec-discover multiset postgresql-simple product-profunctors + profunctors QuickCheck semigroups text time transformers uuid + ]; + testToolDepends = [ hspec-discover ]; + description = "An SQL-generating DSL targeting PostgreSQL"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "opaleye-classy" = callPackage ({ mkDerivation, base, bytestring, lens, mtl, opaleye , postgresql-simple, product-profunctors, transformers @@ -185695,8 +186079,8 @@ self: { }: mkDerivation { pname = "opml-conduit"; - version = "0.8.0.0"; - sha256 = "08j6hm605km4j3w9n8mbwlzhz8avy3m941wgr9rp5dfkasi3s9p3"; + version = "0.9.0.0"; + sha256 = "012cnq24dhsiz6dfm23i1kac2pya50x2gj42cvcdhr8navz7czcb"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base case-insensitive conduit conduit-combinators containers @@ -185807,14 +186191,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "optics-core_0_3" = callPackage + "optics-core_0_3_0_1" = callPackage ({ mkDerivation, array, base, containers, indexed-profunctors , transformers }: mkDerivation { pname = "optics-core"; - version = "0.3"; - sha256 = "0gjxbrgp7c9k40782i2hm0pmb4fdrzcwbkq1xsj1835xszzxlp8n"; + version = "0.3.0.1"; + sha256 = "01z1rjrmj3jqh3fygqa1asr4azhdnqpix27sdw3ygi5dnbcmn49h"; libraryHaskellDepends = [ array base containers indexed-profunctors transformers ]; @@ -185875,14 +186259,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "optics-th_0_3" = callPackage + "optics-th_0_3_0_1" = callPackage ({ mkDerivation, base, containers, mtl, optics-core, tagged , template-haskell, th-abstraction, transformers }: mkDerivation { pname = "optics-th"; - version = "0.3"; - sha256 = "1k8kwii9jn1gjswkf7p5j5yvq7p9z8rs09ak78s5lmvxkh4c7035"; + version = "0.3.0.1"; + sha256 = "1bn9yhl1v4xkagasgiq4v572v4vvbk40wwlx9wjdw0gqcisy4b3j"; libraryHaskellDepends = [ base containers mtl optics-core template-haskell th-abstraction transformers @@ -186133,8 +186517,8 @@ self: { ({ mkDerivation, base, mtl }: mkDerivation { pname = "optparse-declarative"; - version = "0.3.0"; - sha256 = "1avy0g6jk34jbfp1xzqcyhb4j53knsbzx1pssl4b5f6nn981mbj8"; + version = "0.3.1"; + sha256 = "1s3bkkn5a8bgkbqdsf5ir18r0j0r2r0agz04q2ccafd26d8xdx2s"; libraryHaskellDepends = [ base mtl ]; description = "Declarative command line option parser"; license = stdenv.lib.licenses.mit; @@ -187797,6 +188181,8 @@ self: { pname = "pandoc-citeproc"; version = "0.17.0.1"; sha256 = "0hi31h4jxamnyw0jsbwnbzy9gkp3a03mhsgwy9w73hi13lywxrgk"; + revision = "1"; + editedCabalFile = "0z1gnaagylsjx8f1i49bp4zhcx2hlkc3w9wkwzsvvjq0qcfgzis0"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -187820,6 +188206,42 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pandoc-citeproc_0_17_0_2" = callPackage + ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring + , Cabal, containers, data-default, directory, filepath, hs-bibutils + , HsYAML, HsYAML-aeson, libyaml, mtl, network, old-locale, pandoc + , pandoc-types, parsec, process, rfc5051, safe, setenv, split, syb + , tagsoup, temporary, text, time, unordered-containers, vector + , xml-conduit, yaml + }: + mkDerivation { + pname = "pandoc-citeproc"; + version = "0.17.0.2"; + sha256 = "1wp16zz740klyn5jr8qxn21zf1waym3pzzv5l6k08w2l6z54d20b"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + aeson base bytestring containers data-default directory filepath + hs-bibutils HsYAML HsYAML-aeson mtl network old-locale pandoc + pandoc-types parsec rfc5051 setenv split syb tagsoup text time + unordered-containers vector xml-conduit yaml + ]; + executableHaskellDepends = [ + aeson aeson-pretty attoparsec base bytestring filepath libyaml + pandoc pandoc-types safe syb text yaml + ]; + testHaskellDepends = [ + aeson base bytestring containers directory filepath mtl pandoc + pandoc-types process temporary text yaml + ]; + doCheck = false; + description = "Supports using pandoc with citeproc"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pandoc-citeproc-preamble" = callPackage ({ mkDerivation, base, directory, filepath, pandoc-types, process , text-conversions @@ -188149,7 +188571,7 @@ self: { broken = true; }) {}; - "pandoc-plot_0_8_1_0" = callPackage + "pandoc-plot_0_9_0_0" = callPackage ({ mkDerivation, base, bytestring, containers, criterion , data-default, directory, filepath, githash, hashable, hspec , hspec-expectations, lifted-async, mtl, optparse-applicative @@ -188158,8 +188580,8 @@ self: { }: mkDerivation { pname = "pandoc-plot"; - version = "0.8.1.0"; - sha256 = "11mn2baqya3xm325znxcsxglv6ydd67yd69p3fvqn9m2fcg1y9fr"; + version = "0.9.0.0"; + sha256 = "0wamycf3cbblcifs7sppnzg4vbglzgizmjb5idg0dgkhlrk78gcx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -193482,6 +193904,18 @@ self: { broken = true; }) {}; + "pgf2" = callPackage + ({ mkDerivation, base, containers, gu, pgf, pretty }: + mkDerivation { + pname = "pgf2"; + version = "1.2.0"; + sha256 = "1lw9wdsvlasd5x323dficcmzqf48yz49wd3v64gsyx60sw93vn0y"; + libraryHaskellDepends = [ base containers pretty ]; + librarySystemDepends = [ gu pgf ]; + description = "Bindings to the C version of the PGF runtime"; + license = stdenv.lib.licenses.lgpl3; + }) {gu = null; inherit (pkgs) pgf;}; + "pgm" = callPackage ({ mkDerivation, array, base, bytestring, parsec }: mkDerivation { @@ -194520,6 +194954,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes_4_3_14" = callPackage + ({ mkDerivation, base, criterion, exceptions, mmorph, mtl + , optparse-applicative, QuickCheck, test-framework + , test-framework-quickcheck2, transformers, void + }: + mkDerivation { + pname = "pipes"; + version = "4.3.14"; + sha256 = "11r8cqy98w1y0avgn53x1fzqxpdfg7wvwwkfppnk9yip0lkcp3yv"; + libraryHaskellDepends = [ + base exceptions mmorph mtl transformers void + ]; + testHaskellDepends = [ + base mtl QuickCheck test-framework test-framework-quickcheck2 + transformers + ]; + benchmarkHaskellDepends = [ + base criterion mtl optparse-applicative transformers + ]; + description = "Compositional pipelines"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, pipes , pipes-attoparsec, pipes-bytestring, pipes-parse, transformers @@ -199097,6 +199555,80 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "postgresql-tx" = callPackage + ({ mkDerivation, base, transformers }: + mkDerivation { + pname = "postgresql-tx"; + version = "0.1.0.0"; + sha256 = "1jvrdyllmgd0v9w2wxqr1g70f6gza1wyb13j38ww2r2nvqzhp330"; + libraryHaskellDepends = [ base transformers ]; + description = "A safe transaction monad for use with various PostgreSQL Haskell libraries"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "postgresql-tx-monad-logger" = callPackage + ({ mkDerivation, base, monad-logger, postgresql-tx }: + mkDerivation { + pname = "postgresql-tx-monad-logger"; + version = "0.1.0.0"; + sha256 = "0y1x2d2r61ayhln0l2c5i3ivv97zpwyiaw1hymghpv4vwnlihv1y"; + libraryHaskellDepends = [ base monad-logger postgresql-tx ]; + description = "postgresql-tx interfacing for use with monad-logger"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "postgresql-tx-query" = callPackage + ({ mkDerivation, base, monad-logger, mtl, postgresql-query + , postgresql-simple, postgresql-tx, postgresql-tx-monad-logger + , transformers + }: + mkDerivation { + pname = "postgresql-tx-query"; + version = "0.1.0.0"; + sha256 = "0a7khw9ncc8k5cpi63kw598hvg3ycm1lchz46aw06pndcdzr54sv"; + libraryHaskellDepends = [ + base monad-logger mtl postgresql-query postgresql-simple + postgresql-tx postgresql-tx-monad-logger transformers + ]; + description = "postgresql-tx interfacing for use with postgresql-query"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "postgresql-tx-simple" = callPackage + ({ mkDerivation, base, postgresql-simple, postgresql-tx + , transformers + }: + mkDerivation { + pname = "postgresql-tx-simple"; + version = "0.1.0.0"; + sha256 = "1k03wqqzsvmmd7wh9gnlg9h12v2xnzd1vc9396sl1krg29l8373p"; + libraryHaskellDepends = [ + base postgresql-simple postgresql-tx transformers + ]; + description = "postgresql-tx interfacing for use with postgresql-simple"; + license = stdenv.lib.licenses.bsd3; + }) {}; + + "postgresql-tx-squeal" = callPackage + ({ mkDerivation, base, bytestring, generics-sop, postgresql-libpq + , postgresql-tx, records-sop, squeal-postgresql + }: + mkDerivation { + pname = "postgresql-tx-squeal"; + version = "0.1.0.0"; + sha256 = "08wfdy6hlpwkv3njh33igskv489kk8zbsd1nk24fvql1w215gsa4"; + libraryHaskellDepends = [ + base bytestring generics-sop postgresql-libpq postgresql-tx + records-sop squeal-postgresql + ]; + description = "postgresql-tx interfacing for use with squeal-postgresql"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "postgresql-typed" = callPackage ({ mkDerivation, aeson, array, attoparsec, base, binary, bytestring , containers, convertible, criterion, cryptonite, data-default @@ -199106,8 +199638,8 @@ self: { }: mkDerivation { pname = "postgresql-typed"; - version = "0.6.1.1"; - sha256 = "002bqsvsig6232d4di811rpjyjg7r45xsywb34i9l98imh51mia1"; + version = "0.6.1.2"; + sha256 = "0l2fkndiyb3yglgrj7mlmlsgg6qjgjzbh4przqk999c8cfr6bc66"; libraryHaskellDepends = [ aeson array attoparsec base binary bytestring containers cryptonite data-default haskell-src-meta HDBC memory network old-locale @@ -200782,19 +201314,6 @@ self: { }) {}; "prettyprinter-ansi-terminal" = callPackage - ({ mkDerivation, ansi-terminal, base, doctest, prettyprinter, text - }: - mkDerivation { - pname = "prettyprinter-ansi-terminal"; - version = "1.1.1.2"; - sha256 = "0ha6vz707qzb5ky7kdsnw2zgphg2dnxrpbrxy8gaw119vwhb9q6k"; - libraryHaskellDepends = [ ansi-terminal base prettyprinter text ]; - testHaskellDepends = [ base doctest ]; - description = "ANSI terminal backend for the »prettyprinter« package"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "prettyprinter-ansi-terminal_1_1_2" = callPackage ({ mkDerivation, ansi-terminal, base, base-compat, containers , deepseq, doctest, gauge, prettyprinter, QuickCheck, text }: @@ -200810,7 +201329,6 @@ self: { ]; description = "ANSI terminal backend for the »prettyprinter« package"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prettyprinter-compat-annotated-wl-pprint" = callPackage @@ -200857,25 +201375,6 @@ self: { }) {}; "prettyprinter-convert-ansi-wl-pprint" = callPackage - ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, doctest - , prettyprinter, prettyprinter-ansi-terminal, text - }: - mkDerivation { - pname = "prettyprinter-convert-ansi-wl-pprint"; - version = "1.1"; - sha256 = "03565w1qvqgdr1g2nwj3d2xpqbx04xm45pjfkb9d6jb2fww2v65q"; - revision = "1"; - editedCabalFile = "1c4zcscmvq0vbdgnp7n0avv8si5jshl4kw2qd1lqmhr28kj8x45f"; - libraryHaskellDepends = [ - ansi-terminal ansi-wl-pprint base prettyprinter - prettyprinter-ansi-terminal text - ]; - testHaskellDepends = [ base doctest ]; - description = "Converter from »ansi-wl-pprint« documents to »prettyprinter«-based ones"; - license = stdenv.lib.licenses.bsd2; - }) {}; - - "prettyprinter-convert-ansi-wl-pprint_1_1_1" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, base, doctest , prettyprinter, prettyprinter-ansi-terminal, text }: @@ -200890,7 +201389,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Converter from »ansi-wl-pprint« documents to »prettyprinter«-based ones"; license = stdenv.lib.licenses.bsd2; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "prettyprinter-graphviz" = callPackage @@ -202003,6 +202501,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "product-profunctors_0_11_0_0" = callPackage + ({ mkDerivation, base, bifunctors, contravariant, criterion + , deepseq, profunctors, tagged, template-haskell + }: + mkDerivation { + pname = "product-profunctors"; + version = "0.11.0.0"; + sha256 = "1jx427xixykq9h353r7izd5nx1hpzc7g0hz4pcx6hnd0ql2d644a"; + libraryHaskellDepends = [ + base bifunctors contravariant profunctors tagged template-haskell + ]; + testHaskellDepends = [ base profunctors ]; + benchmarkHaskellDepends = [ base criterion deepseq ]; + description = "product-profunctors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "prof-flamegraph" = callPackage ({ mkDerivation, base, optparse-applicative }: mkDerivation { @@ -202516,8 +203032,8 @@ self: { }: mkDerivation { pname = "prometheus"; - version = "2.2.1"; - sha256 = "0wf7ayxxppdg1x1s2sjmlnnhdmlm18a90mgzg7wfvpmlb9kgvs3f"; + version = "2.2.2"; + sha256 = "11r3ckkv4fzgc5lgfvhgkngjvikzmapahh162grzdj6j47nm3hsf"; libraryHaskellDepends = [ atomic-primops base bytestring containers http-client http-client-tls http-types network-uri text transformers wai warp @@ -203505,8 +204021,8 @@ self: { }: mkDerivation { pname = "provenience"; - version = "0.1.0.1"; - sha256 = "0z2lsyx59wk663y4p0xwl5sjrl1h3aqlqwig2xhvv9a1cf2bzzd3"; + version = "0.1.0.2"; + sha256 = "0wzja3vv21wgwxlmwcfc6vbkdr80jjkhxbxa41zz1i78j8cc3bri"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -205983,6 +206499,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "quickcheck-instances_0_3_24" = callPackage + ({ mkDerivation, array, base, bytestring, case-insensitive + , containers, data-fix, hashable, integer-logarithms, old-time + , QuickCheck, scientific, splitmix, strict, tagged, text, these + , time, time-compat, transformers, transformers-compat + , unordered-containers, uuid-types, vector + }: + mkDerivation { + pname = "quickcheck-instances"; + version = "0.3.24"; + sha256 = "0jvb3d43hc1sa8aal1gjpwmrh65mswi72yssb98bj5hca4z8grk5"; + libraryHaskellDepends = [ + array base bytestring case-insensitive containers data-fix hashable + integer-logarithms old-time QuickCheck scientific splitmix strict + tagged text these time time-compat transformers transformers-compat + unordered-containers uuid-types vector + ]; + testHaskellDepends = [ + base containers QuickCheck tagged uuid-types + ]; + benchmarkHaskellDepends = [ base bytestring QuickCheck ]; + description = "Common quickcheck instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "quickcheck-io" = callPackage ({ mkDerivation, base, HUnit, QuickCheck }: mkDerivation { @@ -207663,8 +208205,8 @@ self: { }: mkDerivation { pname = "random-fu"; - version = "0.2.7.6"; - sha256 = "1as1g6i80jy3vnj71h33bj5ywlw9bsdcqwbl3pdqqfqp0mv13rfk"; + version = "0.2.7.7"; + sha256 = "1jk5qv7iddbqcyciih9vfylrwhbcabmy348waw5c7gchabxvqrl4"; libraryHaskellDepends = [ base erf math-functions monad-loops mtl random random-shuffle random-source rvar syb template-haskell transformers vector @@ -207737,8 +208279,8 @@ self: { }: mkDerivation { pname = "random-source"; - version = "0.3.0.10"; - sha256 = "1ii7pr9dn6yfkkxsk504jmf6466phm15fhnk7894hhdg1qvfm43d"; + version = "0.3.0.11"; + sha256 = "0lwqbd0h495srgi2p8fsmsfk5hv5m3f6cxm12j61xx94fdyn98sv"; libraryHaskellDepends = [ base flexible-defaults mersenne-random-pure64 mtl mwc-random primitive random stateref syb template-haskell th-extras @@ -208800,26 +209342,6 @@ self: { }) {}; "rdf" = callPackage - ({ mkDerivation, attoparsec, base, bytestring, criterion, deepseq - , dlist, fgl, text, transformers - }: - mkDerivation { - pname = "rdf"; - version = "0.1.0.3"; - sha256 = "0bypvzr4xj3nvq839slhjcl6lzs4zp34yg6q3hdkwa5vgall6x2s"; - revision = "1"; - editedCabalFile = "0x5zdjbyrpap5qs40yl0m96fcgy11f6s5r3v0n8n5904cxa5sqy3"; - libraryHaskellDepends = [ - attoparsec base bytestring deepseq dlist fgl text transformers - ]; - benchmarkHaskellDepends = [ - base bytestring criterion deepseq text - ]; - description = "Representation and Incremental Processing of RDF Data"; - license = stdenv.lib.licenses.mit; - }) {}; - - "rdf_0_1_0_4" = callPackage ({ mkDerivation, attoparsec, base, bytestring, criterion, deepseq , dlist, fgl, text, transformers }: @@ -208835,7 +209357,6 @@ self: { ]; description = "Representation and Incremental Processing of RDF Data"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "rdf4h" = callPackage @@ -209691,15 +210212,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "reanimate-svg_0_10_0_0" = callPackage + "reanimate-svg_0_10_2_0" = callPackage ({ mkDerivation, attoparsec, base, bytestring, containers , double-conversion, hspec, JuicyPixels, lens, linear, mtl , scientific, svg-tree, text, transformers, vector, xml }: mkDerivation { pname = "reanimate-svg"; - version = "0.10.0.0"; - sha256 = "16m1829ashjwmsammqhxkifxpgwnhvxf84w36hqr3f0g0zmhfhai"; + version = "0.10.2.0"; + sha256 = "0czj7yii9h24823rl2jlf8pqc670azgbzhrkbizdr2bnrz6g981g"; libraryHaskellDepends = [ attoparsec base bytestring containers double-conversion JuicyPixels lens linear mtl scientific text transformers vector xml @@ -210633,8 +211154,8 @@ self: { }: mkDerivation { pname = "refined"; - version = "0.6"; - sha256 = "0clfkdj7lj33yryan50a37b6h434in8rwa6n9cnv8lwzvk0mayy6"; + version = "0.6.1"; + sha256 = "124sqpcii62jh2n2vfskg9jc8ic4hhlwmwim40f6a0dmhdnsh8lx"; libraryHaskellDepends = [ aeson base bytestring deepseq exceptions mtl QuickCheck template-haskell text these-skinny @@ -210830,8 +211351,8 @@ self: { pname = "reflex-basic-host"; version = "0.2.0.1"; sha256 = "1bax3rcrwi3447wd7apramw0f248ddksl8lrdjgrph26bbh8vc1i"; - revision = "1"; - editedCabalFile = "11bzd169wpdn57d7krgx9bw4x5qzskp9d5abdn74x6ipy34cj5ml"; + revision = "2"; + editedCabalFile = "0nqr2nxrq1xplcapr6yy8fx4x85qiqz609f7rzz656zah7cfm8dl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -215217,6 +215738,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rfc5051_0_2" = callPackage + ({ mkDerivation, base, containers, text }: + mkDerivation { + pname = "rfc5051"; + version = "0.2"; + sha256 = "0nri7js5ymywh2gi3li25wrkl1nf712qhbzw5hn46fib83qsq73k"; + libraryHaskellDepends = [ base containers text ]; + testHaskellDepends = [ base text ]; + description = "Simple unicode collation as per RFC5051"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rg" = callPackage ({ mkDerivation, array, base, fmt, possibly, tasty, tasty-hunit , text, unordered-containers, vector @@ -215736,6 +216270,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "rio_0_1_18_0" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , exceptions, filepath, hashable, hspec, microlens, microlens-mtl + , mtl, primitive, process, QuickCheck, text, time, typed-process + , unix, unliftio, unliftio-core, unordered-containers, vector + }: + mkDerivation { + pname = "rio"; + version = "0.1.18.0"; + sha256 = "11f1cxa9c90d7hgqn9bl08l499n2dzdj31f9pw9acb1nrlx5hik8"; + libraryHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + hashable microlens microlens-mtl mtl primitive process text time + typed-process unix unliftio unliftio-core unordered-containers + vector + ]; + testHaskellDepends = [ + base bytestring containers deepseq directory exceptions filepath + hashable hspec microlens microlens-mtl mtl primitive process + QuickCheck text time typed-process unix unliftio unliftio-core + unordered-containers vector + ]; + description = "A standard library for Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "rio-orphans" = callPackage ({ mkDerivation, base, exceptions, fast-logger, hspec , monad-control, monad-logger, resourcet, rio, transformers-base @@ -215774,6 +216335,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "rio-prettyprint_0_1_1_0" = callPackage + ({ mkDerivation, aeson, annotated-wl-pprint, ansi-terminal, array + , base, Cabal, colour, mtl, path, rio, text + }: + mkDerivation { + pname = "rio-prettyprint"; + version = "0.1.1.0"; + sha256 = "1h092l46pfm6k3n0vb6c67gb64kahzc97qv45rhvp0cq2y5bqykf"; + libraryHaskellDepends = [ + aeson annotated-wl-pprint ansi-terminal array base Cabal colour mtl + path rio text + ]; + description = "Pretty-printing for RIO"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "riot" = callPackage ({ mkDerivation, base, containers, directory, haskell98, mtl , ncurses, old-locale, packedstring, process, unix @@ -217280,15 +217858,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "rpmbuild-order_0_4_0" = callPackage + "rpmbuild-order_0_4_2" = callPackage ({ mkDerivation, base, bytestring, Cabal, case-insensitive , containers, directory, extra, fgl, filepath, hspec - , optparse-applicative, process, simple-cmd-args + , optparse-applicative, process, simple-cmd-args, unix }: mkDerivation { pname = "rpmbuild-order"; - version = "0.4.0"; - sha256 = "1whjid4nml07wyy9al9w63213qbd2iacwz8dsfv7a9b3vn31yd3k"; + version = "0.4.2"; + sha256 = "18ay3wga9s3whky49c8v0x7drpv1sf536p4n3h1549zd5w3vjms7"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -217299,7 +217877,7 @@ self: { base bytestring directory extra fgl optparse-applicative simple-cmd-args ]; - testHaskellDepends = [ base hspec ]; + testHaskellDepends = [ base extra hspec unix ]; description = "Order RPM packages by dependencies"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -217814,8 +218392,8 @@ self: { ({ mkDerivation, base, bytestring, file-embed, process, yaml }: mkDerivation { pname = "runhs"; - version = "1.0.0.3"; - sha256 = "019aabgxfkan0l3i8wawya84wix3qmclsx0lsc8p6hvz5fjdlx21"; + version = "1.0.0.4"; + sha256 = "01czfphzp252y62vrx1pys74xga3m7b6q9pbd0f20y3m74q337xi"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -218939,8 +219517,8 @@ self: { }: mkDerivation { pname = "sampling"; - version = "0.3.4"; - sha256 = "1cwx64llg6x6dnsld6lx6bmb4cljz8abqp0d6vmh4wk11vzjsly0"; + version = "0.3.5"; + sha256 = "13xkq8p656xybbpvkxp42qkkgc1majp18w384ap7l4sbxrxif7kv"; libraryHaskellDepends = [ base containers foldl mwc-random primitive vector ]; @@ -219648,6 +220226,24 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "scalpel-search" = callPackage + ({ mkDerivation, base, hspec, scalpel, scalpel-core, tagsoup, text + , uri + }: + mkDerivation { + pname = "scalpel-search"; + version = "0.1.0.0"; + sha256 = "0qq8q9z3s37wcc6iwygn2hfh72k5kak93vmsvl3wn0k04lrivg60"; + libraryHaskellDepends = [ base scalpel-core tagsoup text uri ]; + testHaskellDepends = [ + base hspec scalpel scalpel-core tagsoup text uri + ]; + description = "scalpel scrapers for search engines"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "scan" = callPackage ({ mkDerivation, base, parsec }: mkDerivation { @@ -225897,6 +226493,8 @@ self: { pname = "serversession"; version = "1.0.1"; sha256 = "08j8v6a2018bmvwsb7crdg0ajak74jggb073pdpx9s0pf3cfzyrz"; + revision = "1"; + editedCabalFile = "0sxr4c7nk16n51y53qwwjnvgqjdqjm1ybaqkf0r8y91fac8x47b5"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring data-default hashable nonce path-pieces text time transformers unordered-containers @@ -227213,30 +227811,36 @@ self: { }) {}; "shakebook" = callPackage - ({ mkDerivation, aeson, aeson-with, base, binary-instances, comonad - , comonad-extras, doctemplates, feed, free, hashable-time - , http-conduit, ixset-typed, ixset-typed-conversions, lens - , lens-aeson, mustache, pandoc, pandoc-types, path-extensions, rio - , shake-plus, sitemap-gen, slick, split, tasty, tasty-golden - , text-time, within, zipper-extra + ({ mkDerivation, aeson, aeson-better-errors, aeson-with, base + , binary, binary-instances, comonad, comonad-extras + , composite-aeson, composite-base, doctemplates, feed, free + , hashable-time, http-conduit, ixset-typed, ixset-typed-conversions + , lens, lens-aeson, lucid, lucid-cdn, mtl, mustache, pandoc + , pandoc-types, path, path-extensions, rio, shake-plus + , shake-plus-extended, sitemap-gen, slick, split, tasty + , tasty-golden, text-time, vinyl, zipper-extra }: mkDerivation { pname = "shakebook"; - version = "0.9.1.0"; - sha256 = "14b94gmy95whypmgqwbqr0kp5nrnk8s87dih35s85zsbmi2q1pzm"; + version = "0.11.0.0"; + sha256 = "0h6pq3y7ll5l83a682mwk60zipsm91w0srgrigdgi7l4wdhn7qzb"; libraryHaskellDepends = [ - aeson aeson-with base binary-instances comonad comonad-extras - doctemplates feed free hashable-time http-conduit ixset-typed - ixset-typed-conversions lens lens-aeson mustache pandoc - pandoc-types path-extensions rio shake-plus sitemap-gen slick split - text-time within zipper-extra + aeson aeson-better-errors aeson-with base binary binary-instances + comonad comonad-extras composite-aeson composite-base doctemplates + feed free hashable-time http-conduit ixset-typed + ixset-typed-conversions lens lens-aeson lucid lucid-cdn mtl + mustache pandoc pandoc-types path path-extensions rio shake-plus + shake-plus-extended sitemap-gen slick split text-time vinyl + zipper-extra ]; testHaskellDepends = [ - aeson aeson-with base binary-instances comonad comonad-extras - doctemplates feed free hashable-time http-conduit ixset-typed - ixset-typed-conversions lens lens-aeson mustache pandoc - pandoc-types path-extensions rio shake-plus sitemap-gen slick split - tasty tasty-golden text-time within zipper-extra + aeson aeson-better-errors aeson-with base binary binary-instances + comonad comonad-extras composite-aeson composite-base doctemplates + feed free hashable-time http-conduit ixset-typed + ixset-typed-conversions lens lens-aeson lucid lucid-cdn mtl + mustache pandoc pandoc-types path path-extensions rio shake-plus + shake-plus-extended sitemap-gen slick split tasty tasty-golden + text-time vinyl zipper-extra ]; description = "Shake-based technical documentation generator; HTML & PDF"; license = stdenv.lib.licenses.mit; @@ -231192,23 +231796,23 @@ self: { }) {}; "slynx" = callPackage - ({ mkDerivation, async, base, bytestring, containers, elynx-markov - , elynx-seq, elynx-tools, elynx-tree, hmatrix, megaparsec - , monad-logger, mwc-random, optparse-applicative, scientific, text + ({ mkDerivation, async, attoparsec, base, bytestring, containers + , elynx-markov, elynx-seq, elynx-tools, elynx-tree, hmatrix + , monad-logger, mwc-random, optparse-applicative, text , transformers, vector }: mkDerivation { pname = "slynx"; - version = "0.3.0"; - sha256 = "18nncc771b16ngkihza9skx1n73w811sg1p2hphp5pl7vkbl4wkr"; + version = "0.3.1"; + sha256 = "0af18y25lix0sy3vyl56d9a8yrvn9riw3vw2azwcq9pzia460qki"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - async base bytestring containers elynx-markov elynx-seq elynx-tools - elynx-tree hmatrix megaparsec monad-logger mwc-random - optparse-applicative scientific text transformers vector + async attoparsec base bytestring containers elynx-markov elynx-seq + elynx-tools elynx-tree hmatrix monad-logger mwc-random + optparse-applicative text transformers vector ]; - executableHaskellDepends = [ base elynx-seq elynx-tools ]; + executableHaskellDepends = [ base ]; description = "Handle molecular sequences"; license = stdenv.lib.licenses.gpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; @@ -235550,7 +236154,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "splitmix_0_1" = callPackage + "splitmix_0_1_0_1" = callPackage ({ mkDerivation, async, base, base-compat, base-compat-batteries , bytestring, clock, containers, criterion, deepseq, HUnit , math-functions, process, random, test-framework @@ -235558,8 +236162,8 @@ self: { }: mkDerivation { pname = "splitmix"; - version = "0.1"; - sha256 = "1yhbh6zsklz5fbas2v69xd2qi3xvk4zidzl0acv17fyxa9rwh48w"; + version = "0.1.0.1"; + sha256 = "0ahr3zxx0n9pjxpldrphqx5rhanar6alq3km7qvszipa8r46jjsd"; libraryHaskellDepends = [ base deepseq time ]; testHaskellDepends = [ async base base-compat base-compat-batteries bytestring containers @@ -236705,8 +237309,8 @@ self: { }: mkDerivation { pname = "stack"; - version = "2.3.1"; - sha256 = "1l17jdkr6ca3hwm4v8bshq2zbadqhb35hk2gfjy2dri1mdibcsdr"; + version = "2.3.3"; + sha256 = "1j2z8cgb9c56g39dh5ff2sri3r3vxddy6ymznkywn6d7c1z4j7qs"; configureFlags = [ "-fdisable-git-info" "-fhide-dependency-versions" "-fsupported-build" @@ -239237,63 +239841,60 @@ self: { ({ mkDerivation, array, async, base, base-orphans , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector , clock, containers, contravariant, criterion, cryptohash, deepseq - , directory, fail, filepath, free, ghc-prim, hashable, hspec + , directory, filepath, free, ghc-prim, hashable, hspec , hspec-smallcheck, integer-gmp, lifted-base, monad-control - , mono-traversable, network, primitive, resourcet, safe, semigroups - , smallcheck, store-core, syb, template-haskell, text, th-lift + , mono-traversable, network, primitive, resourcet, safe, smallcheck + , store-core, syb, template-haskell, text, th-lift , th-lift-instances, th-orphans, th-reify-many, th-utilities, time , transformers, unordered-containers, vector , vector-binary-instances, void, weigh }: mkDerivation { pname = "store"; - version = "0.7.4"; - sha256 = "1lipkzhdr6m5555r2p3s5g5i2am9kg34dznfakcsxv5z20vzd31z"; + version = "0.7.6"; + sha256 = "1gzax38chn57ybikvddk6g8msyv52y5s30yndpp64bdh3kqwlchq"; libraryHaskellDepends = [ array async base base-orphans base64-bytestring bifunctors bytestring containers contravariant cryptohash deepseq directory - fail filepath free ghc-prim hashable hspec hspec-smallcheck - integer-gmp lifted-base monad-control mono-traversable network - primitive resourcet safe semigroups smallcheck store-core syb - template-haskell text th-lift th-lift-instances th-orphans - th-reify-many th-utilities time transformers unordered-containers - vector void + filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp + lifted-base monad-control mono-traversable network primitive + resourcet safe smallcheck store-core syb template-haskell text + th-lift th-lift-instances th-orphans th-reify-many th-utilities + time transformers unordered-containers vector void ]; testHaskellDepends = [ array async base base-orphans base64-bytestring bifunctors bytestring clock containers contravariant cryptohash deepseq - directory fail filepath free ghc-prim hashable hspec - hspec-smallcheck integer-gmp lifted-base monad-control - mono-traversable network primitive resourcet safe semigroups - smallcheck store-core syb template-haskell text th-lift - th-lift-instances th-orphans th-reify-many th-utilities time - transformers unordered-containers vector void + directory filepath free ghc-prim hashable hspec hspec-smallcheck + integer-gmp lifted-base monad-control mono-traversable network + primitive resourcet safe smallcheck store-core syb template-haskell + text th-lift th-lift-instances th-orphans th-reify-many + th-utilities time transformers unordered-containers vector void ]; benchmarkHaskellDepends = [ array async base base-orphans base64-bytestring bifunctors bytestring cereal cereal-vector containers contravariant criterion - cryptohash deepseq directory fail filepath free ghc-prim hashable - hspec hspec-smallcheck integer-gmp lifted-base monad-control - mono-traversable network primitive resourcet safe semigroups - smallcheck store-core syb template-haskell text th-lift - th-lift-instances th-orphans th-reify-many th-utilities time - transformers unordered-containers vector vector-binary-instances - void weigh + cryptohash deepseq directory filepath free ghc-prim hashable hspec + hspec-smallcheck integer-gmp lifted-base monad-control + mono-traversable network primitive resourcet safe smallcheck + store-core syb template-haskell text th-lift th-lift-instances + th-orphans th-reify-many th-utilities time transformers + unordered-containers vector vector-binary-instances void weigh ]; description = "Fast binary serialization"; license = stdenv.lib.licenses.mit; }) {}; "store-core" = callPackage - ({ mkDerivation, base, bytestring, fail, ghc-prim, primitive, text + ({ mkDerivation, base, bytestring, ghc-prim, primitive, text , transformers }: mkDerivation { pname = "store-core"; - version = "0.4.4.2"; - sha256 = "184f3whh7kzc2fkm1mgllg06f002z8shayz1b8cvhal3qg1qahf9"; + version = "0.4.4.3"; + sha256 = "1b0fpv8wdp9lcvqplls548xrh336cb1m617fzd0ysbzqhhg5r3fv"; libraryHaskellDepends = [ - base bytestring fail ghc-prim primitive text transformers + base bytestring ghc-prim primitive text transformers ]; description = "Fast and lightweight binary serialization"; license = stdenv.lib.licenses.mit; @@ -239306,8 +239907,8 @@ self: { }: mkDerivation { pname = "store-streaming"; - version = "0.2.0.0"; - sha256 = "0fhcv0lvmhdc53fx9y2dvvykvap7dz4asnajy95kpwhaz6z1xc2k"; + version = "0.2.0.2"; + sha256 = "1hnzpyw5l90nrm3vlrwbv8517iaaq0razfjj6m8a41jy2lkgf4gz"; libraryHaskellDepends = [ async base bytestring conduit free resourcet store store-core streaming-commons text transformers @@ -239381,15 +239982,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_56_0" = callPackage + "stratosphere_0_57_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.56.0"; - sha256 = "00pszcypf0ckagxx2l5ldl0m6kacr3xbmw0yxfcjh6hs34543v8n"; + version = "0.57.0"; + sha256 = "1ksxy117bizi4bnj7skv5hq7rsw2gz0w5yg5b3xhc6ialkq9in4z"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -240387,6 +240988,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "strict_0_4" = callPackage + ({ mkDerivation, assoc, base, binary, bytestring, deepseq, ghc-prim + , hashable, text, these, transformers + }: + mkDerivation { + pname = "strict"; + version = "0.4"; + sha256 = "0gs5fqsrwsc3y5w6fp91p9frgh7h42kd9smyg04cw284d5wfx7r7"; + libraryHaskellDepends = [ + assoc base binary bytestring deepseq ghc-prim hashable text these + transformers + ]; + description = "Strict data types and String IO"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "strict-base" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -240488,6 +241106,17 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "strict-lens" = callPackage + ({ mkDerivation, base, lens, strict }: + mkDerivation { + pname = "strict-lens"; + version = "0.4"; + sha256 = "16sqk7kvg8322f0aflnsb7v76p1c1xfvn3h0hxgvmkb5ll1ak92y"; + libraryHaskellDepends = [ base lens strict ]; + description = "Lenses for types in strict package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "strict-list" = callPackage ({ mkDerivation, base, hashable, QuickCheck, quickcheck-instances , rerebase, semigroupoids, tasty, tasty-hunit, tasty-quickcheck @@ -240505,6 +241134,17 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "strict-optics" = callPackage + ({ mkDerivation, base, optics-core, strict }: + mkDerivation { + pname = "strict-optics"; + version = "0.4"; + sha256 = "1xy5yziq37h37irbg3win7risxc46s143iqqh95lqv08fybk5b09"; + libraryHaskellDepends = [ base optics-core strict ]; + description = "Optics for types in strict package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "strict-tuple" = callPackage ({ mkDerivation, base, bifunctors, deepseq, hashable }: mkDerivation { @@ -240719,6 +241359,8 @@ self: { pname = "string-interpolate"; version = "0.3.0.0"; sha256 = "0h7lqr5g11pr9ikzg7j26fgj9m8659j1vpcwggvndv6k71sh281a"; + revision = "1"; + editedCabalFile = "0id31zpxvmgs63acy3lx8myms5i8w70cfr1dx5yryzy5l66vaq0w"; libraryHaskellDepends = [ base bytestring haskell-src-exts haskell-src-meta split template-haskell text text-conversions utf8-string @@ -241596,6 +242238,39 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "stylish-haskell_0_11_0_3" = callPackage + ({ mkDerivation, aeson, base, bytestring, Cabal, containers + , directory, file-embed, filepath, haskell-src-exts, HsYAML + , HsYAML-aeson, HUnit, mtl, optparse-applicative, random + , semigroups, strict, syb, test-framework, test-framework-hunit + , text + }: + mkDerivation { + pname = "stylish-haskell"; + version = "0.11.0.3"; + sha256 = "10svl5q95n9i76rqvlxibi784qzvdyg8qfl1xwk7c32y84nyfibn"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring Cabal containers directory file-embed + filepath haskell-src-exts HsYAML HsYAML-aeson mtl semigroups syb + text + ]; + executableHaskellDepends = [ + aeson base bytestring Cabal containers directory file-embed + filepath haskell-src-exts HsYAML HsYAML-aeson mtl + optparse-applicative strict syb + ]; + testHaskellDepends = [ + aeson base bytestring Cabal containers directory file-embed + filepath haskell-src-exts HsYAML HsYAML-aeson HUnit mtl random syb + test-framework test-framework-hunit text + ]; + description = "Haskell code prettifier"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "stylist" = callPackage ({ mkDerivation, async, base, css-syntax, hashable, hspec , network-uri, QuickCheck, scientific, text, unordered-containers @@ -242932,8 +243607,8 @@ self: { }: mkDerivation { pname = "sweet-egison"; - version = "0.1.0.3"; - sha256 = "17xqkhlxqkmn1ayhsxl1pw3y4fqxbq4lcdaq9ispp57qd3dcvd7v"; + version = "0.1.1.0"; + sha256 = "1zd1l2gbg7dp53d4jzki6k8jqxdvqgy5gl6jdy325hx1fycrixql"; libraryHaskellDepends = [ backtracking base egison-pattern-src egison-pattern-src-th-mode haskell-src-exts haskell-src-meta logict template-haskell @@ -245917,6 +246592,33 @@ self: { broken = true; }) {}; + "tasty-bdd" = callPackage + ({ mkDerivation, aeson, aeson-qq, base, exceptions, free, HUnit + , microlens, microlens-th, mtl, pretty, pretty-show + , qm-interpolated-string, regex-posix, tagged, tasty + , tasty-expected-failure, tasty-fail-fast, tasty-hunit, temporary + , text, transformers, tree-diff + }: + mkDerivation { + pname = "tasty-bdd"; + version = "0.1.0.1"; + sha256 = "1da1983hampnkkm6kwxp8w1bkhzic27qbnkckkmsziaz8kbkhcpi"; + libraryHaskellDepends = [ + base exceptions free HUnit microlens microlens-th mtl pretty + pretty-show tagged tasty tasty-fail-fast tasty-hunit temporary text + transformers tree-diff + ]; + testHaskellDepends = [ + aeson aeson-qq base exceptions HUnit mtl qm-interpolated-string + regex-posix tasty tasty-expected-failure tasty-fail-fast + tasty-hunit temporary text transformers + ]; + description = "BDD tests language and tasty provider"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "tasty-dejafu" = callPackage ({ mkDerivation, base, dejafu, random, tagged, tasty }: mkDerivation { @@ -246076,8 +246778,8 @@ self: { pname = "tasty-hedgehog"; version = "1.0.0.2"; sha256 = "1vsv3m6brhshpqm8qixz97m7h0nx67cj6ira4cngbk7mf5rqylv5"; - revision = "3"; - editedCabalFile = "0vjr63nsc3z2jzc80clx2pzhcx1l53bqscwflvwwgjy0gmsshakd"; + revision = "4"; + editedCabalFile = "0z47ssv9030px81sxivhw5jp7yfpr6r6anlf03slks31jkzvx4gl"; libraryHaskellDepends = [ base hedgehog tagged tasty ]; testHaskellDepends = [ base hedgehog tasty tasty-expected-failure @@ -248792,6 +249494,28 @@ self: { broken = true; }) {}; + "testcontainers" = callPackage + ({ mkDerivation, aeson, aeson-optics, base, bytestring, exceptions + , hspec, hspec-discover, mtl, network, optics-core, process + , resourcet, tasty, tasty-discover, tasty-hspec, tasty-hunit, text + , unliftio-core + }: + mkDerivation { + pname = "testcontainers"; + version = "0.2.0.0"; + sha256 = "0drdi2qqgiw499lwvkdc5yn8x7mys6l4p47jcz0af62fczpa5dnh"; + libraryHaskellDepends = [ + aeson aeson-optics base bytestring exceptions mtl network + optics-core process resourcet tasty text unliftio-core + ]; + testHaskellDepends = [ + base hspec tasty tasty-discover tasty-hspec tasty-hunit text + ]; + testToolDepends = [ hspec-discover tasty-discover ]; + description = "Docker containers for your integration tests"; + license = stdenv.lib.licenses.mit; + }) {}; + "testing-feat" = callPackage ({ mkDerivation, base, QuickCheck, size-based , testing-type-modifiers @@ -250942,18 +251666,6 @@ self: { }) {}; "thread-hierarchy" = callPackage - ({ mkDerivation, base, containers, hspec, stm }: - mkDerivation { - pname = "thread-hierarchy"; - version = "0.3.0.1"; - sha256 = "0d2wbm75f59vj1h18afdhb1wqyclv5gpgj6pyrhbcnf7aa2490c1"; - libraryHaskellDepends = [ base containers stm ]; - testHaskellDepends = [ base containers hspec stm ]; - description = "Simple Haskel thread management in hierarchical manner"; - license = stdenv.lib.licenses.mit; - }) {}; - - "thread-hierarchy_0_3_0_2" = callPackage ({ mkDerivation, base, containers, hspec, hspec-discover, stm }: mkDerivation { pname = "thread-hierarchy"; @@ -250964,7 +251676,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Simple Haskell thread management in hierarchical manner"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "thread-local-storage" = callPackage @@ -250981,24 +251692,6 @@ self: { }) {}; "thread-supervisor" = callPackage - ({ mkDerivation, base, clock, containers, data-default, hspec - , QuickCheck, unliftio - }: - mkDerivation { - pname = "thread-supervisor"; - version = "0.1.0.0"; - sha256 = "1gn2h4c84fdhppwjzkj9sr2rggc5q7193lf1n8c6ggzz6k2cj2rs"; - libraryHaskellDepends = [ - base clock containers data-default unliftio - ]; - testHaskellDepends = [ - base clock data-default hspec QuickCheck unliftio - ]; - description = "A simplified implementation of Erlang/OTP like supervisor over thread"; - license = stdenv.lib.licenses.mit; - }) {}; - - "thread-supervisor_0_1_0_1" = callPackage ({ mkDerivation, base, clock, containers, data-default, hspec , hspec-discover, QuickCheck, unliftio }: @@ -251015,7 +251708,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "A simplified implementation of Erlang/OTP like supervisor over thread"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "threadPool" = callPackage @@ -253043,15 +253735,15 @@ self: { broken = true; }) {}; - "tldr_0_7_0" = callPackage + "tldr_0_7_1" = callPackage ({ mkDerivation, ansi-terminal, base, bytestring, cmark, containers , directory, filepath, optparse-applicative, semigroups, tasty , tasty-golden, text, typed-process }: mkDerivation { pname = "tldr"; - version = "0.7.0"; - sha256 = "1y0lw65k9kjmqk27hsq3gr40af4jnwksf739ihp2dg4llyrqgvhl"; + version = "0.7.1"; + sha256 = "1vc9rxyxczs7kswrjq2c4lziwvnwri53ng8yq4724hpjvybiqs57"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -253151,25 +253843,23 @@ self: { }) {}; "tlynx" = callPackage - ({ mkDerivation, aeson, array, base, bytestring, comonad + ({ mkDerivation, aeson, attoparsec, base, bytestring, comonad , containers, elynx-tools, elynx-tree, gnuplot, lifted-async - , megaparsec, monad-logger, mwc-random, optparse-applicative - , parallel, primitive, scientific, statistics, text, transformers - , vector + , monad-logger, mwc-random, optparse-applicative, parallel + , statistics, text, transformers, vector }: mkDerivation { pname = "tlynx"; - version = "0.3.0"; - sha256 = "070r7j87s3206a5hpkhlfszpnpc7ngil88r6iq2752kijjik2x6v"; + version = "0.3.1"; + sha256 = "172mbc79r14sccyghnbvcsa95lypas2gvqn1rf80f9yi2rsz9amy"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson array base bytestring comonad containers elynx-tools - elynx-tree gnuplot lifted-async megaparsec monad-logger mwc-random - optparse-applicative parallel primitive scientific statistics text - transformers vector + aeson attoparsec base bytestring comonad containers elynx-tools + elynx-tree gnuplot lifted-async monad-logger mwc-random + optparse-applicative parallel statistics text transformers vector ]; - executableHaskellDepends = [ base elynx-tools ]; + executableHaskellDepends = [ base ]; description = "Handle phylogenetic trees"; license = stdenv.lib.licenses.gpl3Plus; hydraPlatforms = stdenv.lib.platforms.none; @@ -261319,24 +262009,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "unordered-containers_0_2_11_0" = callPackage + "unordered-containers_0_2_12_0" = callPackage ({ mkDerivation, base, bytestring, ChasingBottoms, containers - , deepseq, deepseq-generics, gauge, hashable, hashmap, HUnit, mtl - , QuickCheck, random, test-framework, test-framework-hunit - , test-framework-quickcheck2 + , deepseq, gauge, hashable, hashmap, HUnit, mtl, QuickCheck, random + , test-framework, test-framework-hunit, test-framework-quickcheck2 }: mkDerivation { pname = "unordered-containers"; - version = "0.2.11.0"; - sha256 = "0z58qi781n1znjw35s1pq0k7fqn0995jqmrsznp1773gg66qqfib"; + version = "0.2.12.0"; + sha256 = "085x73b2cfab85nkbwmcvc5i6v8kbnpbiv35gnmgw44zlm7an7a8"; libraryHaskellDepends = [ base deepseq hashable ]; testHaskellDepends = [ base ChasingBottoms containers hashable HUnit QuickCheck random test-framework test-framework-hunit test-framework-quickcheck2 ]; benchmarkHaskellDepends = [ - base bytestring containers deepseq deepseq-generics gauge hashable - hashmap mtl random + base bytestring containers deepseq gauge hashable hashmap mtl + random ]; description = "Efficient hashing-based container types"; license = stdenv.lib.licenses.bsd3; @@ -263027,17 +263716,16 @@ self: { }) {}; "uuid-bytes" = callPackage - ({ mkDerivation, base, byteslice, bytesmith, HUnit - , natural-arithmetic, primitive, small-bytearray-builder, tasty - , tasty-hunit, wide-word + ({ mkDerivation, base, bytebuild, byteslice, bytesmith, HUnit + , natural-arithmetic, primitive, tasty, tasty-hunit, wide-word }: mkDerivation { pname = "uuid-bytes"; - version = "0.1.1.0"; - sha256 = "13kskg9j847w3f01pf0r24kf1nnfz5srfp268ip5n55ji26h5cmr"; + version = "0.1.2.0"; + sha256 = "08sfxj0900pgpbvasi2n2x93qwglir2ijc43fpn5xf0gq7z2b25r"; libraryHaskellDepends = [ - base byteslice bytesmith natural-arithmetic primitive - small-bytearray-builder wide-word + base bytebuild byteslice bytesmith natural-arithmetic primitive + wide-word ]; testHaskellDepends = [ base byteslice HUnit natural-arithmetic primitive tasty tasty-hunit @@ -266130,8 +266818,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.6.2"; - sha256 = "05lp2jwc4m432k1k9x8305a5a4m92lnxab4341lpmqc3vy30hz7a"; + version = "3.6.3"; + sha256 = "0w0887xrkai5xhky245gnjjfq7d8cw43l90rmfvhqxwdf7jkkxc8"; libraryHaskellDepends = [ base bytestring transformers vector ]; librarySystemDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; @@ -268796,20 +269484,20 @@ self: { "web-rep" = callPackage ({ mkDerivation, attoparsec, base, box, box-socket, clay - , concurrency, doctest, foldl, generic-lens - , interpolatedstring-perl6, language-javascript, lens, lucid, mtl - , numhask, optparse-generic, scotty, tasty, tasty-hspec, text - , transformers, unordered-containers, wai-middleware-static - , wai-websockets, websockets + , concurrency, doctest, generic-lens, interpolatedstring-perl6 + , language-javascript, lens, lucid, mtl, numhask, optparse-generic + , scotty, tasty, tasty-hspec, text, transformers + , unordered-containers, wai-middleware-static, wai-websockets + , websockets }: mkDerivation { pname = "web-rep"; - version = "0.6.0"; - sha256 = "1ljlmfcjhiiqmsw2zfvxifr13g35c0mj33rkdxih6yz948czz17m"; + version = "0.7.0"; + sha256 = "1045b19rjs1hgw92kq8z6wzm7jmx8k73ad9z4m2vzv1jwjhbgin4"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base box box-socket clay concurrency foldl generic-lens + attoparsec base box box-socket clay concurrency generic-lens interpolatedstring-perl6 language-javascript lens lucid mtl numhask scotty text transformers unordered-containers wai-middleware-static wai-websockets websockets @@ -269307,34 +269995,6 @@ self: { }) {}; "webex-teams-api" = callPackage - ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8 - , bytestring, conduit, data-default, hspec, http-conduit - , http-types, network-uri, optparse-applicative, text, utf8-string - , wai, warp - }: - mkDerivation { - pname = "webex-teams-api"; - version = "0.2.0.0"; - sha256 = "02x4g10r0rl1g4fbqkj8zxcbz64g8dck4d77f0gswkadsn5y6mkp"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson attoparsec base bitset-word8 bytestring conduit data-default - http-conduit network-uri text - ]; - executableHaskellDepends = [ - aeson base bytestring data-default http-conduit - optparse-applicative text utf8-string - ]; - testHaskellDepends = [ - aeson async attoparsec base bytestring data-default hspec - http-conduit http-types network-uri text wai warp - ]; - description = "A Haskell bindings for Webex Teams API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "webex-teams-api_0_2_0_1" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bitset-word8 , bytestring, conduit, data-default, hspec, hspec-discover , http-conduit, http-types, network-uri, optparse-applicative, text @@ -269361,35 +270021,9 @@ self: { testToolDepends = [ hspec-discover ]; description = "A Haskell bindings for Webex Teams API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webex-teams-conduit" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, conduit - , data-default, hspec, http-client, http-conduit, http-types - , network-uri, optparse-applicative, text, utf8-string, wai, warp - , webex-teams-api - }: - mkDerivation { - pname = "webex-teams-conduit"; - version = "0.2.0.0"; - sha256 = "0p9ffj3qm84c7m4w5bfpn53vcs96p7gdlyk87mjmc9h9i6v7sz0d"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base conduit webex-teams-api ]; - executableHaskellDepends = [ - base bytestring conduit data-default http-client - optparse-applicative text utf8-string webex-teams-api - ]; - testHaskellDepends = [ - aeson async base bytestring conduit data-default hspec http-conduit - http-types network-uri text wai warp webex-teams-api - ]; - description = "Conduit wrapper of Webex Teams List API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "webex-teams-conduit_0_2_0_1" = callPackage ({ mkDerivation, aeson, async, base, bytestring, conduit , data-default, hspec, hspec-discover, http-client, http-conduit , http-types, network-uri, optparse-applicative, text, utf8-string @@ -269413,35 +270047,9 @@ self: { testToolDepends = [ hspec-discover ]; description = "Conduit wrapper of Webex Teams List API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webex-teams-pipes" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, data-default - , hspec, http-client, http-conduit, http-types, network-uri - , optparse-applicative, pipes, text, utf8-string, wai, warp - , webex-teams-api - }: - mkDerivation { - pname = "webex-teams-pipes"; - version = "0.2.0.0"; - sha256 = "001ilf2yj6q8rqcagjlh28rad191jyjjr1cpk6cf84v66isdbykp"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ base pipes webex-teams-api ]; - executableHaskellDepends = [ - base bytestring data-default http-client optparse-applicative pipes - text utf8-string webex-teams-api - ]; - testHaskellDepends = [ - aeson async base bytestring data-default hspec http-conduit - http-types network-uri pipes text wai warp webex-teams-api - ]; - description = "Pipes wrapper of Webex Teams List API"; - license = stdenv.lib.licenses.mit; - }) {}; - - "webex-teams-pipes_0_2_0_1" = callPackage ({ mkDerivation, aeson, async, base, bytestring, data-default , hspec, hspec-discover, http-client, http-conduit, http-types , network-uri, optparse-applicative, pipes, text, utf8-string, wai @@ -269465,7 +270073,6 @@ self: { testToolDepends = [ hspec-discover ]; description = "Pipes wrapper of Webex Teams List API"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; }) {}; "webfinger-client" = callPackage @@ -273278,6 +273885,36 @@ self: { broken = true; }) {}; + "xlsx_0_8_1" = callPackage + ({ mkDerivation, attoparsec, base, base64-bytestring, binary-search + , bytestring, conduit, containers, criterion, data-default, deepseq + , Diff, errors, extra, filepath, groom, lens, mtl, network-uri + , old-locale, raw-strings-qq, safe, smallcheck, tasty, tasty-hunit + , tasty-smallcheck, text, time, transformers, vector, xeno + , xml-conduit, zip-archive, zlib + }: + mkDerivation { + pname = "xlsx"; + version = "0.8.1"; + sha256 = "1prb6369af2w0rni2ha32yzd9r17yi0xnyn1dzwdzq03maxikgy9"; + libraryHaskellDepends = [ + attoparsec base base64-bytestring binary-search bytestring conduit + containers data-default deepseq errors extra filepath lens mtl + network-uri old-locale safe text time transformers vector xeno + xml-conduit zip-archive zlib + ]; + testHaskellDepends = [ + base bytestring containers Diff groom lens mtl raw-strings-qq + smallcheck tasty tasty-hunit tasty-smallcheck text time vector + xml-conduit + ]; + benchmarkHaskellDepends = [ base bytestring criterion ]; + description = "Simple and incomplete Excel file parser/writer"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "xlsx-tabular" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, data-default , lens, text, xlsx @@ -276733,6 +277370,34 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-bin_1_6_0_6" = callPackage + ({ mkDerivation, base, bytestring, Cabal, conduit, conduit-extra + , containers, data-default-class, directory, file-embed, filepath + , fsnotify, http-client, http-client-tls, http-reverse-proxy + , http-types, network, optparse-applicative, process + , project-template, say, split, stm, streaming-commons, tar, text + , time, transformers, transformers-compat, unliftio + , unordered-containers, wai, wai-extra, warp, warp-tls, yaml, zlib + }: + mkDerivation { + pname = "yesod-bin"; + version = "1.6.0.6"; + sha256 = "044xk75pymw6limz08zicxp4lw8jqf6f2ilj8i2qw2h419w3ry9f"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring Cabal conduit conduit-extra containers + data-default-class directory file-embed filepath fsnotify + http-client http-client-tls http-reverse-proxy http-types network + optparse-applicative process project-template say split stm + streaming-commons tar text time transformers transformers-compat + unliftio unordered-containers wai wai-extra warp warp-tls yaml zlib + ]; + description = "The yesod helper executable"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-bootstrap" = callPackage ({ mkDerivation, base, blaze-html, blaze-markup, bootstrap-types , shakespeare, text, transformers, yesod-core, yesod-elements @@ -279549,8 +280214,8 @@ self: { }: mkDerivation { pname = "zeolite-lang"; - version = "0.7.1.0"; - sha256 = "1sdnnixy3n54nhr4kq3xa066nplgz19c03iwjvaahj2a0iir07m4"; + version = "0.8.0.0"; + sha256 = "1ahr69w65hd70jc0jrc3dfz1gnjqxlg9w24djzm6826wskg31fa9"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -280325,6 +280990,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) zlib;}; + "zlib_0_6_2_2" = callPackage + ({ mkDerivation, base, bytestring, QuickCheck, tasty, tasty-hunit + , tasty-quickcheck, zlib + }: + mkDerivation { + pname = "zlib"; + version = "0.6.2.2"; + sha256 = "1fii0qfc60lfp93vwb78p2fv3jjyklgdhw4ms262z6cysq6qkd84"; + libraryHaskellDepends = [ base bytestring ]; + librarySystemDepends = [ zlib ]; + testHaskellDepends = [ + base bytestring QuickCheck tasty tasty-hunit tasty-quickcheck + ]; + description = "Compression and decompression in the gzip and zlib formats"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) zlib;}; + "zlib-bindings" = callPackage ({ mkDerivation, base, bytestring, hspec, QuickCheck, zlib }: mkDerivation { @@ -280606,23 +281289,24 @@ self: { "zre" = callPackage ({ mkDerivation, async, attoparsec, base, binary, bytestring , cereal, containers, data-default, directory, filepath - , lifted-async, monad-control, mtl, network, network-bsd - , network-info, network-multicast, optparse-applicative, process - , QuickCheck, quickcheck-instances, random, repline, sockaddr, stm - , text, time, transformers-base, uuid, zeromq4-haskell + , lifted-async, lifted-base, monad-control, mtl, network + , network-bsd, network-info, network-multicast + , optparse-applicative, process, QuickCheck, quickcheck-instances + , random, repline, sockaddr, stm, text, time, transformers-base + , uuid, zeromq4-haskell }: mkDerivation { pname = "zre"; - version = "0.1.3.0"; - sha256 = "09wsfghrba6akhxwl19khln0w64p919glz14f6sdijiagmkd87zw"; + version = "0.1.4.0"; + sha256 = "1877q8qshp88sghnys6a52c6sjc9qxxg062j473fjyv0vc4cpy4d"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ async attoparsec base binary bytestring cereal containers - data-default directory filepath lifted-async monad-control mtl - network network-bsd network-info network-multicast - optparse-applicative process random sockaddr stm text time - transformers-base uuid zeromq4-haskell + data-default directory filepath lifted-async lifted-base + monad-control mtl network network-bsd network-info + network-multicast optparse-applicative process random sockaddr stm + text time transformers-base uuid zeromq4-haskell ]; executableHaskellDepends = [ async base bytestring lifted-async monad-control mtl From a08c537cfbdaff6ca7b6cd8b96b778eb483b3c19 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 7 Aug 2020 17:22:02 +0200 Subject: [PATCH 137/143] ghc-8.10.x: update override for dhall --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 6be0c3c9b1a1..60d740212c4b 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -67,7 +67,7 @@ self: super: { unliftio-core = doJailbreak super.unliftio-core; # Use the latest version to fix the build. - dhall = self.dhall_1_33_1; + dhall = self.dhall_1_34_0; lens = self.lens_4_19_2; optics-core = self.optics-core_0_3; repline = self.repline_0_4_0_0; From b38e6cf1c69a6f6e205b82fcfa501c250f07ee23 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 7 Aug 2020 17:22:36 +0200 Subject: [PATCH 138/143] ghc-8.10.x: update override for optics-core --- pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix index 60d740212c4b..f2dd8942b8c7 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix @@ -69,7 +69,7 @@ self: super: { # Use the latest version to fix the build. dhall = self.dhall_1_34_0; lens = self.lens_4_19_2; - optics-core = self.optics-core_0_3; + optics-core = self.optics-core_0_3_0_1; repline = self.repline_0_4_0_0; singletons = self.singletons_2_7; th-desugar = self.th-desugar_1_11; From f50a34bbef30f08ec80ad54ecded822379c2a362 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 7 Aug 2020 20:09:22 +0200 Subject: [PATCH 139/143] haskell-lsp-test: update override to the latest version --- pkgs/development/haskell-modules/configuration-common.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index c32cda5ee09d..4740cf142442 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1336,7 +1336,7 @@ self: super: { })).override { # we are faster than stack here hie-bios = dontCheck self.hie-bios_0_6_1; - lsp-test = dontCheck self.lsp-test_0_11_0_3; + lsp-test = dontCheck self.lsp-test_0_11_0_4; }); haskell-language-server = (overrideCabal super.haskell-language-server @@ -1356,7 +1356,7 @@ self: super: { ghcide = self.hls-ghcide; # we are faster than stack here hie-bios = dontCheck self.hie-bios_0_6_1; - lsp-test = dontCheck self.lsp-test_0_11_0_3; + lsp-test = dontCheck self.lsp-test_0_11_0_4; }; # https://github.com/kowainik/policeman/issues/57 From ed1623421fe0d53645973d50fced54e8c2548121 Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Fri, 19 Jun 2020 21:06:42 +1200 Subject: [PATCH 140/143] ghcHEAD: 8.11.20200505 -> 8.11.20200731 --- pkgs/development/compilers/ghc/head.nix | 20 +++++++------- .../configuration-ghc-head.nix | 1 + pkgs/top-level/haskell-packages.nix | 27 +++++++++++++++++++ 3 files changed, 38 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index a15ef7f7dbf8..4b9ff94963dc 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -20,9 +20,9 @@ # build-time dependency too. buildLlvmPackages, llvmPackages -, # If enabled, GHC will be built with the GPL-free but slower integer-simple - # library instead of the faster but GPLed integer-gmp library. - enableIntegerSimple ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms) +, # If enabled, GHC will be built with the GPL-free but slightly slower native + # bignum backend instead of the faster but GPLed gmp backend. + enableNativeBignum ? !(stdenv.lib.any (stdenv.lib.meta.platformMatch stdenv.hostPlatform) gmp.meta.platforms) , gmp , # If enabled, use -fPIC when compiling static libs. @@ -35,7 +35,7 @@ , # Whether to build terminfo. enableTerminfo ? !stdenv.targetPlatform.isWindows -, version ? "8.11.20200505" +, version ? "8.11.20200731" , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) @@ -46,7 +46,7 @@ disableLargeAddressSpace ? stdenv.targetPlatform.isDarwin && stdenv.targetPlatform.isAarch64 }: -assert !enableIntegerSimple -> gmp != null; +assert !enableNativeBignum -> gmp != null; let inherit (stdenv) buildPlatform hostPlatform targetPlatform; @@ -64,7 +64,7 @@ let include mk/flavours/\$(BuildFlavour).mk endif DYNAMIC_GHC_PROGRAMS = ${if enableShared then "YES" else "NO"} - INTEGER_LIBRARY = ${if enableIntegerSimple then "integer-simple" else "integer-gmp"} + BIGNUM_BACKEND = ${if enableNativeBignum then "native" else "gmp"} '' + stdenv.lib.optionalString (targetPlatform != hostPlatform) '' Stage1Only = ${if targetPlatform.system == hostPlatform.system then "NO" else "YES"} CrossCompilePrefix = ${targetPrefix} @@ -81,7 +81,7 @@ let # Splicer will pull out correct variations libDeps = platform: stdenv.lib.optional enableTerminfo ncurses ++ [libffi] - ++ stdenv.lib.optional (!enableIntegerSimple) gmp + ++ stdenv.lib.optional (!enableNativeBignum) gmp ++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv ++ stdenv.lib.optional enableDwarf elfutils; @@ -103,8 +103,8 @@ stdenv.mkDerivation (rec { src = fetchgit { url = "https://gitlab.haskell.org/ghc/ghc.git/"; - rev = "40c71c2cf38b4e134d81b7184a4d5e02949ae70c"; - sha256 = "04h9rcyzm9w3an1z00hjs062dp7dl19b8pkyxjsypr7a2i9dmvkb"; + rev = "380638a33691ba43fdcd2e18bca636750e5f66f1"; + sha256 = "029cgiyhddvwnx5zx31i0vgj13zsvzb8fna99zr6ifscz6x7rid1"; }; enableParallelBuilding = true; @@ -173,7 +173,7 @@ stdenv.mkDerivation (rec { "--with-system-libffi" "--with-ffi-includes=${targetPackages.libffi.dev}/include" "--with-ffi-libraries=${targetPackages.libffi.out}/lib" - ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableIntegerSimple) [ + ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && !enableNativeBignum) [ "--with-gmp-includes=${targetPackages.gmp.dev}/include" "--with-gmp-libraries=${targetPackages.gmp.out}/lib" ] ++ stdenv.lib.optionals (targetPlatform == hostPlatform && hostPlatform.libc != "glibc" && !targetPlatform.isWindows) [ diff --git a/pkgs/development/haskell-modules/configuration-ghc-head.nix b/pkgs/development/haskell-modules/configuration-ghc-head.nix index 09755e4cc947..8d084162783f 100644 --- a/pkgs/development/haskell-modules/configuration-ghc-head.nix +++ b/pkgs/development/haskell-modules/configuration-ghc-head.nix @@ -26,6 +26,7 @@ self: super: { filepath = null; ghc-boot = null; ghc-boot-th = null; + ghc-bignum = null; ghc-compact = null; ghc-heap = null; ghci = null; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 662ba91514dd..2882abda7396 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -8,6 +8,12 @@ let "ghcjs" "ghcjs86" "integer-simple" + "native-bignum" + "ghcHEAD" + ]; + + nativeBignumIncludes = [ + "ghcHEAD" ]; haskellLib = import ../development/haskell-modules/lib.nix { @@ -97,6 +103,16 @@ in { in pkgs.recurseIntoAttrs (pkgs.lib.genAttrs integerSimpleGhcNames (name: compiler.${name}.override { enableIntegerSimple = true; })); + + # Starting from GHC 9, integer-{simple,gmp} is replaced by ghc-bignum + # with "native" and "gmp" backends. + native-bignum = let + nativeBignumGhcNames = pkgs.lib.filter + (name: builtins.elem name nativeBignumIncludes) + (pkgs.lib.attrNames compiler); + in pkgs.recurseIntoAttrs (pkgs.lib.genAttrs + nativeBignumGhcNames + (name: compiler.${name}.override { enableNativeBignum = true; })); }; # Default overrides that are applied to all package sets. @@ -170,5 +186,16 @@ in { }; }); + native-bignum = let + nativeBignumGhcNames = pkgs.lib.filter + (name: builtins.elem name nativeBignumIncludes) + (pkgs.lib.attrNames compiler); + in pkgs.lib.genAttrs nativeBignumGhcNames (name: packages.${name}.override { + ghc = bh.compiler.native-bignum.${name}; + buildHaskellPackages = bh.packages.native-bignum.${name}; + overrides = _self : _super : { + integer-gmp = null; + }; + }); }; } From adcaeef3840e05cd3207db829ca8ecb98d8a2285 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 7 Aug 2020 18:57:06 +0000 Subject: [PATCH 141/143] wob: 0.8 -> 0.9 --- pkgs/tools/misc/wob/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/wob/default.nix b/pkgs/tools/misc/wob/default.nix index d9ea0648ebe4..a55fd0624ecd 100644 --- a/pkgs/tools/misc/wob/default.nix +++ b/pkgs/tools/misc/wob/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "wob"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "francma"; repo = pname; rev = version; - sha256 = "0gzqc75wjm3yj81rm03zkp5lvsmlhhp79qlz85yyan1gcz5spdb6"; + sha256 = "02skvaj1q05c2r9fx83dlq44aksbw2fhpiv529rd154lh3pf07bc"; }; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland ]; From 036d924844a1ba6c63f7ed335b8d37941df1701d Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Fri, 7 Aug 2020 10:52:50 -0700 Subject: [PATCH 142/143] python3Packages.vega: fix build --- pkgs/development/python-modules/vega/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vega/default.nix b/pkgs/development/python-modules/vega/default.nix index b193ee27d54d..b81481b0774a 100644 --- a/pkgs/development/python-modules/vega/default.nix +++ b/pkgs/development/python-modules/vega/default.nix @@ -1,5 +1,5 @@ { stdenv, buildPythonPackage , fetchPypi, pythonOlder -, pytest, jupyter_core, pandas, ipywidgets }: +, pytest, jupyter_core, pandas, ipywidgets, jupyter, altair }: buildPythonPackage rec { pname = "vega"; @@ -12,7 +12,11 @@ buildPythonPackage rec { }; buildInputs = [ pytest ]; - propagatedBuildInputs = [ jupyter_core pandas ipywidgets ]; + propagatedBuildInputs = [ jupyter jupyter_core pandas ipywidgets ]; + + # currently, recommonmark is broken on python3 + doCheck = false; + checkInputs = [ altair ]; meta = with stdenv.lib; { description = "An IPython/Jupyter widget for Vega and Vega-Lite"; From c9c957d47605b6080b4ba83262107bc4aa0360b8 Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Fri, 7 Aug 2020 23:29:34 +0300 Subject: [PATCH 143/143] gopls: 0.4.3 -> 0.4.4 (#94888) --- pkgs/development/tools/gopls/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix index cfa4defe04b0..1d327d56adee 100644 --- a/pkgs/development/tools/gopls/default.nix +++ b/pkgs/development/tools/gopls/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gopls"; - version = "0.4.3"; + version = "0.4.4"; src = fetchgit { rev = "gopls/v${version}"; url = "https://go.googlesource.com/tools"; - sha256 = "1r670c7p63l0fhx671r3mb1jgvvfv1382079fv59z07j5j5hizbc"; + sha256 = "1h4ica6rwrdp5wg4ybpzvyvszj4m5l6w9hpvd9r2qcd9qdnqlykf"; }; modRoot = "gopls"; - vendorSha256 = "1xdvkdkvk7a32jspzjcgxkfdn78d2zm53wxmc9c4sqysxsgy6lbw"; + vendorSha256 = "175051d858lsdir2hj5qcimp6hakbi9grpws1ssvk3r2jna27x1z"; meta = with stdenv.lib; { description = "Official language server for the Go language";