diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS index eba0bf6513..ec4222a0d4 100644 --- a/third_party/nixpkgs/.github/CODEOWNERS +++ b/third_party/nixpkgs/.github/CODEOWNERS @@ -95,8 +95,8 @@ /pkgs/development/perl-modules @volth @stigtsp # R -/pkgs/applications/science/math/R @peti -/pkgs/development/r-modules @peti +/pkgs/applications/science/math/R @jbedo @bcdarwin +/pkgs/development/r-modules @jbedo @bcdarwin # Ruby /pkgs/development/interpreters/ruby @marsam diff --git a/third_party/nixpkgs/lib/default.nix b/third_party/nixpkgs/lib/default.nix index 56859d85ff..bb99a1be8a 100644 --- a/third_party/nixpkgs/lib/default.nix +++ b/third_party/nixpkgs/lib/default.nix @@ -91,7 +91,7 @@ let concatImapStringsSep makeSearchPath makeSearchPathOutput makeLibraryPath makeBinPath optionalString hasInfix hasPrefix hasSuffix stringToCharacters stringAsChars escape - escapeShellArg escapeShellArgs replaceChars lowerChars + escapeShellArg escapeShellArgs escapeRegex replaceChars lowerChars upperChars toLower toUpper addContextFrom splitString removePrefix removeSuffix versionOlder versionAtLeast getName getVersion diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 568f00696f..37711fe0fa 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -3419,6 +3419,12 @@ githubId = 454695; name = "Artur Taranchiev"; }; + exarkun = { + email = "exarkun@twistedmatrix.com"; + github = "exarkun"; + githubId = 254565; + name = "Jean-Paul Calderone"; + }; exfalso = { email = "0slemi0@gmail.com"; github = "exfalso"; diff --git a/third_party/nixpkgs/nixos/modules/programs/captive-browser.nix b/third_party/nixpkgs/nixos/modules/programs/captive-browser.nix index 007b0369ec..d7684d08c6 100644 --- a/third_party/nixpkgs/nixos/modules/programs/captive-browser.nix +++ b/third_party/nixpkgs/nixos/modules/programs/captive-browser.nix @@ -85,18 +85,18 @@ in programs.captive-browser.dhcp-dns = let - iface = prefix: - optionalString cfg.bindInterface (concatStringsSep " " (map escapeShellArg [ prefix cfg.interface ])); + iface = prefixes: + optionalString cfg.bindInterface (escapeShellArgs (prefixes ++ [ cfg.interface ])); in mkOptionDefault ( if config.networking.networkmanager.enable then - "${pkgs.networkmanager}/bin/nmcli dev show ${iface ""} | ${pkgs.gnugrep}/bin/fgrep IP4.DNS" + "${pkgs.networkmanager}/bin/nmcli dev show ${iface []} | ${pkgs.gnugrep}/bin/fgrep IP4.DNS" else if config.networking.dhcpcd.enable then - "${pkgs.dhcpcd}/bin/dhcpcd ${iface "-U"} | ${pkgs.gnugrep}/bin/fgrep domain_name_servers" + "${pkgs.dhcpcd}/bin/dhcpcd ${iface ["-U"]} | ${pkgs.gnugrep}/bin/fgrep domain_name_servers" else if config.networking.useNetworkd then - "${cfg.package}/bin/systemd-networkd-dns ${iface ""}" + "${cfg.package}/bin/systemd-networkd-dns ${iface []}" else - "${config.security.wrapperDir}/udhcpc --quit --now -f ${iface "-i"} -O dns --script ${ + "${config.security.wrapperDir}/udhcpc --quit --now -f ${iface ["-i"]} -O dns --script ${ pkgs.writeShellScript "udhcp-script" '' if [ "$1" = bound ]; then echo "$dns" diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addon-manager.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addon-manager.nix index 1378b5ccfb..821f1aa546 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addon-manager.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/addon-manager.nix @@ -84,6 +84,9 @@ in Restart = "on-failure"; RestartSec = 10; }; + unitConfig = { + StartLimitIntervalSec = 0; + }; }; services.kubernetes.addonManager.bootstrapAddons = mkIf isRBACEnabled diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/apiserver.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/apiserver.nix index f842f784b3..2c89310beb 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/apiserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/apiserver.nix @@ -398,6 +398,10 @@ in Restart = "on-failure"; RestartSec = 5; }; + + unitConfig = { + StartLimitIntervalSec = 0; + }; }; services.etcd = { diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/controller-manager.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/controller-manager.nix index 0c81fa9ae4..7128b5f70b 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/controller-manager.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/controller-manager.nix @@ -146,6 +146,9 @@ in User = "kubernetes"; Group = "kubernetes"; }; + unitConfig = { + StartLimitIntervalSec = 0; + }; path = top.path; }; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix index fcfcc84354..08f5cdfdf3 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -337,6 +337,9 @@ in ''; WorkingDirectory = top.dataDir; }; + unitConfig = { + StartLimitIntervalSec = 0; + }; }; # Allways include cni plugins diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/proxy.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/proxy.nix index 42729f5464..a92043d525 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/proxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/proxy.nix @@ -77,6 +77,9 @@ in Restart = "on-failure"; RestartSec = 5; }; + unitConfig = { + StartLimitIntervalSec = 0; + }; }; services.kubernetes.proxy.hostname = with config.networking; mkDefault hostName; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/scheduler.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/scheduler.nix index 454c689759..1b0c22a114 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/scheduler.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/scheduler.nix @@ -79,6 +79,9 @@ in Restart = "on-failure"; RestartSec = 5; }; + unitConfig = { + StartLimitIntervalSec = 0; + }; }; services.kubernetes.pki.certs = { diff --git a/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix b/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix index bac437c752..f3500f46e3 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/dovecot.nix @@ -429,6 +429,7 @@ in startLimitIntervalSec = 60; # 1 min serviceConfig = { + Type = "notify"; ExecStart = "${dovecotPkg}/sbin/dovecot -F"; ExecReload = "${dovecotPkg}/sbin/doveadm reload"; Restart = "on-failure"; diff --git a/third_party/nixpkgs/nixos/modules/services/mail/rspamd.nix b/third_party/nixpkgs/nixos/modules/services/mail/rspamd.nix index 473ddd5235..c78f464235 100644 --- a/third_party/nixpkgs/nixos/modules/services/mail/rspamd.nix +++ b/third_party/nixpkgs/nixos/modules/services/mail/rspamd.nix @@ -371,8 +371,9 @@ in }; services.postfix.config = mkIf cfg.postfix.enable cfg.postfix.config; - systemd.services.postfix.serviceConfig.SupplementaryGroups = - mkIf cfg.postfix.enable [ postfixCfg.group ]; + systemd.services.postfix = mkIf cfg.postfix.enable { + serviceConfig.SupplementaryGroups = [ postfixCfg.group ]; + }; # Allow users to run 'rspamc' and 'rspamadm'. environment.systemPackages = [ pkgs.rspamd ]; diff --git a/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix b/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix index 17cfdfb244..ceb1998709 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -463,7 +463,7 @@ in default = "common"; example = "combined"; description = '' - Log format for log files. Possible values are: combined, common, referer, agent. + Log format for log files. Possible values are: combined, common, referer, agent, none. See for more details. ''; }; diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 314c031bb3..55b58d3bf2 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -221,10 +221,7 @@ in knot = handleTest ./knot.nix {}; krb5 = discoverTests (import ./krb5 {}); ksm = handleTest ./ksm.nix {}; - kubernetes.dns = handleTestOn ["x86_64-linux"] ./kubernetes/dns.nix {}; - # kubernetes.e2e should eventually replace kubernetes.rbac when it works - #kubernetes.e2e = handleTestOn ["x86_64-linux"] ./kubernetes/e2e.nix {}; - kubernetes.rbac = handleTestOn ["x86_64-linux"] ./kubernetes/rbac.nix {}; + kubernetes = handleTestOn ["x86_64-linux"] ./kubernetes {}; latestKernel.hardened = handleTest ./hardened.nix { latestKernel = true; }; latestKernel.login = handleTest ./login.nix { latestKernel = true; }; leaps = handleTest ./leaps.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/kbd-update-search-paths-patch.nix b/third_party/nixpkgs/nixos/tests/kbd-update-search-paths-patch.nix index 2967ee4890..2cdb12340b 100644 --- a/third_party/nixpkgs/nixos/tests/kbd-update-search-paths-patch.nix +++ b/third_party/nixpkgs/nixos/tests/kbd-update-search-paths-patch.nix @@ -10,6 +10,7 @@ import ./make-test-python.nix ({ pkgs, ... }: { testScript = '' command = "${pkgs.kbd}/bin/setfont ter-112n 2>&1" (status, out) = machine.execute(command) + import re pattern = re.compile(r".*Unable to find file:.*") match = pattern.match(out) if match: diff --git a/third_party/nixpkgs/nixos/tests/kubernetes/default.nix b/third_party/nixpkgs/nixos/tests/kubernetes/default.nix index a801759bf5..90b73c68a7 100644 --- a/third_party/nixpkgs/nixos/tests/kubernetes/default.nix +++ b/third_party/nixpkgs/nixos/tests/kubernetes/default.nix @@ -1,7 +1,15 @@ -{ system ? builtins.currentSystem }: +{ system ? builtins.currentSystem +, pkgs ? import { inherit system; } +}: +let + dns = import ./dns.nix { inherit system pkgs; }; + rbac = import ./rbac.nix { inherit system pkgs; }; + # TODO kubernetes.e2e should eventually replace kubernetes.rbac when it works + # e2e = import ./e2e.nix { inherit system pkgs; }; +in { - dns = import ./dns.nix { inherit system; }; - # e2e = import ./e2e.nix { inherit system; }; # TODO: make it pass - # the following test(s) can be removed when e2e is working: - rbac = import ./rbac.nix { inherit system; }; + dns-single-node = dns.singlenode.test; + dns-multi-node = dns.multinode.test; + rbac-single-node = rbac.singlenode.test; + rbac-multi-node = rbac.multinode.test; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix b/third_party/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix index d53bfee9ef..5dc6af60c2 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mopidy/mopidy.nix @@ -4,13 +4,13 @@ pythonPackages.buildPythonApplication rec { pname = "mopidy"; - version = "3.1.1"; + version = "3.2.0"; src = fetchFromGitHub { owner = "mopidy"; repo = "mopidy"; rev = "v${version}"; - sha256 = "14m80z9spi2vhfs2bbff7ky80mr6bksl4550y17hwd7zpkid60za"; + sha256 = "1l1rya48ykiq156spm8pfsm6li8apz66ppz7gs4s91fv7g7l5x2f"; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/ptcollab/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ptcollab/default.nix index c5b9f2b804..2738a86534 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ptcollab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ptcollab/default.nix @@ -13,13 +13,13 @@ mkDerivation rec { pname = "ptcollab"; - version = "0.4.1"; + version = "0.4.2"; src = fetchFromGitHub { owner = "yuxshao"; repo = "ptcollab"; rev = "v${version}"; - sha256 = "sha256-98v9it9M5FXCsOpWvO10uKYmEH15v1FEH1hH73XHa7w="; + sha256 = "sha256-AeIjc+FoFsTcyWl261GvyySIHP107rL4JkuMXFhnPbk="; }; nativeBuildInputs = [ qmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix index b2fc34ca57..656c5974be 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix @@ -7,16 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.9.9"; + version = "0.9.9-1"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "sha256-GsGa2y718qWQlP0pLy8X3mVsFpNNnOTVQZpp4+e1RhA="; + sha256 = "sha256-EmnrwBMHb9jpEZAG393yyMaFRRQJ6YYDRvsp+ATT7MY="; }; - cargoSha256 = "03lnw61pgp88iwz2gbcp8y3jvz6v94cn0ynjz6snb9jq88gf25dz"; + cargoHash = "sha256-WzsaUrqe7F4x+ShqG14kq78MTSWIxIMRa3pdr3RXrwk="; nativeBuildInputs = [ clang ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/helix/default.nix b/third_party/nixpkgs/pkgs/applications/editors/helix/default.nix index 66c0e092fc..a46124daab 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/helix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/helix/default.nix @@ -2,17 +2,17 @@ rustPlatform.buildRustPackage rec { pname = "helix"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "helix-editor"; repo = pname; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-iCNA+gZer6BycWnhosDFRuxfS6QAb06XTix/vFsaey0="; + sha256 = "sha256-lScMHZ/pLcHkuvv8kSKnYK5AFVxyhOUMFdsu3nlDVD0="; }; - cargoSha256 = "sha256-sqXPgtLMXa3kMQlnw2xDBEsVfjeRXO6Zp6NEFS/0h20="; + cargoSha256 = "sha256-N5vlPoYyksHEZsyia8u8qtoEBY6qsXqO9CRBFaTQmiw="; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/texmaker/default.nix b/third_party/nixpkgs/pkgs/applications/editors/texmaker/default.nix index 960e730112..265783fe87 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/texmaker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/texmaker/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "texmaker"; - version = "5.1.0"; + version = "5.1.1"; src = fetchurl { url = "http://www.xm1math.net/texmaker/${pname}-${version}.tar.bz2"; - sha256 = "0zhqq9s5r2w44p7xhlxkj0c10jyx0hji5bjdpgp7xdlrvckr9yf6"; + sha256 = "sha256-gANJknSWIMN+B0uAOtPil8EbjyWt4E+xOxOseR87Dd4="; }; buildInputs = [ qtbase qtscript poppler zlib qtwebengine ]; diff --git a/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix b/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix index 4fdb4a44b2..4a53d585fe 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/tiled/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "tiled"; - version = "1.7.0"; + version = "1.7.2"; src = fetchFromGitHub { owner = "bjorn"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XVIkyf9cQZXjFuGGCliCSY22X8EkoPEl1EpGCrMTsgY="; + sha256 = "sha256-yQWe27zLWOnRQk+MEpuWs8CFP/le3PQ+yziB0ikNang="; }; nativeBuildInputs = [ pkg-config qmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/meh/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/meh/default.nix index 28f307d6ce..d23176c251 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/meh/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/meh/default.nix @@ -1,18 +1,17 @@ { lib, stdenv, fetchFromGitHub, libX11, libXext, libjpeg, libpng, giflib }: stdenv.mkDerivation { - name = "meh-unstable-2015-04-11"; + pname = "meh"; + version = "unstable-2018-10-22"; src = fetchFromGitHub { owner = "jhawthorn"; repo = "meh"; - rev = "4ab1c75f97cb70543db388b3ed99bcfb7e94c758"; - sha256 = "1j1n3m9hjhz4faryai97jq7cr6a322cqrd878gpkm9nrikap3bkk"; + rev = "69f653a1f16d11b12e5b600e808a740898f3223e"; + sha256 = "sha256-srSwoaajW4H4+kmE7NQAqVz9d/1q2XQ5ayQaOcGwzI0="; }; - installPhase = '' - make PREFIX=$out install - ''; + installFlags = [ "PREFIX=${placeholder "out"}" ]; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/applications/kde/bomber.nix b/third_party/nixpkgs/pkgs/applications/kde/bomber.nix index c2a5329ee2..d8840e1bfe 100644 --- a/third_party/nixpkgs/pkgs/applications/kde/bomber.nix +++ b/third_party/nixpkgs/pkgs/applications/kde/bomber.nix @@ -6,7 +6,7 @@ mkDerivation { pname = "bomber"; meta = with lib; { - homepage = "https://kde.org/applications/en/games/org.kde.bomber"; + homepage = "https://apps.kde.org/bomber/"; description = "A single player arcade game"; longDescription = '' Bomber is a single player arcade game. The player is invading various diff --git a/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix index 66d73c94b4..62bcf6a99d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "cointop"; - version = "1.6.5"; + version = "1.6.6"; src = fetchFromGitHub { owner = "miguelmota"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pnh4z7vk8xazdBPNbwR5BrKFbi8df8UTM2SOU+KDvsk="; + sha256 = "sha256-cn2TtXIxBnEZyWAdtf9ING9I/53z6D8UPVxnFVSkGgo="; }; goPackagePath = "github.com/miguelmota/cointop"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix index 507a1aeb90..d5966d1dbd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mob/default.nix @@ -2,14 +2,14 @@ buildGoPackage rec { pname = "mob"; - version = "1.8.0"; + version = "1.9.0"; goPackagePath = "github.com/remotemobprogramming/mob"; src = fetchFromGitHub { rev = "v${version}"; owner = "remotemobprogramming"; repo = pname; - sha256 = "sha256-GA+MmZU1KEg3HIU225Llr5W4dHGFGiMr/j0N/CslBC4="; + sha256 = "sha256-PvFECy5wgpdOdToeYsW+NiVC2LXkBCMBorIl8m++Lic="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/notejot/default.nix b/third_party/nixpkgs/pkgs/applications/misc/notejot/default.nix index c0c68ac88a..213bb9a76b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/notejot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/notejot/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "notejot"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - hash = "sha256-jR1zOmVkFGgA5bzMDHQ8HMToi18Y3n2aJDx7pwsZEhM="; + hash = "sha256-OmzEwShIpzIbonqwQmpdutd3tztm7Gmmo3qdt+DApWo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/premid/default.nix b/third_party/nixpkgs/pkgs/applications/misc/premid/default.nix new file mode 100644 index 0000000000..98ac0de326 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/premid/default.nix @@ -0,0 +1,92 @@ +{ autoPatchelfHook, makeDesktopItem, lib, stdenv, wrapGAppsHook, fetchurl, copyDesktopItems +, alsa-lib, at-spi2-atk, at-spi2-core, atk, cairo, cups, dbus, expat, fontconfig +, freetype, gdk-pixbuf, glib, gtk3, libcxx, libdrm, libnotify, libpulseaudio, libuuid +, libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext +, libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, libxshmfence +, mesa, nspr, nss, pango, systemd, libappindicator-gtk3, libdbusmenu +}: + +stdenv.mkDerivation rec { + pname = "premid"; + version = "2.3.2"; + + src = fetchurl { + url = "https://github.com/premid/Linux/releases/download/v${version}/${pname}.tar.gz"; + sha256 = "sha256-TuID63cVZkQ2kBl2iZeuVvjRUJYBt62ppPvgffBlOXY="; + }; + + nativeBuildInputs = [ + autoPatchelfHook + wrapGAppsHook + copyDesktopItems + ]; + + buildInputs = [ + alsa-lib + cups + libdrm + libuuid + libXdamage + libX11 + libXScrnSaver + libXtst + libxcb + libxshmfence + mesa + nss + ]; + + dontWrapGApps = true; + dontBuild = true; + dontConfigure = true; + + libPath = lib.makeLibraryPath [ + libcxx systemd libpulseaudio libdrm mesa + stdenv.cc.cc alsa-lib atk at-spi2-atk at-spi2-core cairo cups dbus expat fontconfig freetype + gdk-pixbuf glib gtk3 libnotify libX11 libXcomposite libuuid + libXcursor libXdamage libXext libXfixes libXi libXrandr libXrender + libXtst nspr nss libxcb pango systemd libXScrnSaver + libappindicator-gtk3 libdbusmenu + ]; + + installPhase = '' + mkdir -p $out/{bin,opt/PreMiD,share/pixmaps} + mv * $out/opt/PreMiD + + chmod +x $out/opt/PreMiD/${pname} + patchelf --set-interpreter ${stdenv.cc.bintools.dynamicLinker} \ + $out/opt/PreMiD/${pname} + + wrapProgram $out/opt/PreMiD/${pname} \ + "''${gappsWrapperArgs[@]}" \ + --prefix XDG_DATA_DIRS : "${gtk3}/share/gsettings-schemas/${gtk3.name}/" \ + --prefix LD_LIBRARY_PATH : ${libPath}:$out/opt/${pname} + + ln -s $out/opt/PreMiD/${pname} $out/bin/ + ''; + + # This is the icon used by the desktop file + postInstall = '' + ln -s $out/opt/PreMiD/assets/appIcon.png $out/share/pixmaps/${pname}.png + ''; + + desktopItems = [ + (makeDesktopItem { + name = pname; + exec = "PreMiD"; + icon = pname; + desktopName = "PreMiD"; + genericName = meta.description; + mimeType = "x-scheme-handler/premid"; + }) + ]; + + meta = with lib; { + description = "A simple, configurable utility to show your web activity as playing status on Discord"; + homepage = "https://premid.app"; + downloadPage = "https://premid.app/downloads"; + license = licenses.mpl20; + maintainers = with maintainers; [ natto1784 ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix index 8e70a70423..4de28e6a86 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "ticker"; - version = "4.2.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FavbBGmChWQ3xySPHlw5HisZwVaNe/NaxA6+InN8fL8="; + sha256 = "sha256-T9pApuzATohiOUmWa+GBlLrlTNgKNMwtW6fSPO/NS6Y="; }; - vendorSha256 = "sha256-XBfTVd3X3IDxLCAaNnijf6E5bw+AZ94UdOG9w7BOdBU="; + vendorSha256 = "sha256-vTB1RPg1LN44bkWrdGEXR6WRlM/Q2EITUO0yt5ar/zg="; ldflags = [ "-s" "-w" "-X github.com/achannarasappa/ticker/cmd.Version=v${version}" diff --git a/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix b/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix index 220ca6a4e8..eec7bee309 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/usql/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "usql"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "xo"; repo = "usql"; rev = "v${version}"; - sha256 = "sha256-vLGoPttl7f4qCVM8e0F0llIODuNqJ7GxXqbUgokv7Qw="; + sha256 = "sha256-NHeJSWrcX4hYBJpZu/UjQ1ZWfcUnWFCV0Meo+XveDOw="; }; - vendorSha256 = "sha256-sGECp1L6WzIPGbQbBoV1IrTgyy4/c95OLAmj9D0FjXs="; + vendorSha256 = "sha256-EsLLBhyOcupx5LrJyWWMu4RAGWDKo3keflyZOASKldE="; buildInputs = [ unixODBC icu ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix b/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix index 4edf2e2567..fa9f1644b5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/xmrig/moneroocean.nix @@ -2,13 +2,13 @@ xmrig.overrideAttrs (oldAttrs: rec { pname = "xmrig-mo"; - version = "6.14.1-mo1"; + version = "6.14.1-mo2"; src = fetchFromGitHub { owner = "MoneroOcean"; repo = "xmrig"; rev = "v${version}"; - sha256 = "sha256-1YG0llNv1VR8ocNFxYLZFXMzowNNqpqSyIu7iCr/rfM="; + sha256 = "sha256-bfD/zxUo4ZDLRDpFbD/FCAvBISHvhRaYXwwiYFd10No="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/bee/bee.nix b/third_party/nixpkgs/pkgs/applications/networking/bee/bee.nix index b0d05d928c..0e269bf9ab 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/bee/bee.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/bee/bee.nix @@ -44,8 +44,8 @@ buildGoModule { subPackages = [ "cmd/bee" ]; # no symbol table, no debug info, and pass the commit for the version string - buildFlags = lib.optionalString ( lib.hasAttr "goVersionString" versionSpec) - "-ldflags -s -ldflags -w -ldflags -X=github.com/ethersphere/bee.commit=${versionSpec.goVersionString}"; + ldflags = lib.optionals ( lib.hasAttr "goVersionString" versionSpec) + [ "-s" "-w" "-X=github.com/ethersphere/bee.commit=${versionSpec.goVersionString}" ]; # Mimic the bee Makefile: without disabling CGO, two (transitive and # unused) dependencies would fail to compile. diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json index 8a0dc4eee5..3012fdba1f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -44,9 +44,9 @@ } }, "ungoogled-chromium": { - "version": "92.0.4515.131", - "sha256": "0fnfyh61w6dmavvfbf2x1zzrby0xpx4jd4ifjsgyc39rsl789b5n", - "sha256bin64": "04ykc7vgq47m595j0g0gl28n5rkki6aic7ck8xr08r5cia46gk3g", + "version": "92.0.4515.159", + "sha256": "04gxgimg5ygzx6nvfws5y9dppdfjg1fhyl8zbykmksbh1myk6zfr", + "sha256bin64": "0lxnqsvqr1kw6swvkhhz475j0xvaa58ha8r1gq8zxmk48mp41985", "deps": { "gn": { "version": "2021-05-07", @@ -55,8 +55,8 @@ "sha256": "0x63jr5hssm9dl6la4q5ahy669k4gxvbapqxi5w32vv107jrj8v4" }, "ungoogled-patches": { - "rev": "92.0.4515.131-1", - "sha256": "1nbgknj5ba116y47sxbp7pbma1bp0lmkyi3vk915x837ysaf6mrd" + "rev": "92.0.4515.159-1", + "sha256": "1mfkpkyj0sd2k07fzmxmqc24ywqqmcv3vpg1yhh96k676q0qkpd0" } } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix index 9fdd7de045..a0468f506d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix @@ -68,7 +68,7 @@ buildGoModule rec { meta = with lib; { description = "Declarative continuous deployment for Kubernetes"; downloadPage = "https://github.com/argoproj/argo-cd"; - homepage = "https://argoproj.github.io/projects/argo-cd"; + homepage = "https://argo-cd.readthedocs.io/en/stable/"; license = licenses.asl20; maintainers = with maintainers; [ shahrukh330 superherointj ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix index b59a5549b7..78ccc8cb83 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "kubernetes"; - version = "1.22.0"; + version = "1.22.1"; src = fetchFromGitHub { owner = "kubernetes"; repo = "kubernetes"; rev = "v${version}"; - sha256 = "sha256-4lqqD3SBLBWrnFWhRzV3QgRLdGRW1Jx/eL6swtHL0Vw="; + sha256 = "sha256-coiDKczX5kWw/5A9+p0atPbn2nR0wBBdfXKTw6FYywo="; }; nativeBuildInputs = [ removeReferencesTo makeWrapper which go rsync installShellFiles ]; @@ -97,10 +97,5 @@ stdenv.mkDerivation rec { platforms = platforms.unix; }; - passthru.tests = with nixosTests.kubernetes; { - dns-single-node = dns.singlenode; - dns-multi-node = dns.multinode; - rbac-single-node = rbac.singlenode; - rbac-multi-node = rbac.multinode; - }; + passthru.tests = nixosTests.kubernetes; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/hyprspace/default.nix b/third_party/nixpkgs/pkgs/applications/networking/hyprspace/default.nix index 7f79295719..89c04508b7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/hyprspace/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/hyprspace/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "hyprspace"; - version = "0.1.5"; + version = "0.1.6"; propagatedBuildInputs = lib.optional stdenv.isDarwin iproute2mac; @@ -10,7 +10,7 @@ buildGoModule rec { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-aLODIaDbSLVEog/F0FVx6ykadCggE0Vebzwjw0sqYJ0="; + sha256 = "sha256-g0oyI3jnqQADyOrpnK4IvpFQPEwNrpvyDS+DhBDXZGg="; }; vendorSha256 = "sha256-rw75xNBBV58F+HBVtD/EslPWxZxLbI3/mJVdJF4usKI="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pond/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pond/default.nix index 4c059cb20d..f26cd01094 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pond/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pond/default.nix @@ -23,11 +23,14 @@ buildGoPackage rec { buildInputs = [ trousers gtk3 gtkspell3 ] ++ lib.optional stdenv.hostPlatform.isx86_64 dclxvi ++ lib.optionals gui [ wrapGAppsHook ]; - buildFlags = lib.optionals (!gui) [ "-tags" "nogui" ]; + tags = lib.optionals (!gui) [ "nogui" ]; excludedPackages = "\\(appengine\\|bn256cgo\\)"; postPatch = lib.optionalString stdenv.hostPlatform.isx86_64 '' grep -r 'bn256' | awk -F: '{print $1}' | xargs sed -i \ -e "s,golang.org/x/crypto/bn256,github.com/agl/pond/bn256cgo,g" \ -e "s,bn256\.,bn256cgo.,g" ''; + + # https://hydra.nixos.org/build/150102618/nixlog/2 + meta.broken = stdenv.isAarch64; } diff --git a/third_party/nixpkgs/pkgs/applications/office/elementary-planner/default.nix b/third_party/nixpkgs/pkgs/applications/office/elementary-planner/default.nix index 88a063158b..73888fbfe3 100644 --- a/third_party/nixpkgs/pkgs/applications/office/elementary-planner/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/elementary-planner/default.nix @@ -20,17 +20,19 @@ , pantheon /* granite, icons, maintainers */ , webkitgtk , libpeas +, libhandy +, curl }: stdenv.mkDerivation rec { pname = "elementary-planner"; - version = "2.6.9"; + version = "2.7"; src = fetchFromGitHub { owner = "alainm23"; repo = "planner"; rev = version; - sha256 = "17ij017x2cplqhway8376k8mmrll4w1jfwhf7ixldq9g0q2inzd8"; + sha256 = "sha256-3eFPGRcZWhzFYi52TbHmpFNLI0pWYcHbbBI7efqZwYE="; }; nativeBuildInputs = [ @@ -58,6 +60,8 @@ stdenv.mkDerivation rec { sqlite webkitgtk libgdata # required by some dependency transitively + libhandy + curl ]; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/bowtie/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/bowtie/default.nix index 916bba5c05..0722ffe09f 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/bowtie/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/bowtie/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "An ultrafast memory-efficient short read aligner"; license = licenses.artistic2; - homepage = "http://bowtie-bio.sf.net/bowtie"; + homepage = "http://bowtie-bio.sourceforge.net"; maintainers = with maintainers; [ prusnak ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix index 0628134d9d..1a900e1019 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/eagle/eagle.nix @@ -66,8 +66,8 @@ let # Make desktop item mkdir -p "$out"/share/applications cp "$desktopItem"/share/applications/* "$out"/share/applications/ - mkdir -p "$out"/share/icons - ln -s "$out/eagle-${version}/bin/eagle-logo.png" "$out"/share/icons/eagle.png + mkdir -p "$out"/share/pixmaps + ln -s "$out/eagle-${version}/bin/eagle-logo.png" "$out"/share/pixmaps/eagle.png ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/cadical/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/cadical/default.nix index 6758eeb660..f0cb1efb30 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/cadical/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/cadical/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "cadical"; - version = "1.3.0"; + version = "1.4.1"; src = fetchFromGitHub { owner = "arminbiere"; repo = "cadical"; rev = "rel-${version}"; - sha256 = "05lvnvapjawgkky38xknb9lgaliiwan4kggmb9yggl4ifpjrh8qf"; + sha256 = "0y44z3np4gssgdh4aj5qila7pshrbphycdxn2083i8ayyyjbxshp"; }; outputs = [ "out" "dev" "lib" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix index 1681d45459..fd22b7b1ad 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/opensmt/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "opensmt"; - version = "2.0.1"; + version = "2.1.0"; src = fetchFromGitHub { owner = "usi-verification-and-security"; repo = "opensmt"; rev = "v${version}"; - sha256 = "uoIcXWsxxRsIuFsou3RcN9e48lc7cWMgRPVJLFVslDE="; + sha256 = "sha256-m8TpMBY1r0h8GJTHM4FLBuZtX+WK/Q7RTXUnNmUWV+o="; }; nativeBuildInputs = [ cmake bison flex ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/maxima/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/maxima/default.nix index 7edbeaee08..2b82a8f817 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/maxima/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/maxima/default.nix @@ -4,7 +4,7 @@ let name = "maxima"; - version = "5.44.0"; + version = "5.45.0"; lisp-compiler = if ecl-fasl then ecl else sbcl; @@ -18,7 +18,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "1v6jr5s6hhj6r18gfk6hgxk2qd6z1dxkrjq9ss2z1y6sqi45wgyr"; + sha256 = "sha256-x2MfMmRIBc67e6/vOrUzHEus0sJ+OE/YgyO1A5pg0Ng="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/math/pynac/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/pynac/default.nix index 138c97d73b..88515b92be 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/pynac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/pynac/default.nix @@ -1,4 +1,5 @@ { lib, stdenv +, fetchpatch , fetchFromGitHub , autoreconfHook , pkg-config @@ -20,6 +21,16 @@ stdenv.mkDerivation rec { sha256 = "sha256-ocR7emXtKs+Xe2f6dh4xEDAacgiolY8mtlLnWnNBS8A="; }; + patches = [ + # the patch below is included in sage 9.4 and should be included + # in a future pynac release. see https://trac.sagemath.org/ticket/28357 + (fetchpatch { + name = "realpartloop.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/pynac/patches/realpartloop.patch?h=9.4.beta5"; + sha256 = "sha256-1nj0xtlFN5fZKEiRLD+tiW/ZtxMQre1ziEGA0OVUGE4="; + }) + ]; + buildInputs = [ flint gmp diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch index 0dbfba642e..178cef3e54 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/do-not-test-find-library.patch @@ -1,8 +1,8 @@ diff --git a/src/sage/env.py b/src/sage/env.py -index 2908f5d04f..81dfd75c0d 100644 +index 95980cc2df..37107a30e1 100644 --- a/src/sage/env.py +++ b/src/sage/env.py -@@ -218,93 +218,12 @@ NTL_LIBDIR = var("NTL_LIBDIR") +@@ -227,93 +227,12 @@ OPENMP_CXXFLAGS = var("OPENMP_CXXFLAGS", "") SAGE_BANNER = var("SAGE_BANNER", "") SAGE_IMPORTALL = var("SAGE_IMPORTALL", "yes") @@ -51,10 +51,9 @@ index 2908f5d04f..81dfd75c0d 100644 - if sys.platform == 'cygwin': - # Later down we take the first matching DLL found, so search - # SAGE_LOCAL first so that it takes precedence -- search_directories = [ -- Path(SAGE_LOCAL) / 'bin', -- Path(sysconfig.get_config_var('BINDIR')), -- ] +- if SAGE_LOCAL: +- search_directories.append(Path(SAGE_LOCAL) / 'bin') +- search_directories.append(Path(sysconfig.get_config_var('BINDIR'))) - # Note: The following is not very robust, since if there are multible - # versions for the same library this just selects one more or less - # at arbitrary. However, practically speaking, on Cygwin, there @@ -66,14 +65,15 @@ index 2908f5d04f..81dfd75c0d 100644 - else: - ext = 'so' - -- search_directories = [Path(SAGE_LOCAL) / 'lib'] +- if SAGE_LOCAL: +- search_directories.append(Path(SAGE_LOCAL) / 'lib') - libdir = sysconfig.get_config_var('LIBDIR') - if libdir is not None: - libdir = Path(libdir) - search_directories.append(libdir) - - multiarchlib = sysconfig.get_config_var('MULTIARCH') -- if multiarchlib is not None: +- if multiarchlib is not None: - search_directories.append(libdir / multiarchlib), - - patterns = [f'lib{libname}.{ext}'] @@ -97,4 +97,4 @@ index 2908f5d04f..81dfd75c0d 100644 +GAP_SO = var("GAP_SO", '/default') # post process - if ' ' in DOT_SAGE: + if DOT_SAGE is not None and ' ' in DOT_SAGE: diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch deleted file mode 100644 index a91ee319b8..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/ignore-cmp-deprecation.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff --git a/src/sage/tests/cmdline.py b/src/sage/tests/cmdline.py -index 6e034dcb5a..8ec60ec72b 100644 ---- a/src/sage/tests/cmdline.py -+++ b/src/sage/tests/cmdline.py -@@ -660,8 +660,8 @@ def test_executable(args, input="", timeout=100.0, pydebug_ignore_warnings=False - sage: with open(input, 'w') as F: - ....: _ = F.write(s) - sage: L = ["sage", "--rst2ipynb", input, output] -- sage: test_executable(L) # optional - rst2ipynb -- ('', '', 0) -+ sage: test_executable(L)[2] # optional - rst2ipynb -+ 0 - sage: import json # optional - rst2ipynb - sage: d = json.load(open(output,'r')) # optional - rst2ipynb - sage: type(d) # optional - rst2ipynb -@@ -757,8 +757,6 @@ def test_executable(args, input="", timeout=100.0, pydebug_ignore_warnings=False - /// - 4 - }}} -- sage: err # py2 # optional -- sagenb -- '' - sage: ret # py2 # optional -- sagenb - 0 - diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix index 218ab920a8..1e1fd0a426 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix @@ -29,14 +29,14 @@ let ); in stdenv.mkDerivation rec { - version = "9.3"; + version = "9.4"; pname = "sage-src"; src = fetchFromGitHub { owner = "sagemath"; repo = "sage"; rev = version; - sha256 = "sha256-l9DX8jcDdKA7GJ6xU+nBsmlZxrcZ9ZUAJju621ooBEo="; + sha256 = "sha256-jqkr4meG02KbTCMsGvyr1UbosS4ZuUJhPXU/InuS+9A="; }; # Patches needed because of particularities of nix or the way this is packaged. @@ -77,64 +77,9 @@ stdenv.mkDerivation rec { # be empty since dependencies update all the time. packageUpgradePatches = [ # After updating smypow to (https://trac.sagemath.org/ticket/3360) we can - # now set the cache dir to be withing the .sage directory. This is not + # now set the cache dir to be within the .sage directory. This is not # strictly necessary, but keeps us from littering in the user's HOME. ./patches/sympow-cache.patch - - # ignore a deprecation warning for usage of `cmp` in the attrs library in the doctests - ./patches/ignore-cmp-deprecation.patch - - # remove use of matplotlib function deprecated in 3.4 - # https://trac.sagemath.org/ticket/31827 - (fetchSageDiff { - base = "9.3"; - name = "remove-matplotlib-deprecated-function.patch"; - rev = "32b2bcaefddc4fa3d2aee6fa690ce1466cbb5948"; - sha256 = "sha256-SXcUGBMOoE9HpuBzgKC3P6cUmM5MiktXbe/7dVdrfWo="; - }) - - # pari 2.13 update - # https://trac.sagemath.org/ticket/30801 - # - # the last commit in that ticket is - # c78b1470fccd915e2fa93f95f2fefba6220fb1f7, but commits after - # 10a4531721d2700fd717e2b3a1364508ffd971c3 only deal with 32-bit - # and post-26635 breakage, none of which is relevant to us. since - # there are post-9.4.beta0 rebases after that, we just skip later - # commits. - (fetchSageDiff { - base = "9.3"; - name = "pari-2.13.1.patch"; - rev = "10a4531721d2700fd717e2b3a1364508ffd971c3"; - sha256 = "sha256-gffWKK9CMREaNOb5zb63iZUgON4FvsPrMQNqe+5ZU9E="; - }) - - # sympy 1.8 update - # https://trac.sagemath.org/ticket/31647 - (fetchSageDiff { - base = "9.4.beta0"; - name = "sympy-1.8.patch"; - rev = "fa864b36e15696450c36d54215b1e68183b29d25"; - sha256 = "sha256-fj/9QEZlVF0fw9NpWflkTuBSKpGjCE6b96ECBgdn77o="; - }) - - # sphinx 4 update - # https://trac.sagemath.org/ticket/31696 - (fetchSageDiff { - base = "9.4.beta3"; - name = "sphinx-4.patch"; - rev = "bc84af8c795b7da433d2000afc3626ee65ba28b8"; - sha256 = "sha256-5Kvs9jarC8xRIU1rdmvIWxQLC25ehiTLJpg5skh8WNM="; - }) - - # eclib 20210625 update - # https://trac.sagemath.org/ticket/31443 - (fetchSageDiff { - base = "9.4.beta3"; - name = "eclib-20210625.patch"; - rev = "789550ca04c94acfb1e803251538996a34962038"; - sha256 = "sha256-VlyEn5hg3joG8t/GwiRfq9TzJ54AoHxLolsNQ3shc2c="; - }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix index f60cb64d2e..b9c98ed64d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sagelib.nix @@ -27,6 +27,7 @@ , linbox , m4ri , m4rie +, memory-allocator , libmpc , mpfi , ntl @@ -107,6 +108,7 @@ buildPythonPackage rec { lrcalc m4ri m4rie + memory-allocator mpfi ntl blas diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix index 5193cd2531..fca3200dce 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "git-delete-merged-branches"; - version = "6.0.5"; + version = "6.3.0"; src = fetchFromGitHub { owner = "hartwork"; repo = pname; rev = version; - sha256 = "1mlmikcpm94nymid35v9rx9dyprhwidgwbdfd5zhsw502d40v0xp"; + sha256 = "sha256-mUgSIwU39BT0bCA2UQANe2Yzkgl2xAmXQQ9P2bLoEMc="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix index 65c85261cd..d28e5d6e3e 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix @@ -16,12 +16,12 @@ with lib; buildGoPackage rec { pname = "gitea"; - version = "1.14.6"; + version = "1.15.0"; # not fetching directly from the git repo, because that lacks several vendor files for the web UI src = fetchurl { url = "https://github.com/go-gitea/gitea/releases/download/v${version}/gitea-src-${version}.tar.gz"; - sha256 = "sha256-IIoOJlafMD6Kg8Zde3LcoK97PKLmqOUMQN3nmIgqe1o="; + sha256 = "sha256-Wu5rtVoQql/0XWkszYOqE4QJxKUY/CsCpmjkaB+E6Hc="; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/1.4.nix b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/1.4.nix index e4f743013b..9e62f86a34 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/1.4.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/1.4.nix @@ -26,12 +26,10 @@ buildGoPackage rec { buildInputs = [ btrfs-progs ]; - buildFlags = [ "VERSION=v${version}" "REVISION=${src.rev}" ]; - buildPhase = '' cd go/src/${goPackagePath} patchShebangs . - make binaries man $buildFlags + make binaries man "VERSION=v${version}" "REVISION=${src.rev}" ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix index c86f4280e8..cce72e2a74 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/containerd/default.nix @@ -27,14 +27,12 @@ buildGoModule rec { buildInputs = [ btrfs-progs ]; - buildFlags = [ "VERSION=v${version}" "REVISION=${src.rev}" ]; - BUILDTAGS = lib.optionals (btrfs-progs == null) [ "no_btrfs" ]; buildPhase = '' runHook preBuild patchShebangs . - make binaries man $buildFlags + make binaries man "VERSION=v${version}" "REVISION=${src.rev}" runHook postBuild ''; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix index d9d4df4c00..541a205361 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "i3status-rust"; - version = "0.20.3"; + version = "0.20.4"; src = fetchFromGitHub { owner = "greshake"; repo = pname; rev = "v${version}"; - sha256 = "sha256-JNTTSVWGPqJT9xShF1bgwTGtlp37Ocsdovow8F4EH3g="; + sha256 = "sha256-lohMrsMCAnb2p7H+xfa24Wx3LEFxCAlGHfP9A70Hg48="; }; - cargoSha256 = "sha256-sm7Iorux2GKja0qzw2wM4sdsRwijtezIlef5vh1Nt54="; + cargoSha256 = "sha256-pe96VNTH49qgQ4yxKcAcQPN31W2k1mD9TdhNKBp4x5Q="; nativeBuildInputs = [ pkg-config makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json index 764d632ee4..b00021504b 100644 --- a/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json +++ b/third_party/nixpkgs/pkgs/data/misc/hackage/pin.json @@ -1,6 +1,6 @@ { - "commit": "dfb0b040033334d2e676906786c7a90805310e7d", - "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/dfb0b040033334d2e676906786c7a90805310e7d.tar.gz", - "sha256": "0x53gkkpxlcm6qa38yksx8cws9phl2zxvdys5imjpg8dl1sal3pg", - "msg": "Update from Hackage at 2021-08-10T19:15:27Z" + "commit": "23315eb3220b0748c3aa71a9027dc39e5416ce9e", + "url": "https://github.com/commercialhaskell/all-cabal-hashes/archive/23315eb3220b0748c3aa71a9027dc39e5416ce9e.tar.gz", + "sha256": "0pgcyfb3lnl7kxpj87sbj50ljlg2l05v4kgcdwy568pcf24bh764", + "msg": "Update from Hackage at 2021-08-17T22:21:14Z" } diff --git a/third_party/nixpkgs/pkgs/data/themes/obsidian2/default.nix b/third_party/nixpkgs/pkgs/data/themes/obsidian2/default.nix index a965af53d4..8d431a0d06 100644 --- a/third_party/nixpkgs/pkgs/data/themes/obsidian2/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/obsidian2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "theme-obsidian2"; - version = "2.18"; + version = "2.19"; src = fetchurl { url = "https://github.com/madmaxms/theme-obsidian-2/releases/download/v${version}/obsidian-2-theme.tar.xz"; - sha256 = "1w3grlkws4ih7333hys33z4bgm33jbc78bq2pyp8nzw4q9d2hz2r"; + sha256 = "sha256-GGnrix8utJ34pszuoxcMY5Yr0stwL17Y812FIiRZOUk="; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix deleted file mode 100644 index 1e0064a8fa..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/gnome-2/desktop/mail-notification/default.nix +++ /dev/null @@ -1,54 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, glib, gnome2, dbus-glib, gmime, gnome-icon-theme, libnotify, libgnome-keyring, openssl, cyrus_sasl, sylpheed, gob2, gettext, intltool, libxml2, hicolor-icon-theme, tango-icon-theme }: - -stdenv.mkDerivation rec { - rev = "9ae8768"; - version = "5.4"; - pname = "mail-notification"; - - src = fetchFromGitHub { - inherit rev; - owner = "epienbroek"; - repo = "mail-notification"; - sha256 = "1slb7gajn30vdaq0hf5rikwdly1npmg1cf83hpjs82xd98knl13d"; - }; - - nativeBuildInputs = [ pkg-config ]; - buildInputs = [ glib dbus-glib gmime libnotify libgnome-keyring openssl cyrus_sasl sylpheed gob2 gettext intltool gnome2.GConf gnome2.libgnomeui dbus-glib gmime libnotify gnome2.scrollkeeper libxml2 gnome-icon-theme hicolor-icon-theme tango-icon-theme ]; - - prePatch = '' - sed -i -e '/jb_rule_set_install_message/d' -e '/jb_rule_add_install_command/d' jbsrc/jb.c - - # currently disable the check for missing sheme until a better solution - # is found; needed, because otherwise the application doesn't even start - # and fails saying it unable to find gconf scheme values. - sed -i -e 's/(schema_missing)/(!schema_missing)/g' src/mn-conf.c - ''; - - patches = [ - ./patches/mail-notification-dont-link-against-bsd-compat.patch - ]; - - patchFlags = [ "-p0" ]; - NIX_CFLAGS_COMPILE = "-Wno-error"; - - preConfigure = "./jb configure prefix=$out"; - - postConfigure = '' - substituteInPlace build/config \ - --replace "omf-dir|string|1|${gnome2.scrollkeeper}/share/omf" "omf-dir|string|1|$out/share/omf" \ - --replace "scrollkeeper-dir|string|1|${gnome2.scrollkeeper}/var/lib/scrollkeeper" "omf-dir|string|1|$out/var/lib/scrollkeeper" \ - ''; - - buildPhase = "./jb build"; - installPhase = "./jb install"; - - enableParallelBuilding = true; - - meta = with lib; { - description = "Tray status icon, which notifies us when new email arrives"; - homepage = "https://www.nongnu.org/mailnotify/"; - license = with licenses; [ gpl3 ]; - platforms = platforms.unix; - maintainers = [ maintainers.eleanor ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome/games/tali/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome/games/tali/default.nix index 0212aebd8c..9399561e67 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome/games/tali/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome/games/tali/default.nix @@ -20,11 +20,11 @@ stdenv.mkDerivation rec { pname = "tali"; - version = "40.1"; + version = "40.2"; src = fetchurl { url = "mirror://gnome/sources/tali/${lib.versions.major version}/${pname}-${version}.tar.xz"; - sha256 = "1xhp30c70bi8p4sm6v8zmxi1p55fs56dqgfbhfnsda5g1cxwir7h"; + sha256 = "9SHsnW1SKA/Pfi1IerbVqIw54yx6n5XrqwKdUsAj4Cs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/aldor/default.nix b/third_party/nixpkgs/pkgs/development/compilers/aldor/default.nix index 3799f2c921..1b87b508b6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/aldor/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/aldor/default.nix @@ -2,7 +2,8 @@ , autoconf, automake, libtool, jdk, perl }: stdenv.mkDerivation { - name = "aldor-1.2.0"; + pname = "aldor"; + version = "1.2.0"; src = fetchgit { url = "https://github.com/pippijn/aldor"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/aliceml/default.nix b/third_party/nixpkgs/pkgs/development/compilers/aliceml/default.nix index 8f560ef619..55a35176e7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/aliceml/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/aliceml/default.nix @@ -1,7 +1,8 @@ {lib, stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkg-config, perl, gnome2, gtk2, pango, sqlite, libxml2, zlib, gmp, smlnj }: stdenv.mkDerivation { - name = "aliceml-1.4-7d44dc8e"; + pname = "aliceml"; + version = "1.4-7d44dc8e"; src = fetchgit { url = "https://github.com/aliceml/aliceml"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/avra/default.nix b/third_party/nixpkgs/pkgs/development/compilers/avra/default.nix index 9d36078005..30fd5f52d1 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/avra/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/avra/default.nix @@ -1,9 +1,10 @@ { lib, stdenv, fetchurl, autoconf, automake }: stdenv.mkDerivation rec { - name = "avra-1.3.0"; + pname = "avra"; + version = "1.3.0"; src = fetchurl { - url = "mirror://sourceforge/avra/${name}.tar.bz2"; + url = "mirror://sourceforge/avra/avra-${version}.tar.bz2"; sha256 = "04lp0k0h540l5pmnaai07637f0p4zi766v6sfm7cryfaca3byb56"; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/bupc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/bupc/default.nix index 9b3a291a1a..94256ed437 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/bupc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/bupc/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, perl, coreutils }: stdenv.mkDerivation rec { - name = "berkeley_upc-2.22.0"; + pname = "berkeley_upc"; + version = "2.22.0"; src = fetchurl { - url = "http://upc.lbl.gov/download/release/${name}.tar.gz"; + url = "http://upc.lbl.gov/download/release/berkeley_upc-${version}.tar.gz"; sha256 = "041l215x8z1cvjcx7kwjdgiaf9rl2d778k6kiv8q09bc68nwd44m"; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/cmdstan/default.nix b/third_party/nixpkgs/pkgs/development/compilers/cmdstan/default.nix index c52ffa0baf..a41f836e10 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/cmdstan/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/cmdstan/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, python3, runtimeShell }: -stdenv.mkDerivation { - name = "cmdstan-2.17.1"; +stdenv.mkDerivation rec { + pname = "cmdstan"; + version = "2.17.1"; src = fetchurl { - url = "https://github.com/stan-dev/cmdstan/releases/download/v2.17.1/cmdstan-2.17.1.tar.gz"; + url = "https://github.com/stan-dev/cmdstan/releases/download/v${version}/cmdstan-${version}.tar.gz"; sha256 = "1vq1cnrkvrvbfl40j6ajc60jdrjcxag1fi6kff5pqmadfdz9564j"; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.4.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.6.nix similarity index 97% rename from third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.4.nix rename to third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.6.nix index 07784c4264..f1223deed8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.4.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.6.nix @@ -2,7 +2,7 @@ # build-tools , bootPkgs -, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx +, autoconf, automake, coreutils, fetchpatch, fetchurl, perl, python3, m4, sphinx, xattr , bash , libiconv ? null, ncurses @@ -135,12 +135,12 @@ let in stdenv.mkDerivation (rec { - version = "8.10.4"; + version = "8.10.6"; name = "${targetPrefix}ghc-${version}"; src = fetchurl { url = "https://downloads.haskell.org/ghc/${version}/ghc-${version}-src.tar.xz"; - sha256 = "03li4k10hxgyxcdyyz2092wx09spr1599hi0sxbh4m889qdqgbsj"; + sha256 = "43afba72a533408b42c1492bd047b5e37e5f7204e41a5cedd3182cc841610ce9"; }; enableParallelBuilding = true; @@ -155,9 +155,6 @@ stdenv.mkDerivation (rec { # upstream patch. Don't forget to check backport status of the upstream patch # when adding new GHC releases in nixpkgs. ./respect-ar-path.patch - # Fix documentation configuration which causes a syntax error with sphinx 4.* - # See https://gitlab.haskell.org/ghc/ghc/-/issues/19962, remove at 8.10.6. - ./sphinx-4-configuration.patch ] ++ lib.optionals stdenv.isDarwin [ # Make Block.h compile with c++ compilers. Remove with the next release (fetchpatch { @@ -192,6 +189,9 @@ stdenv.mkDerivation (rec { export NIX_LDFLAGS+=" -rpath $out/lib/ghc-${version}" '' + lib.optionalString stdenv.isDarwin '' export NIX_LDFLAGS+=" -no_dtrace_dof" + + # GHC tries the host xattr /usr/bin/xattr by default which fails since it expects python to be 2.7 + export XATTR=${lib.getBin xattr}/bin/xattr '' + lib.optionalString targetPlatform.useAndroidPrebuilt '' sed -i -e '5i ,("armv7a-unknown-linux-androideabi", ("e-m:e-p:32:32-i64:64-v128:64:128-a:0:32-n32-S64", "cortex-a8", ""))' llvm-targets '' + lib.optionalString targetPlatform.isMusl '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/meta-environment/meta-build-env/default.nix b/third_party/nixpkgs/pkgs/development/compilers/meta-environment/meta-build-env/default.nix index 454156c2d2..195f0c0e36 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/meta-environment/meta-build-env/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/meta-environment/meta-build-env/default.nix @@ -1,9 +1,11 @@ { lib, stdenv, fetchurl }: -stdenv.mkDerivation { - name = "meta-build-env-0.1"; +stdenv.mkDerivation rec { + pname = "meta-build-env"; + version = "0.1"; + src = fetchurl { - url = "http://www.meta-environment.org/releases/meta-build-env-0.1.tar.gz"; + url = "http://www.meta-environment.org/releases/meta-build-env-${version}.tar.gz"; sha256 = "1imn1gaan4fv73v8w3k3lgyjzkcn7bdp69k6hlz0vqdg17ysd1x3"; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/mezzo/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mezzo/default.nix index 1710fb986e..23c75ae28b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mezzo/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mezzo/default.nix @@ -12,7 +12,8 @@ assert check-ocaml-version "4"; stdenv.mkDerivation { - name = "mezzo-0.0.m8"; + pname = "mezzo"; + version = "0.0.m8"; src = fetchFromGitHub { owner = "protz"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix index 1769b31b5a..77d2fe6cac 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mlkit/default.nix @@ -18,7 +18,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Standard ML Compiler and Toolkit"; homepage = "https://elsman.com/mlkit/"; + changelog = "https://github.com/melsman/mlkit/blob/v${version}/NEWS.md"; license = licenses.gpl2Plus; + platforms = platforms.unix; maintainers = with maintainers; [ athas ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/opendylan/default.nix b/third_party/nixpkgs/pkgs/development/compilers/opendylan/default.nix index 45b2454259..1ffc85a6ad 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/opendylan/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/opendylan/default.nix @@ -2,7 +2,8 @@ {lib, stdenv, fetchgit, boehmgc, mps, gnused, opendylan-bootstrap, autoconf, automake, perl, makeWrapper, gcc }: stdenv.mkDerivation { - name = "opendylan-2016.1pre"; + pname = "opendylan"; + version = "2016.1pre"; src = fetchgit { url = "https://github.com/dylan-lang/opendylan"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/stalin/default.nix b/third_party/nixpkgs/pkgs/development/compilers/stalin/default.nix index f47086b1ca..50603919b8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/stalin/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/stalin/default.nix @@ -1,7 +1,8 @@ { fetchurl, lib, stdenv, ncompress, libX11 }: stdenv.mkDerivation rec { - name = "stalin-0.11"; + pname = "stalin"; + version = "0.11"; src = fetchurl { url = "ftp://ftp.ecn.purdue.edu/qobi/stalin.tar.Z"; @@ -22,16 +23,16 @@ stdenv.mkDerivation rec { mkdir -p "$out/share/emacs/site-lisp" cp stalin.el "$out/share/emacs/site-lisp" - mkdir -p "$out/doc/${name}" - cp README "$out/doc/${name}" + mkdir -p "$out/doc/stalin-${version}" + cp README "$out/doc/stalin-${version}" - mkdir -p "$out/share/${name}/include" - cp "include/"* "$out/share/${name}/include" + mkdir -p "$out/share/stalin-${version}/include" + cp "include/"* "$out/share/stalin-${version}/include" substituteInPlace "$out/bin/stalin" \ - --replace "$PWD/include/stalin" "$out/share/${name}/include/stalin" + --replace "$PWD/include/stalin" "$out/share/stalin-${version}/include/stalin" substituteInPlace "$out/bin/stalin" \ - --replace "$PWD/include" "$out/share/${name}/include" + --replace "$PWD/include" "$out/share/stalin-${version}/include" ''; meta = { diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/topology/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/topology/default.nix index b4367f0a8f..37585eea8c 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/topology/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/topology/default.nix @@ -6,6 +6,7 @@ mkCoqDerivation rec { releaseRev = v: "v${v}"; + release."9.0.0".sha256 = "sha256:03lgy53xg9pmrdd3d8qb4087k5qjnk260655svp6d79x4p2lxr8c"; release."8.12.0".sha256 = "sha256-ypHmHwzwZ6MQPYwuS3QyZmVOEPUCSbO2lhVaA6TypgQ="; release."8.10.0".sha256 = "sha256-mCLF3JYIiO3AEW9yvlcLeF7zN4SjW3LG+Y5vYB0l55A="; release."8.9.0".sha256 = "sha256-ZJh1BM34iZOQ75zqLIA+KtBjO2y33y0UpAw/ydCWQYc="; @@ -15,16 +16,16 @@ mkCoqDerivation rec { inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.12"; out = "8.12.0"; } - { case = "8.11"; out = "8.12.0"; } - { case = "8.10"; out = "8.10.0"; } + { case = isGe "8.10"; out = "9.0.0"; } { case = "8.9"; out = "8.9.0"; } { case = "8.8"; out = "8.8.0"; } { case = "8.7"; out = "8.7.0"; } { case = "8.6"; out = "8.6.0"; } ] null; - propagatedBuildInputs = optional (versions.isLe "8.12" defaultVersion) zorns-lemma; + propagatedBuildInputs = [ zorns-lemma ]; + + useDune2ifVersion = versions.isGe "9.0"; meta = { description = "General topology in Coq"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/zorns-lemma/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/zorns-lemma/default.nix index 84c3fd8051..cf3e9ca15d 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/zorns-lemma/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/zorns-lemma/default.nix @@ -3,9 +3,11 @@ with lib; mkCoqDerivation { pname = "zorns-lemma"; + repo = "topology"; releaseRev = v: "v${v}"; + release."9.0.0".sha256 = "sha256:03lgy53xg9pmrdd3d8qb4087k5qjnk260655svp6d79x4p2lxr8c"; release."8.11.0".sha256 = "sha256-2Hf7YwRcFmP/DqwFtF1p78MCNV50qUWfMVQtZbwKd0k="; release."8.10.0".sha256 = "sha256-qLPLK2ZLJQ4SmJX2ADqFiP4kgHuQFJTeNXkBbjiFS+4="; release."8.9.0".sha256 = "sha256-lEh978cXehglFX9D92RVltEuvN8umfPo/hvmFZm2NGo="; @@ -16,8 +18,7 @@ mkCoqDerivation { inherit version; defaultVersion = with versions; switch coq.coq-version [ - { case = isGe "8.11"; out = "8.11.0"; } - { case = "8.10"; out = "8.10.0"; } + { case = isGe "8.10"; out = "9.0.0"; } { case = "8.9"; out = "8.9.0"; } { case = "8.8"; out = "8.8.0"; } { case = "8.7"; out = "8.7.0"; } @@ -25,6 +26,8 @@ mkCoqDerivation { { case = "8.5"; out = "8.5.0"; } ] null; + useDune2ifVersion = versions.isGe "9.0"; + meta = { description = "Development of basic set theory"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/embedded/arduino/ino/default.nix b/third_party/nixpkgs/pkgs/development/embedded/arduino/ino/default.nix index 822cfb0e36..e25a7b83e9 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/arduino/ino/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/arduino/ino/default.nix @@ -2,11 +2,11 @@ , avrdude, arduino-core }: python2Packages.buildPythonApplication rec { - name = "ino-0.3.6"; - namePrefix = ""; + pname = "ino"; + version = "0.3.6"; src = fetchurl { - url = "mirror://pypi/i/ino/${name}.tar.gz"; + url = "mirror://pypi/i/ino/ino-${version}.tar.gz"; sha256 = "0k6lzfcn55favbj0w4afrvnmwyskf7bgzg9javv2ycvskp35srwv"; }; diff --git a/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix b/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix index 5ab5818a6c..a7852bcc7e 100644 --- a/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix +++ b/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix @@ -46,6 +46,9 @@ # Not needed with buildGoModule , goPackagePath ? "" +# needed for buildFlags warning +, buildFlags ? "" + , ... }@args': with builtins; @@ -268,4 +271,6 @@ let }; }); in +lib.warnIf (buildFlags != "") + "Use the `ldflags` and/or `tags` attributes instead of `buildFlags`" package diff --git a/third_party/nixpkgs/pkgs/development/go-packages/generic/default.nix b/third_party/nixpkgs/pkgs/development/go-packages/generic/default.nix index 6700dec082..6eaeee2a12 100644 --- a/third_party/nixpkgs/pkgs/development/go-packages/generic/default.nix +++ b/third_party/nixpkgs/pkgs/development/go-packages/generic/default.nix @@ -43,6 +43,9 @@ , CGO_ENABLED ? go.CGO_ENABLED +# needed for buildFlags warning +, buildFlags ? "" + , meta ? {}, ... } @ args: @@ -257,4 +260,6 @@ let } // meta; }); in +lib.warnIf (buildFlags != "") + "Use the `ldflags` and/or `tags` attributes instead of `buildFlags`" package diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/cabal2nix-unstable.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/cabal2nix-unstable.nix index c8bb4591b3..0e8fc7c69c 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/cabal2nix-unstable.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/cabal2nix-unstable.nix @@ -8,10 +8,10 @@ }: mkDerivation { pname = "cabal2nix"; - version = "unstable-2021-07-29"; + version = "unstable-2021-08-21"; src = fetchzip { - url = "https://github.com/NixOS/cabal2nix/archive/614852fa4be21ffc283046b92ed9e5b75c7e38af.tar.gz"; - sha256 = "00p6vmy5s016nkgjk5zf0hqym8y2glgwga81lm6xc1vc3zzkidmc"; + url = "https://github.com/NixOS/cabal2nix/archive/51a4082fefad4642af67a0ae4bf3bb3a7d9b45e0.tar.gz"; + sha256 = "1qd991ziv54drb0n655dg4ymknlfa0ndx9nq9wb5v00a15i4c04x"; }; isLibrary = true; isExecutable = true; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index 98482e03a8..8f45269c30 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -1149,14 +1149,8 @@ self: super: { # $HOME, which we don't have in our build sandbox. cabal-install-parsers = dontCheck super.cabal-install-parsers; - # jailbreak and patch (for pandoc >= 2.12) ensure compilation with newer dependencies. - # can both be removed at the next release (current is 0.13.0.0) - gitit = doJailbreak (appendPatch super.gitit - (pkgs.fetchpatch { - url = "https://github.com/jgm/gitit/commit/e8c9d94be332e2f73de9b0eee222a2a09f191faf.patch"; - sha256 = "1rl2c3sz8cd2c3qwv9b640853s4bblcknvfv29k472wqhs62mwz1"; - includes = [ "src/**" ]; - })); + # 2021-08-18: Erroneously claims that it needs a newer HStringTemplate (>= 0.8.8) than stackage. + gitit = doJailbreak super.gitit; # Test suite requires database persistent-mysql = dontCheck super.persistent-mysql; @@ -1293,23 +1287,39 @@ self: super: { # Fails with "supports custom headers" Spock-core = dontCheck super.Spock-core; - # Needed by Hasura 1.3.1 - dependent-map_0_2_4_0 = super.dependent-map_0_2_4_0.override { - dependent-sum = self.dependent-sum_0_4; - }; - - # Hasura 1.3.1 - # Because of ghc-heap-view, profiling needs to be disabled. - graphql-engine = disableLibraryProfiling( overrideCabal (super.graphql-engine.override { - immortal = self.immortal_0_2_2_1; - dependent-map = self.dependent-map_0_2_4_0; - dependent-sum = self.dependent-sum_0_4; + # hasura packages need some extra care + graphql-engine = overrideCabal (super.graphql-engine.overrideScope (self: super: { + immortal = self.immortal_0_2_2_1; + resource-pool = self.hasura-resource-pool; + ekg-core = self.hasura-ekg-core; + ekg-json = self.hasura-ekg-json; + hspec = dontCheck self.hspec_2_8_3; + hspec-core = dontCheck self.hspec-core_2_8_3; + hspec-discover = dontCheck super.hspec-discover_2_8_3; + tasty-hspec = self.tasty-hspec_1_2; + })) (drv: { + patches = [ ./patches/graphql-engine-mapkeys.patch ]; + doHaddock = false; + version = "2.0.7"; + }); + hasura-ekg-core = super.hasura-ekg-core.overrideScope (self: super: { + hspec = dontCheck self.hspec_2_8_3; + hspec-core = dontCheck self.hspec-core_2_8_3; + hspec-discover = dontCheck super.hspec-discover_2_8_3; + }); + hasura-ekg-json = super.hasura-ekg-json.overrideScope (self: super: { + ekg-core = self.hasura-ekg-core; + hspec = dontCheck self.hspec_2_8_3; + hspec-core = dontCheck self.hspec-core_2_8_3; + hspec-discover = dontCheck super.hspec-discover_2_8_3; + }); + pg-client = overrideCabal (super.pg-client.override { + resource-pool = self.hasura-resource-pool; }) (drv: { - # version in cabal file is invalid - version = "1.3.1-beta1"; - # hasura needs VERSION env exported during build - preBuild = "export VERSION=1.3.1-beta1"; - })); + librarySystemDepends = with pkgs; [ postgresql krb5.dev openssl.dev ]; + # wants a running DB to check against + doCheck = false; + }); # https://github.com/bos/statistics/issues/170 statistics = dontCheck super.statistics; @@ -1889,10 +1899,6 @@ EOT # https://github.com/google/proto-lens/issues/413 proto-lens = doJailbreak super.proto-lens; - # Too strict bounds on profunctors - # https://github.com/jcranch/tophat/issues/1 - tophat = doJailbreak super.tophat; - # 2021-06-20: Outdated upper bounds # https://github.com/Porges/email-validate-hs/issues/58 email-validate = doJailbreak super.email-validate; @@ -1946,4 +1952,10 @@ EOT Cabal = self.Cabal_3_6_0_0; }; + # ghc-api-compat needlessly requires 8.10.5 exactly, but we have 8.10.6 + ghc-api-compat = doJailbreak super.ghc-api-compat; + + # 2021-08-18: streamly-posix was released with hspec 2.8.2, but it works with older versions too. + streamly-posix = doJailbreak super.streamly-posix; + } // import ./configuration-tensorflow.nix {inherit pkgs haskellLib;} self super diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix index 754f036b29..f23abbd167 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-darwin.nix @@ -194,6 +194,8 @@ self: super: { hls-module-name-plugin = dontCheck super.hls-module-name-plugin; hls-splice-plugin = dontCheck super.hls-splice-plugin; hls-ormolu-plugin = dontCheck super.hls-ormolu-plugin; + hls-pragmas-plugin = dontCheck super.hls-pragmas-plugin; + hls-haddock-comments-plugin = dontCheck super.hls-haddock-comments-plugin; # We are lacking pure pgrep at the moment for tests to work tmp-postgres = dontCheck super.tmp-postgres; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix index 7e495474c8..08431ee0dd 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix @@ -41,13 +41,6 @@ self: super: { unix = null; xhtml = null; - # Hasura 1.3.1 - # Because of ghc-heap-view, profiling needs to be disabled. - graphql-engine = overrideCabal (super.graphql-engine) (drv: { - # GHC 8.8.x needs a revert of https://github.com/hasura/graphql-engine/commit/a77bb0570f4210fb826985e17a84ddcc4c95d3ea - patches = [ ./patches/hasura-884-compat.patch ]; - }); - # GHC 8.8.x can build haddock version 2.23.* haddock = self.haddock_2_23_1; haddock-api = self.haddock-api_2_23_1; @@ -136,4 +129,5 @@ self: super: { # vector 0.12.2 indroduced doctest checks that don‘t work on older compilers vector = dontCheck super.vector; + ghc-api-compat = super.ghc-api-compat_8_6; } diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml index a6fafbe8a9..94345e6029 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/broken.yaml @@ -121,6 +121,7 @@ broken-packages: - alto - alure - amazon-emailer + - amazonka-contrib-rds-utils - amazonka-s3-streaming - amazon-products - amby @@ -180,6 +181,7 @@ broken-packages: - argparser - arguedit - arion + - arith-encode - armada - arpa - arpack @@ -467,6 +469,7 @@ broken-packages: - butter - buttplug-hs-core - bv-sized + - byline - bytable - bytearray-parsing - bytestring-arbitrary @@ -793,12 +796,14 @@ broken-packages: - consul-haskell - Consumer - containers-benchmark + - containers-unicode-symbols - containers-verified - ContArrow - content-store - ContextAlgebra - context-free-grammar - context-stack + - contiguous - contiguous-checked - continue - Contract @@ -2183,6 +2188,7 @@ broken-packages: - HOpenCV - hopfield - hops + - hoq - ho-rewriting - horizon - horname @@ -2276,6 +2282,7 @@ broken-packages: - hsmodetweaks - Hsmtlib - hsmtpclient + - hsnock - hs-nombre-generator - hsns - hsnsq @@ -2388,6 +2395,7 @@ broken-packages: - hunspell-hs - hup - hurriyet + - husky - hutton - huttons-razor - hVOIDP @@ -2654,6 +2662,7 @@ broken-packages: - lagrangian - lambda2js - lambdaBase + - lambdabot-social-plugins - lambdabot-utils - lambda-bridge - lambda-canvas @@ -3009,6 +3018,7 @@ broken-packages: - miku - milena - mime-directory + - miniforth - minilens - minilight - minions @@ -3025,6 +3035,7 @@ broken-packages: - mit-3qvpPyAi6mH - mix-arrows - mixpanel-client + - mkcabal - mltool - ml-w - mm2 @@ -3324,14 +3335,12 @@ broken-packages: - oblivious-transfer - ocaml-export - Octree - - odbc - OddWord - oden-go-packages - oeis2 - OGL - ogmarkup - oi - - oidc-client - om-actor - omaketex - ombra @@ -3664,6 +3673,7 @@ broken-packages: - polysemy - polysemy-zoo - polytypeable + - pomaps - pomohoro - ponder - pong-server @@ -3832,6 +3842,7 @@ broken-packages: - quarantimer - qudb - quenya-verb + - questioner - QuickAnnotate - quickbooks - quickcheck-property-comb @@ -3900,6 +3911,7 @@ broken-packages: - read-bounded - read-ctags - read-io + - readline-statevar - readme-lhs - readshp - really-simple-xml-parser @@ -4249,6 +4261,7 @@ broken-packages: - shadower - shake-bindist - shakebook + - shake-cabal - shake-cabal-build - shake-dhall - shake-extras @@ -4606,6 +4619,7 @@ broken-packages: - svndump - swagger-petstore - swagger-test + - swearjure - swf - swift-lda - swiss-ephemeris @@ -4920,6 +4934,7 @@ broken-packages: - twilio - twine - twirp + - twitter - twitter-feed - tx - txtblk @@ -5378,6 +5393,7 @@ broken-packages: - yi-solarized - yi-spolsky - yoda + - Yogurt - yst - yu-core - yu-tool diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml index 67da108858..ec51f8c03a 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml @@ -118,6 +118,7 @@ extra-packages: - sbv == 7.13 # required for pkgs.petrinizer - crackNum < 3.0 # 2021-05-21: 3.0 removed the lib which sbv 7.13 uses - ShellCheck == 0.7.1 # 2021-05-09: haskell-ci 0.12.1 pins this version + - ghc-api-compat < 8.10.5 # 2021-08-18: ghc-api-compat 8.10.5 is only compatible with ghc 8.10.5 package-maintainers: abbradar: diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml index 1c74de902d..b0548975db 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix/transitive-broken.yaml @@ -370,6 +370,7 @@ dont-distribute-packages: - XSaiga - YACPong - Yablog + - Yogurt-Standalone - Z-Botan - Z-IO - Z-MessagePack @@ -467,8 +468,10 @@ dont-distribute-packages: - atomic-primops-foreign - atp - attoparsec-enumerator + - attoparsec-ip - attoparsec-iteratee - attoparsec-text-enumerator + - attoparsec-uri - atuin - audiovisual - aura @@ -626,6 +629,7 @@ dont-distribute-packages: - bv-sized-lens - bytehash - bytelog + - bytesmith - bytestring-read - c0check - cabal-bounds @@ -708,7 +712,9 @@ dont-distribute-packages: - claferwiki - clash - clash-ghc + - clash-ghc_1_4_3 - clash-lib + - clash-lib_1_4_3 - clash-multisignal - clash-prelude-quickcheck - clash-systemverilog @@ -790,6 +796,7 @@ dont-distribute-packages: - consumers - container - containers-accelerate + - contiguous-fft - continuum - continuum-client - control @@ -1011,6 +1018,7 @@ dont-distribute-packages: - entangle - enumerate - enumerate-function + - enumeration - enumerator-fd - enumerator-tf - ephemeral @@ -1732,6 +1740,7 @@ dont-distribute-packages: - intset - invertible-hlist - ion + - ip - ipatch - ipc - ipld-cid @@ -1858,6 +1867,8 @@ dont-distribute-packages: - lambda-options - lambdaFeed - lambdaLit + - lambdabot + - lambdabot-xmpp - lambdabot-zulip - lambdacms-media - lambdacube @@ -1885,6 +1896,7 @@ dont-distribute-packages: - lapack-carray - lapack-comfort-array - lapack-comfort-array_0_0_1 + - lapack-hmatrix - lapack_0_4 - lat - latex-formulae-hakyll @@ -2038,6 +2050,7 @@ dont-distribute-packages: - markdown-pap - markdown2svg - markov-processes + - markup - marmalade-upload - marquise - marvin @@ -2395,6 +2408,8 @@ dont-distribute-packages: - prednote-test - presto-hdbc - preview + - primitive-containers + - primitive-sort - primula-board - primula-bot - proc @@ -2589,6 +2604,7 @@ dont-distribute-packages: - ribosome-root - ribosome-test - ridley-extras + - ring-buffers - rio-process-pool - riot - ripple @@ -2662,6 +2678,7 @@ dont-distribute-packages: - scholdoc - scholdoc-citeproc - scholdoc-texmath + - scientific-notation - scion - scion-browser - scope @@ -2722,6 +2739,7 @@ dont-distribute-packages: - sgf - sgrep - sha1 + - shake-ats - shake-minify-css - shaker - shapefile @@ -2760,6 +2778,7 @@ dont-distribute-packages: - smallstring - smartword - smcdel + - smith - smith-cli - smith-client - smtlib2-debug @@ -3088,6 +3107,8 @@ dont-distribute-packages: - urembed - uri-enumerator - uri-enumerator-file + - url-bytes + - urlpath - usb - usb-enumerator - usb-hid @@ -3099,6 +3120,7 @@ dont-distribute-packages: - uu-cco-examples - uu-cco-hut-parsing - uu-cco-uu-parsinglib + - uuid-bytes - uuid-crypto - uvector-algorithms - v4l2 @@ -3146,6 +3168,7 @@ dont-distribute-packages: - wai-middleware-cache - wai-middleware-cache-redis - wai-middleware-consul + - wai-middleware-content-type - wai-middleware-rollbar - wai-middleware-route - wai-session-tokyocabinet @@ -3187,6 +3210,7 @@ dont-distribute-packages: - wrecker-ui - wright - writer-cps-full + - ws - wss-client - wtk-gtk - wu-wei diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix index 1c96024fc0..97a751a2e4 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-nix.nix @@ -167,6 +167,7 @@ self: super: builtins.intersectAttrs super { mongoDB = dontCheck super.mongoDB; network-transport-tcp = dontCheck super.network-transport-tcp; network-transport-zeromq = dontCheck super.network-transport-zeromq; # https://github.com/tweag/network-transport-zeromq/issues/30 + oidc-client = dontCheck super.oidc-client; # the spec runs openid against google.com pipes-mongodb = dontCheck super.pipes-mongodb; # http://hydra.cryp.to/build/926195/log/raw pixiv = dontCheck super.pixiv; raven-haskell = dontCheck super.raven-haskell; # http://hydra.cryp.to/build/502053/log/raw @@ -224,6 +225,9 @@ self: super: builtins.intersectAttrs super { # Test suite wants to connect to $DISPLAY. hsqml = dontCheck (addExtraLibraries (super.hsqml.override { qt5 = pkgs.qt5Full; }) [pkgs.libGLU pkgs.libGL]); + # Wants to check against a real DB, Needs freetds + odbc = dontCheck (addExtraLibraries super.odbc [ pkgs.freetds ]); + # Tests attempt to use NPM to install from the network into # /homeless-shelter. Disabled. purescript = dontCheck super.purescript; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index e916800ba8..2125e9341f 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -9336,8 +9336,8 @@ self: { pname = "HStringTemplate"; version = "0.8.7"; sha256 = "03kbmyh0713j3qhhrl7jqbmsvyq1q82h2yxq45cc9rs55sma8kjg"; - revision = "1"; - editedCabalFile = "0s7y606q2q0vnbg9c51kypawyvapva60i2lw1dg1bij50aiv5d3i"; + revision = "2"; + editedCabalFile = "082d1lm6q1jb7rrl20jz0y4ca1qf87ihbq3v6mji9ibacl6adjaq"; libraryHaskellDepends = [ array base blaze-builder bytestring containers deepseq directory filepath mtl old-locale parsec pretty semigroups syb @@ -9347,6 +9347,27 @@ self: { license = lib.licenses.bsd3; }) {}; + "HStringTemplate_0_8_8" = callPackage + ({ mkDerivation, array, base, blaze-builder, bytestring, containers + , deepseq, directory, filepath, HUnit, mtl, old-locale, parsec + , pretty, QuickCheck, random, semigroups, syb, template-haskell + , text, time, void + }: + mkDerivation { + pname = "HStringTemplate"; + version = "0.8.8"; + sha256 = "1n8ci0kzjcgnqh4dfpqwlh7mnlzyiqiqc6hc0zr65p0balbg8zbi"; + libraryHaskellDepends = [ + array base blaze-builder bytestring containers deepseq directory + filepath mtl old-locale parsec pretty semigroups syb + template-haskell text time void + ]; + testHaskellDepends = [ base containers HUnit QuickCheck random ]; + description = "StringTemplate implementation in Haskell"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "HStringTemplateHelpers" = callPackage ({ mkDerivation, base, containers, directory, FileManipCompat , filepath, HSH, HStringTemplate, mtl, safe, strict @@ -11588,8 +11609,8 @@ self: { }: mkDerivation { pname = "Jikka"; - version = "5.2.0.0"; - sha256 = "0rg96x1y928dd8n2znddp8b2wgmpv6vdkm4s8xcr39rqw4jsqk0l"; + version = "5.3.0.0"; + sha256 = "0njy5mgzbpvqdqp343a7bh69sdrmvfd57skr3qwma7dya5m12v2r"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -20808,8 +20829,8 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.7"; - sha256 = "0f7l91lds878s49yjq210sc49y6c6i3m3hys02902b64dqdgslpa"; + version = "0.7.1"; + sha256 = "1h9kz02s7ams9fw9x8k947nzji2b82s9xn2yvqzys14ypzc34qpn"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; @@ -21493,6 +21514,25 @@ self: { inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; + "X11_1_10_1" = callPackage + ({ mkDerivation, base, data-default-class, libX11, libXext + , libXinerama, libXrandr, libXrender, libXScrnSaver + }: + mkDerivation { + pname = "X11"; + version = "1.10.1"; + sha256 = "13a0qf8rwn1s43wcl39f1pcq3h1kw1ddfq205j1ry0j3yafnazxg"; + libraryHaskellDepends = [ base data-default-class ]; + librarySystemDepends = [ + libX11 libXext libXinerama libXrandr libXrender libXScrnSaver + ]; + description = "A binding to the X11 graphics library"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {inherit (pkgs.xorg) libX11; inherit (pkgs.xorg) libXScrnSaver; + inherit (pkgs.xorg) libXext; inherit (pkgs.xorg) libXinerama; + inherit (pkgs.xorg) libXrandr; inherit (pkgs.xorg) libXrender;}; + "X11-extras" = callPackage ({ mkDerivation, base, libX11, X11 }: mkDerivation { @@ -21917,6 +21957,8 @@ self: { ]; description = "A MUD client library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "Yogurt-Standalone" = callPackage @@ -21936,6 +21978,7 @@ self: { executableSystemDepends = [ readline ]; description = "A functional MUD client"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {inherit (pkgs) readline;}; "Z-Botan" = callPackage @@ -27883,6 +27926,28 @@ self: { license = lib.licenses.mpl20; }) {}; + "amazonka-contrib-rds-utils" = callPackage + ({ mkDerivation, amazonka, amazonka-core, amazonka-rds, base + , bytestring, lens, optparse-applicative, text, time + }: + mkDerivation { + pname = "amazonka-contrib-rds-utils"; + version = "1.6.1.0"; + sha256 = "1j43kn2ia8q6689p8g1b5q8pd8zcmhfjny8kydh3g5zf5360hnaz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + amazonka amazonka-core amazonka-rds base bytestring lens text time + ]; + executableHaskellDepends = [ + amazonka base bytestring lens optparse-applicative text + ]; + description = "A Haskell equivalent of \"aws rds generate-db-auth-token\""; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "amazonka-core" = callPackage ({ mkDerivation, aeson, attoparsec, base, bifunctors, bytestring , case-insensitive, conduit, conduit-extra, cryptonite @@ -32902,6 +32967,8 @@ self: { ]; description = "A practical arithmetic encoding (aka Godel numbering) library"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "arithmatic" = callPackage @@ -34147,26 +34214,25 @@ self: { }) {}; "assoc-list" = callPackage - ({ mkDerivation, base, contravariant, doctest, hedgehog }: + ({ mkDerivation, base, contravariant, hedgehog }: mkDerivation { pname = "assoc-list"; - version = "0.1.0.0"; - sha256 = "13n847aypm39djgpyrkr428y11xj7glpwavp5qxfd49n93ii8zy3"; + version = "0.1.0.1"; + sha256 = "1ggvws2ma9cn165h03dx0v0zd1aifhi5qx05lnymf9ca98pa7ls9"; libraryHaskellDepends = [ base contravariant ]; - testHaskellDepends = [ base contravariant doctest hedgehog ]; + testHaskellDepends = [ base contravariant hedgehog ]; description = "Association lists (lists of tuples)"; license = lib.licenses.mit; }) {}; "assoc-listlike" = callPackage - ({ mkDerivation, base, contravariant, doctest, hedgehog, ListLike - }: + ({ mkDerivation, base, contravariant, hedgehog, ListLike }: mkDerivation { pname = "assoc-listlike"; - version = "0.1.0.0"; - sha256 = "0nph5yvawxk1afnlqm0vizg8dv53wl1cziqqnnlqgv45yimp4fbz"; + version = "0.1.0.1"; + sha256 = "1jzv0x8397274ks8azm89xcca8i1h6rgi8drbp4nj05mxzvz6brv"; libraryHaskellDepends = [ base contravariant ListLike ]; - testHaskellDepends = [ base contravariant doctest hedgehog ]; + testHaskellDepends = [ base contravariant hedgehog ListLike ]; description = "Association lists (list-like collections of tuples)"; license = lib.licenses.mit; }) {}; @@ -35323,6 +35389,7 @@ self: { ]; description = "Parse IP data types with attoparsec"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "attoparsec-iso8601" = callPackage @@ -35459,6 +35526,7 @@ self: { ]; description = "URI parser / printer using attoparsec"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "attoparsec-varword" = callPackage @@ -38672,15 +38740,15 @@ self: { license = lib.licenses.bsd3; }) {}; - "base64-bytestring_1_2_0_1" = callPackage + "base64-bytestring_1_2_1_0" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, HUnit , QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2 }: mkDerivation { pname = "base64-bytestring"; - version = "1.2.0.1"; - sha256 = "0f66mzsyik3zrn72cygg8w3375qpvn3422z3j4fkkc9f0xyv22dg"; + version = "1.2.1.0"; + sha256 = "1ja9vkgnpkzaw8gz6sm5jmgha6wg3m1j281m0nv1w9yyxlqfvy7v"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring HUnit QuickCheck test-framework @@ -45491,6 +45559,18 @@ self: { license = lib.licenses.mit; }) {}; + "both_0_1_1_2" = callPackage + ({ mkDerivation, base, semigroups, zero }: + mkDerivation { + pname = "both"; + version = "0.1.1.2"; + sha256 = "1bf9fvc2ajbwwx31lmmyc1rzp3xzypwb3yjcmbhn6si5xnlbvqhl"; + libraryHaskellDepends = [ base semigroups zero ]; + description = "Like Maybe, but with a different Monoid instance"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "botpp" = callPackage ({ mkDerivation, base, bytestring }: mkDerivation { @@ -47560,6 +47640,8 @@ self: { ]; description = "Library for creating command-line interfaces (colors, menus, etc.)"; license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "bytable" = callPackage @@ -47590,13 +47672,13 @@ self: { license = lib.licenses.gpl3Only; }) {}; - "byte-count-reader_0_10_1_4" = callPackage + "byte-count-reader_0_10_1_5" = callPackage ({ mkDerivation, base, extra, hspec, parsec, parsec-numbers, text }: mkDerivation { pname = "byte-count-reader"; - version = "0.10.1.4"; - sha256 = "1rscz0dqz8h4cazf1kb0w628a93ysphrih5x0yppvl3w0iy26sh0"; + version = "0.10.1.5"; + sha256 = "0iq40gnfw8z1rkri1rpaqx5av1ay45h6518cg0a0m4ypdzf03r0s"; libraryHaskellDepends = [ base extra parsec parsec-numbers text ]; testHaskellDepends = [ base extra hspec parsec parsec-numbers text @@ -47816,6 +47898,7 @@ self: { ]; description = "Nonresumable byte parser"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "bytestring_0_11_1_0" = callPackage @@ -48860,6 +48943,24 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "cabal-clean" = callPackage + ({ mkDerivation, base, containers, directory, filepath, mtl + , optparse-applicative, pretty-terminal, process, split, string-qq + }: + mkDerivation { + pname = "cabal-clean"; + version = "0.1.20210815"; + sha256 = "0bx11grnw1x594n6si3lnswb87n2gsnn7fn7lr1ggn3rd0dm2ccg"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base containers directory filepath mtl optparse-applicative + pretty-terminal process split string-qq + ]; + description = "Remove outdated cabal build artefacts from `dist-newstyle`"; + license = lib.licenses.bsd3; + }) {}; + "cabal-constraints" = callPackage ({ mkDerivation, base, Cabal, optparse-applicative }: mkDerivation { @@ -49513,6 +49614,28 @@ self: { license = lib.licenses.gpl3Only; }) {}; + "cabal-rpm_2_0_10" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, extra + , filepath, http-client, http-client-tls, http-conduit + , optparse-applicative, process, simple-cabal, simple-cmd + , simple-cmd-args, time, unix + }: + mkDerivation { + pname = "cabal-rpm"; + version = "2.0.10"; + sha256 = "028kvvdm8dqjmk16ag8p1mb4d3nfyz1i6x8ijfcr45hrb93hdd77"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base bytestring Cabal directory extra filepath http-client + http-client-tls http-conduit optparse-applicative process + simple-cabal simple-cmd simple-cmd-args time unix + ]; + description = "RPM packaging tool for Haskell Cabal-based packages"; + license = lib.licenses.gpl3Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "cabal-scripts" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -51167,8 +51290,8 @@ self: { }: mkDerivation { pname = "capnp"; - version = "0.12.0.0"; - sha256 = "0wv1rp511vzq7hkzcgcpa0jvc90bflysddz0s69dzl6llr71gb6x"; + version = "0.14.0.0"; + sha256 = "15v0s597wq0ipvikd727fzcqg5r6685lvr8y1x93q5mdl975gi8m"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55460,7 +55583,7 @@ self: { license = lib.licenses.bsd2; }) {}; - "citeproc_0_4_1" = callPackage + "citeproc_0_5" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , case-insensitive, containers, data-default, Diff, directory , file-embed, filepath, mtl, pandoc-types, pretty, safe, scientific @@ -55469,8 +55592,8 @@ self: { }: mkDerivation { pname = "citeproc"; - version = "0.4.1"; - sha256 = "094x2fkhqizy26rzfz5qqjsnifmc95fyiasvnma32mak7j360xzy"; + version = "0.5"; + sha256 = "14l7gpa2phgmgcx2mdln1wf1gfqjmbkm5nyxnihrybmrkg9l8yfk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -55855,6 +55978,37 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "clash-ghc_1_4_3" = callPackage + ({ mkDerivation, array, base, bifunctors, bytestring, Cabal + , clash-lib, clash-prelude, concurrent-supply, containers, deepseq + , directory, exceptions, extra, 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.4.3"; + sha256 = "00ipx45s2qdjv5cj6v3cg7dgwsw3sd8ai3cr1q9n1k6g26dzc3pw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base bifunctors bytestring Cabal clash-lib clash-prelude + concurrent-supply containers deepseq directory exceptions extra + 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 = "Clash: a functional hardware description language - GHC frontend"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "clash-lib" = callPackage ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array , attoparsec, base, base16-bytestring, binary, bytestring @@ -55898,6 +56052,49 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "clash-lib_1_4_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, ansi-terminal, array + , attoparsec, base, base16-bytestring, binary, bytestring + , clash-prelude, concurrent-supply, containers, cryptohash-sha256 + , 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, pretty-show, prettyprinter + , primitive, process, quickcheck-text, reducers, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, temporary, terminal-size + , text, text-show, time, transformers, trifecta + , unordered-containers, utf8-string, vector + , vector-binary-instances + }: + mkDerivation { + pname = "clash-lib"; + version = "1.4.3"; + sha256 = "0p6sf9wn25i1f0isqskpy35x6qm2ym63x9fpb54kbd1pp9xqgysl"; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + aeson aeson-pretty ansi-terminal array attoparsec base + base16-bytestring binary bytestring clash-prelude concurrent-supply + containers cryptohash-sha256 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 pretty-show prettyprinter + primitive process reducers template-haskell temporary terminal-size + text text-show time transformers trifecta unordered-containers + utf8-string vector vector-binary-instances + ]; + testHaskellDepends = [ + aeson aeson-pretty base base16-bytestring bytestring clash-prelude + concurrent-supply containers data-default deepseq ghc + ghc-typelits-knownnat haskell-src-exts lens pretty-show + quickcheck-text tasty tasty-hunit tasty-quickcheck template-haskell + text transformers unordered-containers + ]; + description = "Clash: a functional hardware description language - As a library"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + }) {}; + "clash-multisignal" = callPackage ({ mkDerivation, base, clash-prelude, deepseq , ghc-typelits-knownnat, QuickCheck @@ -55955,6 +56152,48 @@ self: { broken = true; }) {}; + "clash-prelude_1_4_3" = callPackage + ({ mkDerivation, array, arrows, 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, hedgehog, hint + , integer-gmp, interpolate, lens, QuickCheck + , quickcheck-classes-base, recursion-schemes, reflection + , singletons, tasty, tasty-hedgehog, tasty-hunit, tasty-quickcheck + , tasty-th, template-haskell, text, text-show, th-abstraction + , th-lift, th-orphans, time, transformers, type-errors, uniplate + , vector + }: + mkDerivation { + pname = "clash-prelude"; + version = "1.4.3"; + sha256 = "07mdl3196yb971hpcbysyaj6vciyrm1p5m9prcymkhkqh7vw9igy"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + array arrows 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 deepseq doctest ghc-typelits-extra ghc-typelits-knownnat + ghc-typelits-natnormalise hedgehog hint quickcheck-classes-base + tasty tasty-hedgehog tasty-hunit tasty-quickcheck tasty-th + template-haskell + ]; + benchmarkHaskellDepends = [ + base criterion deepseq template-haskell + ]; + description = "Clash: a functional hardware description language - Prelude library"; + license = lib.licenses.bsd2; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "clash-prelude-quickcheck" = callPackage ({ mkDerivation, base, clash-prelude, QuickCheck }: mkDerivation { @@ -57954,6 +58193,18 @@ self: { license = lib.licenses.mpl20; }) {}; + "co-log-concurrent_0_5_1_0" = callPackage + ({ mkDerivation, base, co-log-core, stm }: + mkDerivation { + pname = "co-log-concurrent"; + version = "0.5.1.0"; + sha256 = "07qmx9z03vmgq2cgz4352fsav7r1nx8n7svmrhg2lkdiyp0j7a59"; + libraryHaskellDepends = [ base co-log-core stm ]; + description = "Asynchronous backend for co-log library"; + license = lib.licenses.mpl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "co-log-core" = callPackage ({ mkDerivation, base, doctest, Glob }: mkDerivation { @@ -58649,30 +58900,30 @@ self: { "coinbase-pro" = callPackage ({ mkDerivation, aeson, aeson-casing, async, base, binary - , bytestring, containers, cryptonite, HsOpenSSL, http-api-data - , http-client, http-client-tls, http-streams, http-types - , io-streams, memory, network, servant, servant-client + , bytestring, containers, cryptonite, exceptions, HsOpenSSL + , http-api-data, http-client, http-client-tls, http-streams + , http-types, io-streams, memory, network, servant, servant-client , servant-client-core, text, time, transformers, unagi-streams , unordered-containers, uuid, vector, websockets, wuss }: mkDerivation { pname = "coinbase-pro"; - version = "0.9.2.0"; - sha256 = "0x7wmm123rf7zk9802bymx1b9pbsnmzhkabyacwini01gb56bwxy"; + version = "0.9.2.2"; + sha256 = "1jfmzzwjk81w5bm9v4zfan2w7qi2sl2a1py9nxisz1wq8vxdyvxn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-casing async base binary bytestring containers - cryptonite HsOpenSSL http-api-data http-client http-client-tls - http-streams http-types io-streams memory network servant - servant-client servant-client-core text time transformers + cryptonite exceptions HsOpenSSL http-api-data http-client + http-client-tls http-streams http-types io-streams memory network + servant servant-client servant-client-core text time transformers unagi-streams unordered-containers uuid vector websockets wuss ]; executableHaskellDepends = [ aeson aeson-casing async base binary bytestring containers - cryptonite HsOpenSSL http-api-data http-client http-client-tls - http-streams http-types io-streams memory network servant - servant-client servant-client-core text time transformers + cryptonite exceptions HsOpenSSL http-api-data http-client + http-client-tls http-streams http-types io-streams memory network + servant servant-client servant-client-core text time transformers unagi-streams unordered-containers uuid vector websockets wuss ]; description = "Client for Coinbase Pro"; @@ -60186,8 +60437,8 @@ self: { pname = "compdoc"; version = "0.3.0.0"; sha256 = "07gbs64r8qsxw4j0mlk7kldbdjjzz4v34pm8b5cj7a6r1l33w7k5"; - revision = "3"; - editedCabalFile = "1k9hahs857mg72krmhb0n1igfqy344pnlllbishrrj6hknc84xfq"; + revision = "4"; + editedCabalFile = "14p4gi1wyiwv738m505j6j2v8j2dimw1gp6qb7wfq4f8mf53lpll"; libraryHaskellDepends = [ aeson base composite-aeson composite-aeson-throw composite-base pandoc pandoc-throw path rio vinyl @@ -60204,6 +60455,8 @@ self: { pname = "compdoc-dhall-decoder"; version = "0.3.0.0"; sha256 = "0qsq67zj8gr9xlgcbxgn5fi1cyv4qf7w5vzfl3v4hvil7xf3fn77"; + revision = "1"; + editedCabalFile = "0k08bcjjnvs54fjvxzy1hv7zp7z2n0iydsiix83x6a2jii7105v4"; libraryHaskellDepends = [ base compdoc composite-aeson composite-base dhall either pandoc text @@ -60553,15 +60806,15 @@ self: { "composite-dhall" = callPackage ({ mkDerivation, base, composite-base, dhall, tasty, tasty-hunit - , text, vinyl + , text }: mkDerivation { pname = "composite-dhall"; - version = "0.0.3.0"; - sha256 = "1ynamdgamlri6ll0vh02kp4iy04vgsplsrda49by1b4vc9b4hcdz"; - libraryHaskellDepends = [ base composite-base dhall text vinyl ]; + version = "0.0.4.1"; + sha256 = "19lhw02my7dv6gx2zlvmsbc2w4g09j1yxpwg6s203bd5n4dp5v9v"; + libraryHaskellDepends = [ base composite-base dhall text ]; testHaskellDepends = [ - base composite-base dhall tasty tasty-hunit text vinyl + base composite-base dhall tasty tasty-hunit text ]; description = "Dhall instances for composite records"; license = lib.licenses.mit; @@ -60656,6 +60909,8 @@ self: { pname = "composite-tuple"; version = "0.1.2.0"; sha256 = "0y5xz4q5z2lw3jy3fdm5rl19sd969cdpq1a44ar45dpab0qffr41"; + revision = "1"; + editedCabalFile = "0j7mj8g3v4x0vy4rbx00kxb7d41r3s3djbfin9f1h592ahyap1va"; libraryHaskellDepends = [ base composite-base ]; description = "Tuple functions for composite records"; license = lib.licenses.mit; @@ -61179,6 +61434,23 @@ self: { license = lib.licenses.mit; }) {}; + "concurrency_1_11_0_2" = callPackage + ({ mkDerivation, array, atomic-primops, base, exceptions + , monad-control, mtl, stm, transformers + }: + mkDerivation { + pname = "concurrency"; + version = "1.11.0.2"; + sha256 = "0c7nq4d29s49a3h9wzjdi3idm6r68vxn6ybphsbrk2vmwqyfq36y"; + libraryHaskellDepends = [ + array atomic-primops base exceptions monad-control mtl stm + transformers + ]; + description = "Typeclasses, functions, and data types for concurrency and STM"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "concurrency-benchmarks" = callPackage ({ mkDerivation, async, base, bench-graph, bytestring, Chart , Chart-diagrams, csv, deepseq, directory, gauge, getopt-generics @@ -63452,6 +63724,8 @@ self: { libraryHaskellDepends = [ base base-unicode-symbols containers ]; description = "Unicode alternatives for common functions and operators"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "containers-verified" = callPackage @@ -63624,14 +63898,14 @@ self: { "contiguous" = callPackage ({ mkDerivation, base, deepseq, primitive, primitive-unlifted , QuickCheck, quickcheck-classes, quickcheck-instances, random - , random-shuffle, vector, weigh + , random-shuffle, run-st, vector, weigh }: mkDerivation { pname = "contiguous"; - version = "0.5.1"; - sha256 = "1y02gqgd012zggs7kqxkky0prmbl0k9ji5ynb74i5mym88xrj67h"; + version = "0.5.2"; + sha256 = "04ylz0mld2yj0mdj88k38jw9330p88h0ga46p4wzlmazsy0p5s67"; libraryHaskellDepends = [ - base deepseq primitive primitive-unlifted + base deepseq primitive primitive-unlifted run-st ]; testHaskellDepends = [ base primitive QuickCheck quickcheck-classes quickcheck-instances @@ -63642,6 +63916,8 @@ self: { ]; description = "Unified interface for primitive arrays"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "contiguous-checked" = callPackage @@ -63666,6 +63942,7 @@ self: { libraryHaskellDepends = [ base contiguous primitive semirings ]; description = "dft of contiguous memory structures"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "continue" = callPackage @@ -68165,8 +68442,8 @@ self: { }: mkDerivation { pname = "cursedcsv"; - version = "0.1.3"; - sha256 = "0q6pqsv0bvn30nlkfk285hilixa9hi3n3gzil0gb4gic2zpb55dk"; + version = "0.1.4"; + sha256 = "1zh71fcp2qp516lzvqc7n3yamg1lwbdjh74k5f3ni1j9ynz6zh28"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -68278,8 +68555,8 @@ self: { }: mkDerivation { pname = "curve25519"; - version = "0.2.5"; - sha256 = "1j2fc1wv6xx95sicx2m44dm41gdfspb74qmh58592pp5fcv54vbb"; + version = "0.2.6"; + sha256 = "11xrr8d4a8mwagqy8wfmja9aj875854bc0ns37x01wdcpwsr3s2h"; libraryHaskellDepends = [ base bytestring crypto-api ]; testHaskellDepends = [ base bytestring crypto-api DRBG HUnit QuickCheck tagged @@ -70449,16 +70726,18 @@ self: { }) {}; "data-pdf-fieldreader" = callPackage - ({ mkDerivation, base, bytestring, containers, optparse-applicative - , text + ({ mkDerivation, base, bytestring, containers, megaparsec + , optparse-applicative, text }: mkDerivation { pname = "data-pdf-fieldreader"; - version = "0.1.0.0"; - sha256 = "1h57hva0dkhnshallf2yxwfmzfqzd6wm20cbxn8qm94jp95a627d"; + version = "0.1.1.0"; + sha256 = "0mcf676mgjgckzk97qi60z03530zk05mby73dxv7dnbdxw340zn7"; isLibrary = true; isExecutable = true; - libraryHaskellDepends = [ base bytestring containers text ]; + libraryHaskellDepends = [ + base bytestring containers megaparsec text + ]; executableHaskellDepends = [ base bytestring containers optparse-applicative text ]; @@ -72917,6 +73196,23 @@ self: { license = lib.licenses.mit; }) {}; + "dejafu_2_4_0_3" = callPackage + ({ mkDerivation, base, concurrency, containers, contravariant + , deepseq, exceptions, leancheck, profunctors, random, transformers + }: + mkDerivation { + pname = "dejafu"; + version = "2.4.0.3"; + sha256 = "1qzc8jbl6zwbncfmfmcwwmmhwzgbwc7wmnxxxa3mbcjbwhyibf92"; + libraryHaskellDepends = [ + base concurrency containers contravariant deepseq exceptions + leancheck profunctors random transformers + ]; + description = "A library for unit-testing concurrent programs"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "deka" = callPackage ({ mkDerivation, base, bytestring, mpdec, parsec, transformers }: mkDerivation { @@ -75053,6 +75349,8 @@ self: { pname = "diagrams-canvas"; version = "1.4.1"; sha256 = "1ihmv42412d8dk3s894zd70xd386wrk9ycxkid19barry1vz5plj"; + revision = "1"; + editedCabalFile = "12p6n6g4ab81b39d031vzwfj89qi5wm27srpyigf2v0zswppdyvn"; libraryHaskellDepends = [ base blank-canvas cmdargs containers data-default-class diagrams-core diagrams-lib lens mtl NumInstances @@ -75120,6 +75418,8 @@ self: { pname = "diagrams-core"; version = "1.5.0"; sha256 = "0y3smp3hiyfdirdak3j4048cgqv7a5q9p2jb6z8na2llys5mrmdn"; + revision = "1"; + editedCabalFile = "1718pkifs74nq8bdwcm6firahy8riiinwarcxkk087brmm2rbfli"; libraryHaskellDepends = [ adjunctions base containers distributive dual-tree lens linear monoid-extras mtl profunctors semigroups unordered-containers @@ -75167,22 +75467,22 @@ self: { "diagrams-haddock" = callPackage ({ mkDerivation, ansi-terminal, base, base64-bytestring, bytestring - , Cabal, cautious-file, cmdargs, containers, cpphs - , diagrams-builder, diagrams-lib, diagrams-svg, directory, filepath - , haskell-src-exts, lens, linear, mtl, parsec, QuickCheck, split - , strict, svg-builder, tasty, tasty-quickcheck, text, uniplate + , Cabal, cmdargs, containers, cpphs, diagrams-builder, diagrams-lib + , diagrams-svg, directory, filepath, haskell-src-exts, lens, linear + , mtl, parsec, QuickCheck, split, strict, svg-builder, tasty + , tasty-quickcheck, text, uniplate, unliftio }: mkDerivation { pname = "diagrams-haddock"; - version = "0.4.0.3"; - sha256 = "1kv1m9hg2npm2k11svh0c27xknvh2j7x662wcbnpxnc44cxlqyak"; + version = "0.4.1"; + sha256 = "0p978saxsfad6d8wkjnp6i300cf58ps02yw7a1zzhjfgk5ih2qlb"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - ansi-terminal base base64-bytestring bytestring cautious-file - containers cpphs diagrams-builder diagrams-lib diagrams-svg - directory filepath haskell-src-exts lens linear mtl parsec split - strict svg-builder text uniplate + ansi-terminal base base64-bytestring bytestring containers cpphs + diagrams-builder diagrams-lib diagrams-svg directory filepath + haskell-src-exts lens linear mtl parsec split strict svg-builder + text uniplate unliftio ]; executableHaskellDepends = [ base Cabal cmdargs cpphs directory filepath @@ -75465,6 +75765,8 @@ self: { pname = "diagrams-solve"; version = "0.1.3"; sha256 = "09qqwcvbvd3a0j5fnp40dbzw0i3py9c7kgizj2aawajwbyjvpd17"; + revision = "1"; + editedCabalFile = "0dp61igq17l7hvhs3167skdi1vmlm773qrrmsqmj08951l4cgv0h"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base deepseq tasty tasty-hunit tasty-quickcheck @@ -80690,6 +80992,8 @@ self: { pname = "dual-tree"; version = "0.2.3.0"; sha256 = "0qyn7kb42wvlcvb1wbf1qx3isc2y6k3hzp5iq6ab0r0llw9g6qlg"; + revision = "1"; + editedCabalFile = "1babd7ybsgk73x57yl35q0n1i7mbbqmv4am710kq1hzg3in4g9dv"; libraryHaskellDepends = [ base monoid-extras newtype-generics semigroups ]; @@ -84873,6 +85177,7 @@ self: { testHaskellDepends = [ arith-encode base binary HUnit-Plus ]; description = "A practical API for building recursive enumeration procedures and enumerating datatypes"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "enumerator" = callPackage @@ -91810,6 +92115,22 @@ self: { license = lib.licenses.bsd3; }) {}; + "filepath-bytestring_1_4_2_1_8" = callPackage + ({ mkDerivation, base, bytestring, criterion, filepath, QuickCheck + , unix + }: + mkDerivation { + pname = "filepath-bytestring"; + version = "1.4.2.1.8"; + sha256 = "0qrrvbjpjsk75ghqrdqzwqg7wjgm3rr9kk7p04ax98ilv90pm0ip"; + libraryHaskellDepends = [ base bytestring unix ]; + testHaskellDepends = [ base bytestring filepath QuickCheck ]; + benchmarkHaskellDepends = [ base criterion filepath ]; + description = "Library for manipulating RawFilePaths in a cross platform way"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "filepath-crypto" = callPackage ({ mkDerivation, base, binary, bytestring, case-insensitive , cryptoids, cryptoids-class, cryptoids-types, exceptions, filepath @@ -93385,19 +93706,19 @@ self: { "flatparse" = callPackage ({ mkDerivation, attoparsec, base, bytesmith, bytestring - , containers, gauge, megaparsec, parsec, primitive + , containers, gauge, integer-gmp, megaparsec, parsec, primitive , template-haskell }: mkDerivation { pname = "flatparse"; - version = "0.2.1.0"; - sha256 = "19vwh9fqda7fp7nv7sgxafvvc5kckaayizjw2vvmd634ka0bsyrr"; + version = "0.2.2.0"; + sha256 = "13cm882c2n0p52dwn802cqgfqrgkmlrb1kaxm2l89yfpb6wqynfz"; libraryHaskellDepends = [ - base bytestring containers template-haskell + base bytestring containers integer-gmp template-haskell ]; benchmarkHaskellDepends = [ - attoparsec base bytesmith bytestring gauge megaparsec parsec - primitive + attoparsec base bytesmith bytestring gauge integer-gmp megaparsec + parsec primitive ]; description = "High-performance parsing from strict bytestrings"; license = lib.licenses.mit; @@ -98114,16 +98435,17 @@ self: { "futhark-data" = callPackage ({ mkDerivation, base, binary, bytestring, bytestring-to-vector - , containers, half, megaparsec, mtl, QuickCheck, tasty, tasty-hunit - , tasty-quickcheck, text, vector, vector-binary-instances + , containers, half, megaparsec, mtl, QuickCheck, scientific, tasty + , tasty-hunit, tasty-quickcheck, text, vector + , vector-binary-instances }: mkDerivation { pname = "futhark-data"; - version = "1.0.1.1"; - sha256 = "1rd3hrsr0zq6v5wwhgn5mam5262lmvihaa8g4pxnl47lh3hc8q5w"; + version = "1.0.2.0"; + sha256 = "1z5arzvd3n7cjmws2cwz7i8ji14xngrnza55781h06qh0pakg8dd"; libraryHaskellDepends = [ base binary bytestring bytestring-to-vector containers half - megaparsec mtl text vector vector-binary-instances + megaparsec mtl scientific text vector vector-binary-instances ]; testHaskellDepends = [ base binary bytestring megaparsec QuickCheck tasty tasty-hunit @@ -99972,8 +100294,8 @@ self: { ({ mkDerivation, base, generics-sop }: mkDerivation { pname = "generic-match"; - version = "0.3.0.0"; - sha256 = "1h27gd7f0px3xgan9liqwav8xhl0smn6nhdmi7ggd18mjafa1ngv"; + version = "0.3.0.1"; + sha256 = "1qznsnb2d3dd9h5bdn54nkmqas4l4rsnp3fzj0bcpmbj3g245lc4"; libraryHaskellDepends = [ base generics-sop ]; description = "First class pattern matching"; license = lib.licenses.mit; @@ -101365,14 +101687,14 @@ self: { }) {}; "geomancy" = callPackage - ({ mkDerivation, base, criterion, deepseq, hedgehog, linear }: + ({ mkDerivation, base, containers, criterion, deepseq, hedgehog + , linear + }: mkDerivation { pname = "geomancy"; - version = "0.2.2.3"; - sha256 = "17xg6cxyl83dxlb1yv85cnavw8cgqj3mbr1v9sa46fawb4mlv9i8"; - revision = "1"; - editedCabalFile = "06cfw1jf1380cxqc5ywj768svym7nm0rmrglhjkfz6p29arc6hwr"; - libraryHaskellDepends = [ base deepseq ]; + version = "0.2.2.4"; + sha256 = "0vx2dz7fxd4hq50whsx0g6i3v1aidr7rpbylf169q1vshhrl8yaf"; + libraryHaskellDepends = [ base containers deepseq ]; testHaskellDepends = [ base deepseq hedgehog linear ]; benchmarkHaskellDepends = [ base criterion deepseq linear ]; description = "Geometry and matrix manipulation"; @@ -101483,24 +101805,24 @@ self: { "gf" = callPackage ({ mkDerivation, alex, array, base, bytestring, Cabal, cgi - , containers, directory, exceptions, filepath, happy, haskeline - , httpd-shed, json, mtl, network, network-uri, parallel, pretty - , process, random, terminfo, time, time-compat, unix, utf8-string + , containers, directory, exceptions, filepath, ghc-prim, happy + , haskeline, httpd-shed, json, mtl, network, network-uri, parallel + , pretty, process, random, terminfo, time, transformers-compat + , unix, utf8-string }: mkDerivation { pname = "gf"; - version = "3.10"; - sha256 = "1f0wwrhid0iqk2lmf9aprkzml8xpc3vsvvfpqfywf8qk8i76wwkv"; - revision = "3"; - editedCabalFile = "1c6gv692pz1xf41ajdji62xs41l8yy35nlcn6x7rs7symgx1v1bg"; + version = "3.11"; + sha256 = "18fx0kba86hyyimrahvgs7jsd5g718psis4drmxmxmx3bdvxj3bd"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; setupHaskellDepends = [ base Cabal directory filepath process ]; libraryHaskellDepends = [ array base bytestring cgi containers directory exceptions filepath - haskeline httpd-shed json mtl network network-uri parallel pretty - process random terminfo time time-compat unix utf8-string + ghc-prim haskeline httpd-shed json mtl network network-uri parallel + pretty process random terminfo time transformers-compat unix + utf8-string ]; libraryToolDepends = [ alex happy ]; executableHaskellDepends = [ base ]; @@ -101590,7 +101912,7 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; - "ghc-api-compat" = callPackage + "ghc-api-compat_8_6" = callPackage ({ mkDerivation, ghc }: mkDerivation { pname = "ghc-api-compat"; @@ -101602,6 +101924,19 @@ self: { doHaddock = false; description = "GHC-API compatibility helpers"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + + "ghc-api-compat" = callPackage + ({ mkDerivation, base, ghc }: + mkDerivation { + pname = "ghc-api-compat"; + version = "8.10.5"; + sha256 = "09g04k7zvzjs312yn9hhk8bk3l6k2vbb8qrdpnlr12a6az4adq3s"; + libraryHaskellDepends = [ base ghc ]; + doHaddock = false; + description = "GHC-API compatibility helpers"; + license = lib.licenses.bsd3; }) {}; "ghc-bignum" = callPackage @@ -102596,8 +102931,8 @@ self: { ({ mkDerivation, base, filepath, optparse-applicative, process }: mkDerivation { pname = "ghc-prof-flamegraph"; - version = "0.2.0.0"; - sha256 = "1jvn243v0fhckqk3yjw2qf3zj3smhk2wjxqbj389gpxh790183cd"; + version = "0.2.0.1"; + sha256 = "11d9p9rb4z2ysmx5z076vaw0hr5y0h7bszwwx24vylkfddawv7v5"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -103070,8 +103405,8 @@ self: { }: mkDerivation { pname = "ghci-dap"; - version = "0.0.15.0"; - sha256 = "1m4ypd2d9bjdkdqrnqijc1na5g14mmjrcr5msgr7spsnskhzi4yg"; + version = "0.0.16.0"; + sha256 = "1ywlk4bf7m868vvd07vmzpv7d7xmw9haa16p13rx3kdf5rqc7wcv"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103261,6 +103596,8 @@ self: { pname = "ghcide"; version = "1.4.0.3"; sha256 = "1znf54l3g44cskx5blfaibf1frgyhy5z7906rdvyzb0dqfmkbzpw"; + revision = "1"; + editedCabalFile = "1qm3zj7c8qkc0ncm9bl57zj5nj7jm8c4lg2wzjrgmz3vvfmsd11c"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -103991,6 +104328,21 @@ self: { license = lib.licenses.lgpl21Only; }) {inherit (pkgs) glib;}; + "gi-gio-hs-list-model" = callPackage + ({ mkDerivation, base, containers, gi-gio, gi-gobject + , haskell-gi-base + }: + mkDerivation { + pname = "gi-gio-hs-list-model"; + version = "0.1.0.1"; + sha256 = "03gyr2fj8jaqrb6r7j14ylw1za7aqdblw0aihp6nr9s8hvqr80c2"; + libraryHaskellDepends = [ + base containers gi-gio gi-gobject haskell-gi-base + ]; + description = "Haskell implementation of GListModel interface from gi-gio"; + license = lib.licenses.lgpl21Only; + }) {}; + "gi-girepository" = callPackage ({ mkDerivation, base, bytestring, Cabal, containers, gi-glib , gi-gobject, gobject-introspection, haskell-gi, haskell-gi-base @@ -105990,14 +106342,14 @@ self: { , hslogger, HStringTemplate, HTTP, http-client-tls, http-conduit , json, mtl, network, network-bsd, network-uri, old-locale , old-time, pandoc, pandoc-types, parsec, pretty, process, random - , recaptcha, safe, SHA, skylighting, split, syb, tagsoup, text - , time, uri-bytestring, url, utf8-string, uuid, xhtml, xml + , recaptcha, safe, SHA, skylighting, split, syb, tagsoup, temporary + , text, time, uri-bytestring, url, utf8-string, uuid, xhtml, xml , xml-conduit, xml-types, xss-sanitize, zlib }: mkDerivation { pname = "gitit"; - version = "0.13.0.0"; - sha256 = "1d9vfjhr38xxpm0fq0b6dy581a1qacqg643njp8z2fz37rma3z15"; + version = "0.15.0.0"; + sha256 = "05kz7dxmiabp0gkivn5ngmn3xah3h7a14a421qw6nx2ld1cr9vgf"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -106008,8 +106360,8 @@ self: { http-client-tls http-conduit json mtl network network-bsd network-uri old-locale old-time pandoc pandoc-types parsec pretty process random recaptcha safe SHA skylighting split syb tagsoup - text time uri-bytestring url utf8-string uuid xhtml xml xml-conduit - xml-types xss-sanitize zlib + temporary text time uri-bytestring url utf8-string uuid xhtml xml + xml-conduit xml-types xss-sanitize zlib ]; executableHaskellDepends = [ base bytestring directory filepath hslogger HTTP mtl network @@ -119433,8 +119785,8 @@ self: { }: mkDerivation { pname = "haskell-debug-adapter"; - version = "0.0.34.0"; - sha256 = "00z9yhs2c34rdki404gcwf938a2lshr0a7mrvzpknk70n1a0gall"; + version = "0.0.35.0"; + sha256 = "1n8v7wgx5lqqw150lj9p8nzzxnmnjm2ksdvm7gcgb85shii7r2nf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120399,8 +120751,8 @@ self: { pname = "haskell-src"; version = "1.0.3.1"; sha256 = "0cjigvshk4b8wqdk0v0hz9ag1kyjjsmqsy4a1m3n28ac008cg746"; - revision = "3"; - editedCabalFile = "0hjridmgm95lrb9qs972zicipsqcfwpr35gwkzxncpgwcm0vn0b6"; + revision = "4"; + editedCabalFile = "0cyqdw77clzz7mq0b4c0jg2d1kdz9xii41268w2psmqmfpyn29pc"; libraryHaskellDepends = [ array base pretty syb ]; libraryToolDepends = [ happy ]; description = "Support for manipulating Haskell source code"; @@ -121815,20 +122167,20 @@ self: { "hasklepias" = callPackage ({ mkDerivation, aeson, base, bytestring, cmdargs, co-log , containers, flow, ghc-prim, hspec, interval-algebra, lens - , lens-aeson, mtl, nonempty-containers, process, QuickCheck, safe + , lens-aeson, mtl, nonempty-containers, QuickCheck, safe , semiring-simple, tasty, tasty-hspec, tasty-hunit, text, time , unordered-containers, vector, witherable }: mkDerivation { pname = "hasklepias"; - version = "0.13.1"; - sha256 = "1fhlw490bwyblsgjrzgms4lzkv0zd8bhsvl2ywlpz0flhdd999zr"; + version = "0.15.1"; + sha256 = "00n9fan0g3xdl9k0f0rw32xgrwzxb8x85vrj98yyk1dk490pgfhm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring cmdargs co-log containers flow ghc-prim - interval-algebra lens lens-aeson mtl nonempty-containers process - QuickCheck safe semiring-simple tasty tasty-hunit text time + interval-algebra lens lens-aeson mtl nonempty-containers QuickCheck + safe semiring-simple tasty tasty-hunit text time unordered-containers vector witherable ]; testHaskellDepends = [ @@ -121970,8 +122322,8 @@ self: { }: mkDerivation { pname = "haskoin-node"; - version = "0.17.12"; - sha256 = "0jb1ypscy5hgvbw5jrd5qjl7mdi2qgc7h3amyi50zh2m3lhmgjnv"; + version = "0.17.14"; + sha256 = "0a8lmap19gj2f6xyzz7mk4jdb8rc8vvzrri4jsb10n8xl5g9c2jj"; libraryHaskellDepends = [ base bytestring cereal conduit conduit-extra containers data-default hashable haskoin-core monad-logger mtl network nqe @@ -122053,8 +122405,8 @@ self: { }: mkDerivation { pname = "haskoin-store"; - version = "0.53.8"; - sha256 = "1djlq58v6wm3kr8jsvr612qxaxz1k03mfxvywd6ia45f761ry1ks"; + version = "0.53.10"; + sha256 = "0a20808l907wvgcdvbv7jvkpphpfj64x9cm7a07hpldsi2r3c26p"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -122099,8 +122451,8 @@ self: { }: mkDerivation { pname = "haskoin-store-data"; - version = "0.53.8"; - sha256 = "06q9h1n9c8gz6fycc8nsjxp98c98zin1f7y7qiyy80cddhcj1jzf"; + version = "0.53.10"; + sha256 = "0rnqa294j909s06nadg58vdblfvswb6si04m6gyf4k3ihmd1nj39"; libraryHaskellDepends = [ aeson base binary bytes bytestring cereal containers data-default deepseq hashable haskoin-core http-client http-types lens mtl @@ -126087,10 +126439,10 @@ self: { }: mkDerivation { pname = "helf"; - version = "0.2016.12.25"; - sha256 = "03hslws4v8md2m89ppawh9gfqri7f2rjjiklgc5nvc8nfyxvg5kx"; + version = "0.2021.8.12"; + sha256 = "020ri4yjlascjmj4ywc2hji05673bszsb3q5frg1a66nbadzbi2h"; revision = "1"; - editedCabalFile = "11a3k59ig549dm3pg5wh2brrdiss1ln0yw3j0j4mgcvqi7kzzmd3"; + editedCabalFile = "1573q8d39hgb4jq1bwpb7glxcv5bxv9vi27smhngk2wxxby9l4w3"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -126099,8 +126451,7 @@ self: { ]; executableToolDepends = [ alex happy ]; description = "Typechecking terms of the Edinburgh Logical Framework (LF)"; - license = "unknown"; - hydraPlatforms = lib.platforms.none; + license = lib.licenses.mit; }) {}; "helics" = callPackage @@ -127128,16 +127479,16 @@ self: { }: mkDerivation { pname = "hevm"; - version = "0.47.0"; - sha256 = "1rhs3vyf7kwzlyyc0xjp696vh11wm3jz8k27w01blniris5kch9l"; + version = "0.48.0"; + sha256 = "12clxkhkap4j0xkn5s2i6cphkhri8vccalg92znlm5drjpbmf457"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ - abstract-par aeson ansi-wl-pprint base base16-bytestring binary - brick bytestring cereal containers cryptonite data-dword Decimal - deepseq directory fgl filepath free haskeline here lens lens-aeson - megaparsec memory monad-par mtl multiset operational + abstract-par aeson ansi-wl-pprint async base base16-bytestring + binary brick bytestring cereal containers cryptonite data-dword + Decimal deepseq directory fgl filepath free haskeline here lens + lens-aeson megaparsec memory monad-par mtl multiset operational optparse-generic process QuickCheck quickcheck-text regex-tdfa restless-git rosezipper s-cargot sbv scientific semver-range temporary text text-format time transformers tree-view @@ -130602,6 +130953,8 @@ self: { pname = "hledger-iadd"; version = "1.3.15"; sha256 = "1jnym3jfixyrldl83jjy3syx6n411gd8dr2jh69lx5wbq8qddpfm"; + revision = "1"; + editedCabalFile = "1vyvnk64397kmlhflq1vp9rswhxbcywdw20738z3wq1pig2hqf7b"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -130641,6 +130994,24 @@ self: { maintainers = with lib.maintainers; [ peti ]; }) {}; + "hledger-interest_1_6_2" = callPackage + ({ mkDerivation, base, Cabal, Decimal, hledger-lib, mtl, text, time + }: + mkDerivation { + pname = "hledger-interest"; + version = "1.6.2"; + sha256 = "06gx19vld2lqq5w15hj7amcn1yi7rx8dxrb32hb05aari8b9qdzz"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base Cabal Decimal hledger-lib mtl text time + ]; + description = "computes interest for a given account"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ peti ]; + }) {}; + "hledger-irr" = callPackage ({ mkDerivation, base, Cabal, data-default-class, Decimal , hledger-lib, math-functions, text, time @@ -131154,8 +131525,8 @@ self: { pname = "hlrdb"; version = "0.3.2.0"; sha256 = "1k4dsd4h3fv1ag753gwxvirfrj53ra4ik948pyacq31c16mz1l2p"; - revision = "1"; - editedCabalFile = "1ypb0197v5x6a5zkj7qqrr7lam3sxvvi3wbgk5imvdppq2rj7hqz"; + revision = "2"; + editedCabalFile = "15z6f2qqis3qi1cfq43hhcqgcsinx58ha3bghh0pfybqysvbjmmd"; libraryHaskellDepends = [ base base64-bytestring bytestring cryptonite hashable hedis hlrdb-core memory random store time unordered-containers zstd @@ -131434,6 +131805,8 @@ self: { pname = "hls-plugin-api"; version = "1.1.0.2"; sha256 = "1x49h8087x3fynagm4na72lyqyy58bb33kcrzkfcpbr3lsb8k455"; + revision = "1"; + editedCabalFile = "0pgicyph7zz2c7pbcair4wp4x5vvkmigbxxzrsxsgmvavki8r904"; libraryHaskellDepends = [ aeson base containers data-default dependent-map dependent-sum Diff dlist ghc ghc-api-compat hashable hls-graph hslogger lens lsp @@ -133872,6 +134245,8 @@ self: { executableToolDepends = [ alex happy ]; description = "A language based on homotopy type theory with an interval type"; license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hora" = callPackage @@ -134379,6 +134754,37 @@ self: { license = lib.licenses.bsd3; }) {}; + "hpack-dhall_0_5_3" = callPackage + ({ mkDerivation, aeson, aeson-pretty, base, bytestring, Cabal + , dhall, dhall-json, Diff, directory, filepath, hlint, hpack + , megaparsec, microlens, optparse-applicative, prettyprinter, tasty + , tasty-golden, text, transformers, utf8-string, yaml + }: + mkDerivation { + pname = "hpack-dhall"; + version = "0.5.3"; + sha256 = "1prpk9lppz8h5bp6slhl7lm28jw6jf746py9vras0m0g6mrcc3l7"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty base bytestring dhall dhall-json filepath hpack + megaparsec microlens prettyprinter text transformers yaml + ]; + executableHaskellDepends = [ + aeson aeson-pretty base bytestring dhall dhall-json filepath hpack + megaparsec microlens optparse-applicative prettyprinter text + transformers yaml + ]; + testHaskellDepends = [ + aeson aeson-pretty base bytestring Cabal dhall dhall-json Diff + directory filepath hlint hpack megaparsec microlens prettyprinter + tasty tasty-golden text transformers utf8-string yaml + ]; + description = "hpack's dhalling"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "hpaco" = callPackage ({ mkDerivation, aeson, base, cmdargs, filepath, hpaco-lib, strict , utf8-string, yaml @@ -134521,14 +134927,14 @@ self: { "hpath-directory" = callPackage ({ mkDerivation, base, bytestring, exceptions, hpath-filepath - , hpath-posix, hspec, HUnit, IfElse, process, safe-exceptions - , streamly, streamly-bytestring, streamly-posix, time, transformers - , unix, unix-bytestring, utf8-string + , hpath-posix, hspec, hspec-discover, HUnit, IfElse, process + , safe-exceptions, streamly, streamly-bytestring, streamly-posix + , time, transformers, unix, unix-bytestring, utf8-string }: mkDerivation { pname = "hpath-directory"; - version = "0.14.2"; - sha256 = "04lkan37v8i1clw459csn8jvkzasz0p8ik8q8slqb9g3a5j68hjy"; + version = "0.14.2.2"; + sha256 = "0541pd1ac47wyxwz07yvk8yg1ldbfwzgfaq6rfl8pf182p607a6m"; libraryHaskellDepends = [ base bytestring exceptions hpath-filepath hpath-posix IfElse safe-exceptions streamly streamly-bytestring streamly-posix time @@ -134538,6 +134944,7 @@ self: { base bytestring hpath-filepath hpath-posix hspec HUnit IfElse process time unix unix-bytestring utf8-string ]; + testToolDepends = [ hspec-discover ]; description = "Alternative to 'directory' package with ByteString based filepaths"; license = lib.licenses.bsd3; }) {}; @@ -138338,7 +138745,7 @@ self: { "hsmagick" = callPackage ({ mkDerivation, base, bytestring, bzip2, directory, filepath - , freetype2, GraphicsMagick, jasper, lcms, libjpeg, libpng, libxml2 + , freetype, GraphicsMagick, jasper, lcms, libjpeg, libpng, libxml2 , pretty, process, tiff, wmflite, zlib }: mkDerivation { @@ -138352,18 +138759,16 @@ self: { librarySystemDepends = [ bzip2 jasper libjpeg libpng tiff wmflite zlib ]; - libraryPkgconfigDepends = [ - freetype2 GraphicsMagick lcms libxml2 - ]; + libraryPkgconfigDepends = [ freetype GraphicsMagick lcms libxml2 ]; description = "FFI bindings for the GraphicsMagick library"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; broken = true; - }) {GraphicsMagick = null; inherit (pkgs) bzip2; freetype2 = null; - inherit (pkgs) jasper; inherit (pkgs) lcms; - inherit (pkgs) libjpeg; inherit (pkgs) libpng; - inherit (pkgs) libxml2; tiff = null; wmflite = null; - inherit (pkgs) zlib;}; + }) {GraphicsMagick = null; inherit (pkgs) bzip2; + inherit (pkgs) freetype; inherit (pkgs) jasper; + inherit (pkgs) lcms; inherit (pkgs) libjpeg; + inherit (pkgs) libpng; inherit (pkgs) libxml2; tiff = null; + wmflite = null; inherit (pkgs) zlib;}; "hsmisc" = callPackage ({ mkDerivation, base, containers, HUnit, mtl, old-locale, parsec @@ -138467,6 +138872,8 @@ self: { ]; description = "Nock 5K interpreter"; license = lib.licenses.publicDomain; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hsnoise" = callPackage @@ -138689,14 +139096,14 @@ self: { license = lib.licenses.mit; }) {}; - "hspec_2_8_2" = callPackage + "hspec_2_8_3" = callPackage ({ mkDerivation, base, hspec-core, hspec-discover , hspec-expectations, QuickCheck }: mkDerivation { pname = "hspec"; - version = "2.8.2"; - sha256 = "1s03c1928ndl8bqi3n9fb8a5adr0lycl9qs3x1i6aprzr851myh5"; + version = "2.8.3"; + sha256 = "1ryv1qad2rw40ak6n7agfd0sib1xk2iyqpz0qhgyxwp3kkjhrn49"; libraryHaskellDepends = [ base hspec-core hspec-discover hspec-expectations QuickCheck ]; @@ -138787,7 +139194,7 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-core_2_8_2" = callPackage + "hspec-core_2_8_3" = callPackage ({ mkDerivation, ansi-terminal, array, base, call-stack, clock , deepseq, directory, filepath, hspec-expectations, hspec-meta , HUnit, process, QuickCheck, quickcheck-io, random, setenv @@ -138795,8 +139202,8 @@ self: { }: mkDerivation { pname = "hspec-core"; - version = "2.8.2"; - sha256 = "0id4c70hq46y2s623y4zsj9pycqp90a3ig991shrhxxd6836c4cx"; + version = "2.8.3"; + sha256 = "0khq0xa6agqcvbngzlxnvd9xwh7dmp4rsb2nzvfwsaknw2674i0k"; libraryHaskellDepends = [ ansi-terminal array base call-stack clock deepseq directory filepath hspec-expectations HUnit QuickCheck quickcheck-io random @@ -138852,19 +139259,20 @@ self: { license = lib.licenses.mit; }) {}; - "hspec-discover_2_8_2" = callPackage - ({ mkDerivation, base, directory, filepath, hspec-meta, QuickCheck + "hspec-discover_2_8_3" = callPackage + ({ mkDerivation, base, directory, filepath, hspec-meta, mockery + , QuickCheck }: mkDerivation { pname = "hspec-discover"; - version = "2.8.2"; - sha256 = "0bmdph9q4rg5rgr6s65h7si2l5rxyyqv80j5rri6zb4d1n9ih6hs"; + version = "2.8.3"; + sha256 = "09rjrq289si08cza48gcp29780rv21rs0b12xglkmbd6vfqzp6cs"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base directory filepath ]; executableHaskellDepends = [ base directory filepath ]; testHaskellDepends = [ - base directory filepath hspec-meta QuickCheck + base directory filepath hspec-meta mockery QuickCheck ]; testToolDepends = [ hspec-meta ]; description = "Automatically discover and run Hspec tests"; @@ -140739,6 +141147,27 @@ self: { license = lib.licenses.mit; }) {}; + "html-conduit_1_3_2_2" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, conduit + , conduit-extra, containers, deepseq, hspec, HUnit, resourcet, text + , transformers, xml-conduit, xml-types + }: + mkDerivation { + pname = "html-conduit"; + version = "1.3.2.2"; + sha256 = "09bwrdam3y47kqllgg6w098ghqb8jb10dp4wxirsvx5ddpx9zpi6"; + libraryHaskellDepends = [ + attoparsec base bytestring conduit conduit-extra containers + resourcet text transformers xml-conduit xml-types + ]; + testHaskellDepends = [ + base bytestring containers deepseq hspec HUnit text xml-conduit + ]; + description = "Parse HTML documents using xml-conduit datatypes"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "html-email-validate" = callPackage ({ mkDerivation, attoparsec, base, criterion, hspec, QuickCheck , regex-pcre-builtin, text @@ -142854,6 +143283,18 @@ self: { license = lib.licenses.mit; }) {}; + "hunit-dejafu_2_0_0_5" = callPackage + ({ mkDerivation, base, dejafu, exceptions, HUnit }: + mkDerivation { + pname = "hunit-dejafu"; + version = "2.0.0.5"; + sha256 = "0pbsbj70a2m7zvk25wa8mi0ymxv4c49g2vgg8819wpjcrxw8sy64"; + libraryHaskellDepends = [ base dejafu exceptions HUnit ]; + description = "Deja Fu support for the HUnit test framework"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "hunit-gui" = callPackage ({ mkDerivation, base, cairo, gtk, haskell98, HUnit }: mkDerivation { @@ -143157,6 +143598,8 @@ self: { ]; description = "A simple command line calculator"; license = "GPL"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "hutton" = callPackage @@ -143243,8 +143686,8 @@ self: { ({ mkDerivation, base, hvega, text }: mkDerivation { pname = "hvega-theme"; - version = "0.2.0.4"; - sha256 = "0g2h5is0gbr43fn8pbfj2nzh4wlgx6kjayq4lcnbr10z0j3vpqpv"; + version = "0.2.0.5"; + sha256 = "19pkrv92wr0bzalrzz15fmz74ylzcab8klqppnjzpdmym43zd0rm"; libraryHaskellDepends = [ base hvega text ]; description = "Theme for hvega"; license = lib.licenses.gpl3Only; @@ -149894,8 +150337,8 @@ self: { }: mkDerivation { pname = "interval-algebra"; - version = "0.8.6"; - sha256 = "1k9x1c7hrbrq6zgj82k8w28ak1jp1v9iq19bicl5355r4p2wiqsa"; + version = "0.10.0"; + sha256 = "1b1a78rssxaqiw42hbb1zqmlq4lmxkxxkhrm3ybqpmrqk492mckv"; libraryHaskellDepends = [ base containers foldl QuickCheck safe time witherable ]; @@ -150573,6 +151016,7 @@ self: { ]; description = "Library for IP and MAC addresses"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ip-quoter" = callPackage @@ -150958,6 +151402,28 @@ self: { maintainers = with lib.maintainers; [ sternenseemann ]; }) {}; + "irc-client_1_1_2_2" = callPackage + ({ mkDerivation, base, bytestring, conduit, connection, containers + , contravariant, exceptions, irc-conduit, irc-ctcp, mtl + , network-conduit-tls, old-locale, profunctors, stm, stm-chans + , text, time, tls, transformers, x509, x509-store, x509-validation + }: + mkDerivation { + pname = "irc-client"; + version = "1.1.2.2"; + sha256 = "0hhaf7xhy3q48gkp2j01jjiiz0ww9mwwjh8brbqs8phlal03ks70"; + libraryHaskellDepends = [ + base bytestring conduit connection containers contravariant + exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale + profunctors stm stm-chans text time tls transformers x509 + x509-store x509-validation + ]; + description = "An IRC client library"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + maintainers = with lib.maintainers; [ sternenseemann ]; + }) {}; + "irc-colors" = callPackage ({ mkDerivation, base, text }: mkDerivation { @@ -150987,6 +151453,25 @@ self: { license = lib.licenses.mit; }) {}; + "irc-conduit_0_3_0_5" = callPackage + ({ mkDerivation, async, base, bytestring, conduit, conduit-extra + , connection, irc, irc-ctcp, network-conduit-tls, profunctors, text + , time, tls, transformers, x509-validation + }: + mkDerivation { + pname = "irc-conduit"; + version = "0.3.0.5"; + sha256 = "02ziqjzqdyaizhrrzlbq4ddkfjfjf58jvwqfzrbf0mf0f5scv9cz"; + libraryHaskellDepends = [ + async base bytestring conduit conduit-extra connection irc irc-ctcp + network-conduit-tls profunctors text time tls transformers + x509-validation + ]; + description = "Streaming IRC message library using conduits"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "irc-core" = callPackage ({ mkDerivation, attoparsec, base, base64-bytestring, bytestring , hashable, HUnit, primitive, text, time, vector @@ -151016,6 +151501,18 @@ self: { license = lib.licenses.mit; }) {}; + "irc-ctcp_0_1_3_1" = callPackage + ({ mkDerivation, base, bytestring, text }: + mkDerivation { + pname = "irc-ctcp"; + version = "0.1.3.1"; + sha256 = "1ckdbxnjv96bpyhcpdi0vj6pjjq8wm4zyh75fps57wi1j61c4v2n"; + libraryHaskellDepends = [ base bytestring text ]; + description = "A CTCP encoding and decoding library for IRC clients"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "irc-dcc" = callPackage ({ mkDerivation, attoparsec, base, binary, bytestring , hspec-attoparsec, io-streams, iproute, irc-ctcp, mtl, network @@ -152928,18 +153425,18 @@ self: { "jenkinsPlugins2nix" = callPackage ({ mkDerivation, attoparsec, base, bimap, bytestring, containers - , cryptohash, hnix, http-conduit, mtl, optparse-applicative + , cryptonite, hnix, http-conduit, mtl, optparse-applicative , prettyprinter, prettyprinter-ansi-terminal, tasty-hspec, text , zip-archive }: mkDerivation { pname = "jenkinsPlugins2nix"; - version = "0.4.0.0"; - sha256 = "0s2k4irml4hahnv9qzsw1vvlqc651gmwgiscz97pcgb25v5slmcz"; + version = "0.5.0.0"; + sha256 = "15nalymjgvzsv6pyhy4fx70cdnffd1kamhl94w0xg0vrzrqq17rc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - attoparsec base bytestring containers cryptohash hnix http-conduit + attoparsec base bytestring containers cryptonite hnix http-conduit mtl prettyprinter text zip-archive ]; executableHaskellDepends = [ @@ -153364,6 +153861,37 @@ self: { license = lib.licenses.asl20; }) {}; + "jose_0_8_4_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , bytestring, concise, containers, cryptonite, hspec, lens, memory + , monad-time, mtl, network-uri, pem, QuickCheck + , quickcheck-instances, safe, tasty, tasty-hspec, tasty-quickcheck + , template-haskell, text, time, unordered-containers, vector, x509 + }: + mkDerivation { + pname = "jose"; + version = "0.8.4.1"; + sha256 = "0zwac71gqxf2wz840gfwnpv0ax7c4wpiwkcxqwcfil7fn4bqjlpw"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring concise + containers cryptonite lens memory monad-time mtl network-uri + QuickCheck quickcheck-instances safe template-haskell text time + unordered-containers vector x509 + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring bytestring concise + containers cryptonite hspec lens memory monad-time mtl network-uri + pem QuickCheck quickcheck-instances safe tasty tasty-hspec + tasty-quickcheck template-haskell text time unordered-containers + vector x509 + ]; + description = "Javascript Object Signing and Encryption and JSON Web Token library"; + license = lib.licenses.asl20; + hydraPlatforms = lib.platforms.none; + }) {}; + "jose-jwt" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, cereal , containers, criterion, cryptonite, hspec, HUnit, memory, mtl @@ -158531,8 +159059,8 @@ self: { }: mkDerivation { pname = "lambdabot"; - version = "5.3.0.1"; - sha256 = "0jkp4qr2d37pd0nr074fzrvjn95jg7x7zjwnddsqw5m4m2l1iqsr"; + version = "5.3.0.2"; + sha256 = "0c5qwgzisvqxlyh378bbnabb9lbinknwvcf46sjpm6355krcw3g7"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -158543,6 +159071,7 @@ self: { ]; description = "Lambdabot is a development tool and advanced IRC bot"; license = "GPL"; + hydraPlatforms = lib.platforms.none; }) {}; "lambdabot-core" = callPackage @@ -158570,6 +159099,32 @@ self: { license = "GPL"; }) {}; + "lambdabot-core_5_3_0_2" = callPackage + ({ mkDerivation, base, binary, bytestring, containers + , dependent-map, dependent-sum, dependent-sum-template, directory + , edit-distance, exceptions, filepath, haskeline, hslogger, HTTP + , lifted-base, monad-control, mtl, network, network-bsd, parsec + , prim-uniq, random, random-fu, random-source, regex-tdfa + , SafeSemaphore, split, syb, template-haskell, time, transformers + , transformers-base, unix, utf8-string, zlib + }: + mkDerivation { + pname = "lambdabot-core"; + version = "5.3.0.2"; + sha256 = "1i375kiw98j5gd4pixh59lcqk0lakwmrgxzpkr0431a48kxffq7r"; + libraryHaskellDepends = [ + base binary bytestring containers dependent-map dependent-sum + dependent-sum-template directory edit-distance exceptions filepath + haskeline hslogger HTTP lifted-base monad-control mtl network + network-bsd parsec prim-uniq random random-fu random-source + regex-tdfa SafeSemaphore split syb template-haskell time + transformers transformers-base unix utf8-string zlib + ]; + description = "Lambdabot core functionality"; + license = "GPL"; + hydraPlatforms = lib.platforms.none; + }) {}; + "lambdabot-haskell-plugins" = callPackage ({ mkDerivation, array, arrows, base, bytestring, containers , data-memocombinators, directory, filepath @@ -158581,8 +159136,8 @@ self: { }: mkDerivation { pname = "lambdabot-haskell-plugins"; - version = "5.3"; - sha256 = "1vlyjkz0dammzf5v8i9sfyswbnpfv0vpwpxybc1dhzm1qv04vbwh"; + version = "5.3.0.2"; + sha256 = "1h2f86dw3356n66n1nfcqi5hsnj6kvlc1px8s4nrw3zvjlkangzq"; libraryHaskellDepends = [ array arrows base bytestring containers data-memocombinators directory filepath haskell-src-exts-simple hoogle HTTP IOSpec @@ -158602,8 +159157,8 @@ self: { }: mkDerivation { pname = "lambdabot-irc-plugins"; - version = "5.3"; - sha256 = "0dm5bsr8hly43hzfja8h6i3n3jai38ln9629p4dlsr8s1himcjbm"; + version = "5.3.0.2"; + sha256 = "1pwl77dh474sqvhd4nfqcqvzicz36xww13sw49qs5wd2fkp50zqi"; libraryHaskellDepends = [ base bytestring containers directory filepath lambdabot-core lifted-base mtl network SafeSemaphore split time @@ -158621,8 +159176,8 @@ self: { }: mkDerivation { pname = "lambdabot-misc-plugins"; - version = "5.3"; - sha256 = "03cj8bzmg7q6b66mblmxv39aw5jd586w1w90zyl632rff4j5f0bh"; + version = "5.3.0.2"; + sha256 = "0m2rarvcmmas78ghzvzjf1flicj2sf4d14i7y5cxfpc5l3zcyqwq"; libraryHaskellDepends = [ base bytestring containers filepath lambdabot-core lifted-base mtl network network-uri parsec process random random-fu random-source @@ -158640,8 +159195,8 @@ self: { }: mkDerivation { pname = "lambdabot-novelty-plugins"; - version = "5.3"; - sha256 = "0f7frjj41wpkhzvzi2xz7hsv8cr0fg653iqf8gqxlprk4k1sag5n"; + version = "5.3.0.2"; + sha256 = "09rqshkh1k7536b9zw4rga370l35v47vf28xdlnrh7knwh88yr70"; libraryHaskellDepends = [ base binary brainfuck bytestring containers dice directory lambdabot-core misfortune process random-fu regex-tdfa unlambda @@ -158657,8 +159212,8 @@ self: { }: mkDerivation { pname = "lambdabot-reference-plugins"; - version = "5.3"; - sha256 = "0xg8cpd25d01a35y2qmrhp402iphhdjb8sld5lnwc8rzyn6nd7gb"; + version = "5.3.0.2"; + sha256 = "1n9r29gmllmad2nr83gnbafka7gp99qji1pj0hhcr7gb31asz2xl"; libraryHaskellDepends = [ base bytestring containers HTTP lambdabot-core mtl network network-uri oeis process regex-tdfa split tagsoup utf8-string @@ -158673,21 +159228,23 @@ self: { }: mkDerivation { pname = "lambdabot-social-plugins"; - version = "5.3"; - sha256 = "0gncll1z2x26v4g874vbwpg8yh9kang6wcvb4ywmfmlrs7kqw9fn"; + version = "5.3.0.2"; + sha256 = "10yl1z562cnnx0ml343c7psaw5zsil66zrbsgvij6cy2b2p2d3m2"; libraryHaskellDepends = [ base binary bytestring containers lambdabot-core mtl split time ]; description = "Social plugins for Lambdabot"; license = "GPL"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "lambdabot-trusted" = callPackage ({ mkDerivation, base, oeis, QuickCheck, QuickCheck-safe }: mkDerivation { pname = "lambdabot-trusted"; - version = "5.3"; - sha256 = "0847bxdnwh15szrhjb42y9nrb6qbaq6qyylwbmk1hkavp1baw77b"; + version = "5.3.0.2"; + sha256 = "1mwgamd75llraiafk7s43j6qz495j96s1dprckrisww37gv3nn8d"; libraryHaskellDepends = [ base oeis QuickCheck QuickCheck-safe ]; description = "Lambdabot trusted code"; license = "GPL"; @@ -160668,6 +161225,23 @@ self: { license = lib.licenses.bsd3; }) {}; + "lapack-hmatrix" = callPackage + ({ mkDerivation, base, comfort-array, hmatrix, lapack, netlib-ffi + , transformers, utility-ht, vector + }: + mkDerivation { + pname = "lapack-hmatrix"; + version = "0.0"; + sha256 = "024lfbj5v4rgxvfs4cgfr6xajf3svdlxv7sl9wkyzwi7dk1zh9pr"; + libraryHaskellDepends = [ + base comfort-array hmatrix lapack netlib-ffi transformers + utility-ht vector + ]; + description = "Conversion of objects between 'lapack' and 'hmatrix'"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "large-hashable" = callPackage ({ mkDerivation, aeson, base, base16-bytestring, byteable, bytes , bytestring, cereal, containers, cryptohash, deepseq, hashable @@ -169286,8 +169860,8 @@ self: { }: mkDerivation { pname = "lti13"; - version = "0.2.0.2"; - sha256 = "1a8ag4ny61rjyy15fa4mihrgqkinipzj5cvpasscl9yw8jik9s1i"; + version = "0.2.0.3"; + sha256 = "1ls1hfyivmx5yi9i15m95j9j12agyrmfiwza3w9dfa23c210fcxh"; libraryHaskellDepends = [ aeson base bytestring containers http-client http-types jose-jwt oidc-client safe-exceptions text @@ -172101,6 +172675,7 @@ self: { ]; description = "Abstraction for HTML-embedded content"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "markup-preview" = callPackage @@ -176520,6 +177095,8 @@ self: { ]; description = "Miniature FORTH-like interpreter"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "minilens" = callPackage @@ -177371,6 +177948,8 @@ self: { ]; description = "Generate cabal files for a Haskell project"; license = "GPL"; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "ml-w" = callPackage @@ -180433,7 +181012,7 @@ self: { "monomer" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , bytestring-to-vector, c2hs, containers, data-default, directory - , exceptions, extra, formatting, GLEW, hspec, http-client, HUnit + , exceptions, extra, formatting, glew, hspec, http-client, HUnit , JuicyPixels, lens, mtl, nanovg, OpenGL, process, random, safe , scientific, sdl2, silently, stm, text, text-show, time , transformers, unordered-containers, vector, websockets, wreq @@ -180441,8 +181020,8 @@ self: { }: mkDerivation { pname = "monomer"; - version = "1.0.0.0"; - sha256 = "136ja518hybhdl336772pyl5gfpvq7bzbm4gka53fmw3f42a1gkw"; + version = "1.0.0.1"; + sha256 = "1ns4zm1vny8r49k0iq77b75s17gqmzxjv3kj70a4k5j4jx5s70fr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -180451,7 +181030,7 @@ self: { lens mtl nanovg OpenGL process safe sdl2 stm text text-show time transformers unordered-containers vector wreq ]; - librarySystemDepends = [ GLEW ]; + librarySystemDepends = [ glew ]; libraryToolDepends = [ c2hs ]; executableHaskellDepends = [ aeson async attoparsec base bytestring bytestring-to-vector @@ -180470,7 +181049,7 @@ self: { description = "A GUI library for writing native Haskell applications"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; - }) {GLEW = null;}; + }) {inherit (pkgs) glew;}; "monomorphic" = callPackage ({ mkDerivation, base }: @@ -184150,6 +184729,31 @@ self: { license = lib.licenses.bsd3; }) {}; + "mwc-random_0_15_0_2" = callPackage + ({ mkDerivation, base, bytestring, doctest, gauge, math-functions + , mersenne-random, primitive, QuickCheck, random, tasty + , tasty-hunit, tasty-quickcheck, time, vector + }: + mkDerivation { + pname = "mwc-random"; + version = "0.15.0.2"; + sha256 = "0ny2mw4am24d6ykrm8rbcjnrq6p2cjmzjb4m6qfk54wfdxflvmim"; + libraryHaskellDepends = [ + base math-functions primitive random time vector + ]; + testHaskellDepends = [ + base bytestring doctest primitive QuickCheck random tasty + tasty-hunit tasty-quickcheck vector + ]; + benchmarkHaskellDepends = [ + base gauge mersenne-random random vector + ]; + doCheck = false; + description = "Fast, high quality pseudo random number generation"; + license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + }) {}; + "mwc-random-accelerate" = callPackage ({ mkDerivation, accelerate, base, mwc-random }: mkDerivation { @@ -185238,19 +185842,17 @@ self: { }) {}; "nanovg" = callPackage - ({ mkDerivation, base, bytestring, c2hs, containers, GLEW, glew - , hspec, inline-c, libGL, libGLU, QuickCheck, text, vector + ({ mkDerivation, base, bytestring, c2hs, containers, freetype, glew + , hspec, inline-c, libGL, libGLU, libX11, QuickCheck, text, vector }: mkDerivation { pname = "nanovg"; - version = "0.6.0.0"; - sha256 = "15nljmlcgj1pw9ydy3a9nmk6zpgfp3p71arw04b1krx2y9r2fnp3"; - revision = "1"; - editedCabalFile = "1lhfsq50r9bdby7mfscw8ih3wsz2m19lr2a2z9b6diaf5kz76vij"; + version = "0.7.0.0"; + sha256 = "1mrn5dy05nl5kkxw5vfgf57wifllq7jnv0akd1wi9wnlgvvqjnqz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base bytestring containers text vector ]; - librarySystemDepends = [ GLEW libGL libGLU ]; + librarySystemDepends = [ freetype glew libGL libGLU libX11 ]; libraryPkgconfigDepends = [ glew ]; libraryToolDepends = [ c2hs ]; testHaskellDepends = [ base containers hspec inline-c QuickCheck ]; @@ -185258,8 +185860,9 @@ self: { license = lib.licenses.isc; hydraPlatforms = lib.platforms.none; broken = true; - }) {GLEW = null; inherit (pkgs) glew; inherit (pkgs) libGL; - inherit (pkgs) libGLU;}; + }) {inherit (pkgs) freetype; inherit (pkgs) glew; + inherit (pkgs) libGL; inherit (pkgs) libGLU; + inherit (pkgs.xorg) libX11;}; "nanovg-simple" = callPackage ({ mkDerivation, base, GLFW-b, monad-loops, nanovg, OpenGL @@ -191955,8 +192558,6 @@ self: { benchmarkHaskellDepends = [ async base text weigh ]; description = "Haskell binding to the ODBC API, aimed at SQL Server driver"; license = lib.licenses.bsd3; - hydraPlatforms = lib.platforms.none; - broken = true; }) {inherit (pkgs) unixODBC;}; "odd-jobs" = callPackage @@ -192195,8 +192796,6 @@ self: { ]; description = "OpenID Connect 1.0 library for RP"; license = lib.licenses.mit; - hydraPlatforms = lib.platforms.none; - broken = true; }) {}; "ois-input-manager" = callPackage @@ -194760,8 +195359,8 @@ self: { pname = "optparse-generic"; version = "1.4.4"; sha256 = "0xy0kc8qximsiqpnc1fmh5zlsh6n26s7scrixin5bwnylg056j74"; - revision = "2"; - editedCabalFile = "172x8990wx4jhyb7yp9k18nd6q4sis8km09x2afr238siqviclrc"; + revision = "3"; + editedCabalFile = "1y5m84d72z2fhnzznlyq4hj4hfg04hgszng3ps4dz4s1wd565m1s"; libraryHaskellDepends = [ base bytestring Only optparse-applicative system-filepath text time transformers void @@ -196369,8 +196968,8 @@ self: { pname = "palette"; version = "0.3.0.2"; sha256 = "0820n3cj4zy9s46diln2rrs4lrxbipkhdw74p2w42gc7k1nlj54i"; - revision = "1"; - editedCabalFile = "0x536r15zzxlkf5p5a2x64qr5szdf9yh04vaiiwfhsm232qb6fjq"; + revision = "2"; + editedCabalFile = "134w4bm1p6piyx594dx4hncf3adycqld4935bs2wbrq634w7ngxg"; libraryHaskellDepends = [ array base colour containers MonadRandom ]; @@ -198790,16 +199389,14 @@ self: { }: mkDerivation { pname = "parsley"; - version = "1.0.0.1"; - sha256 = "0z4w6hwa0yj34xsqp63kqy3wkk51k343fv8ijbk0s4w4hdx7d7jb"; - revision = "1"; - editedCabalFile = "0bv13k090bn5jy1qi3palrp7sri1xbd6xvh7ymhd9l0431yfzadv"; + version = "1.0.0.2"; + sha256 = "06rc8zcgp5zyvf17pgzf1nqlc3avdl8rmbwabkggk4v4x9rxwkjx"; libraryHaskellDepends = [ base parsley-core template-haskell text ]; testHaskellDepends = [ - base deepseq parsley-garnish tasty tasty-hunit tasty-quickcheck - template-haskell th-test-utils + base deepseq parsley-core parsley-garnish tasty tasty-hunit + tasty-quickcheck template-haskell th-test-utils ]; benchmarkHaskellDepends = [ array attoparsec base bytestring containers criterion deepseq @@ -198815,18 +199412,22 @@ self: { "parsley-core" = callPackage ({ mkDerivation, array, base, bytestring, containers, cpphs , dependent-map, dependent-sum, ghc-prim, hashable, mtl - , pretty-terminal, template-haskell, text, unordered-containers + , pretty-terminal, tasty, tasty-hunit, tasty-quickcheck + , template-haskell, text, unordered-containers }: mkDerivation { pname = "parsley-core"; - version = "1.4.0.0"; - sha256 = "1w9pilgaajaycxr0nvjwdzk5fjf7pg4spnwh2197gbpqhbkj75q3"; + version = "1.6.0.0"; + sha256 = "1hjsnwh3gxwk1jmc0xylvjpsa3shzvjb5sn1imypgnnb887iabv6"; libraryHaskellDepends = [ array base bytestring containers dependent-map dependent-sum ghc-prim hashable mtl pretty-terminal template-haskell text unordered-containers ]; libraryToolDepends = [ cpphs ]; + testHaskellDepends = [ + base containers tasty tasty-hunit tasty-quickcheck + ]; description = "A fast parser combinator library backed by Typed Template Haskell"; license = lib.licenses.bsd3; hydraPlatforms = lib.platforms.none; @@ -202960,8 +203561,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "phonetic-languages-rhythmicity"; - version = "0.6.0.1"; - sha256 = "0rhn5xsqy4b330y17saa78v72dc7lq24y2k5p5r3xfbw621plwba"; + version = "0.9.0.0"; + sha256 = "1xymd8r5lp4jn0qb4p1dyzbhdyb3nsnvphx7f9nvf46kjbz18670"; libraryHaskellDepends = [ base ]; description = "Allows to estimate the rhythmicity properties for the text"; license = lib.licenses.mit; @@ -203005,13 +203606,13 @@ self: { , phonetic-languages-simplified-base , phonetic-languages-simplified-examples-common , phonetic-languages-simplified-properties-array - , phonetic-languages-ukrainian-array, subG + , phonetic-languages-ukrainian-array, string-interpreter, subG , ukrainian-phonetics-basic-array, uniqueness-periods-vector-stats }: mkDerivation { pname = "phonetic-languages-simplified-examples-array"; - version = "0.7.0.0"; - sha256 = "13v2wizjrnpwi7x42c9aqgsa5yr2x3blpmyqv9jkqxx7ksx0fbfg"; + version = "0.10.0.0"; + sha256 = "0m7p4iddilaf0v81kjya41m6rczplhw8cl3gq4axwq5lw0x5nppf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203022,7 +203623,7 @@ self: { phonetic-languages-rhythmicity phonetic-languages-simplified-base phonetic-languages-simplified-examples-common phonetic-languages-simplified-properties-array - phonetic-languages-ukrainian-array subG + phonetic-languages-ukrainian-array string-interpreter subG ukrainian-phonetics-basic-array uniqueness-periods-vector-stats ]; executableHaskellDepends = [ @@ -203033,7 +203634,7 @@ self: { phonetic-languages-rhythmicity phonetic-languages-simplified-base phonetic-languages-simplified-examples-common phonetic-languages-simplified-properties-array - phonetic-languages-ukrainian-array subG + phonetic-languages-ukrainian-array string-interpreter subG ukrainian-phonetics-basic-array uniqueness-periods-vector-stats ]; description = "Helps to create Ukrainian texts with the given phonetic properties"; @@ -203068,12 +203669,12 @@ self: { , phonetic-languages-simplified-base , phonetic-languages-simplified-generalized-examples-common , phonetic-languages-simplified-generalized-properties-array - , process, subG + , process, string-interpreter, subG }: mkDerivation { pname = "phonetic-languages-simplified-generalized-examples-array"; - version = "0.7.0.0"; - sha256 = "1qy4j61mkrkpa5451bzqg92jcbr77djn1jpvdd008pmvzijhnwqr"; + version = "0.10.0.0"; + sha256 = "169ln5g5gz4lshsk2qfmj6h25x3xch0ar4mm0i9wn07wa7g1yyvj"; libraryHaskellDepends = [ base heaps mmsyn2-array mmsyn3 parallel phonetic-languages-constraints-array @@ -203083,7 +203684,7 @@ self: { phonetic-languages-simplified-base phonetic-languages-simplified-generalized-examples-common phonetic-languages-simplified-generalized-properties-array process - subG + string-interpreter subG ]; description = "Helps to create texts with the given phonetic properties (e. g. poetic)."; license = lib.licenses.mit; @@ -203111,8 +203712,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-generalized-properties-array"; - version = "0.5.0.0"; - sha256 = "0hxlii3d522ikh6czh720p1x97ixjh3b4s16zr6a2vk3h6pkvqw4"; + version = "0.8.0.0"; + sha256 = "0fi76agkx6i55121pcj3wxrfw4ymqyqb5l8sa8vm78nvx5r54nsd"; libraryHaskellDepends = [ base phonetic-languages-phonetics-basics phonetic-languages-rhythmicity phonetic-languages-simplified-base @@ -203163,8 +203764,8 @@ self: { }: mkDerivation { pname = "phonetic-languages-simplified-properties-array"; - version = "0.5.0.0"; - sha256 = "1zv3ax3idvlhvaspmsalrrw1816rf3w1sza3yscdv221yn1783g7"; + version = "0.8.0.0"; + sha256 = "1h32g5cqib72j2ib26ch6b1r50j506arx0pz6zfxl968095vmcan"; libraryHaskellDepends = [ base phonetic-languages-rhythmicity phonetic-languages-simplified-base ukrainian-phonetics-basic-array @@ -207329,8 +207930,8 @@ self: { pname = "polysemy-methodology"; version = "0.2.1.0"; sha256 = "17md6l5smy1ssn99kij6rnb42bx3fx8h49z85cm9sf41k6lb5k1g"; - revision = "1"; - editedCabalFile = "1sn9447cxpxmw1jkijbv2039xv3ya08mdgd7kmrwp8ljzj1922ni"; + revision = "2"; + editedCabalFile = "0dpancn85f8j3pxhk43lik6fbznp502cc68rkhqkan791kh1bbc7"; libraryHaskellDepends = [ base polysemy polysemy-kvstore polysemy-several ]; @@ -207365,8 +207966,8 @@ self: { pname = "polysemy-methodology-composite"; version = "0.1.4.0"; sha256 = "014kfaxxi24n99gvrvf9c6c8cx8csbb9a8fbfb2md5g2d2q4v08g"; - revision = "1"; - editedCabalFile = "1vf5l2c3k370x0rl4js2hfrc0z434zzkgbkgnhjixbkbqcq2ig2p"; + revision = "2"; + editedCabalFile = "0sz200c83xjj22ifx9babvps0cnqk9gz42h081m5wb6s1w58dnib"; libraryHaskellDepends = [ base composite-base polysemy polysemy-extra polysemy-methodology polysemy-vinyl vinyl @@ -207526,8 +208127,8 @@ self: { pname = "polysemy-several"; version = "0.1.0.0"; sha256 = "1mw6a6fz3879yqnpq6h0221i8b8f05j90b1zydhzr57nsbklxzps"; - revision = "1"; - editedCabalFile = "0d0632ayig8f66604ncad7y4gjlxsss9awlscxd5hsa2r49l4m7q"; + revision = "3"; + editedCabalFile = "0ig9jqrv9dqasgjhshapcxjqp4vdpl1p09q0fy34847vchg5jgpb"; libraryHaskellDepends = [ base polysemy ]; description = "Run several effects at once, taken from the polysemy-zoo"; license = lib.licenses.mit; @@ -207620,8 +208221,8 @@ self: { pname = "polysemy-video"; version = "0.2.0.1"; sha256 = "1lbjjq6q3i6v41ssqy69p4iwvybidrmxcxwjzddbxcrmymr0rmlc"; - revision = "1"; - editedCabalFile = "0bz6zb6zn1q4swj2szzrjakjm8qfmzasin6fgpz01g5m2payfc3c"; + revision = "2"; + editedCabalFile = "1jjwn6ysygc3dz963zqhlmcqvhv79ll7kp6mbpm73fhad4jbrfvs"; libraryHaskellDepends = [ base formatting path path-formatting polysemy simple-media-timestamp simple-media-timestamp-formatting text @@ -207792,6 +208393,8 @@ self: { ]; description = "Maps and sets of partial orders"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "pomodoro" = callPackage @@ -211504,6 +212107,7 @@ self: { ]; description = "containers backed by arrays"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "primitive-convenience" = callPackage @@ -211656,6 +212260,7 @@ self: { benchmarkHaskellDepends = [ base gauge ghc-prim primitive random ]; description = "Sort primitive arrays"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "primitive-stablename" = callPackage @@ -216357,6 +216962,8 @@ self: { ]; description = "A package for prompting values from the command-line"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "queue" = callPackage @@ -216780,8 +217387,8 @@ self: { }: mkDerivation { pname = "quickcheck-state-machine"; - version = "0.7.0"; - sha256 = "053fc1hxkpfpmwn5dq5x5vd094g978hwc145qpzknwbk6hrc28ka"; + version = "0.7.1"; + sha256 = "0s6j3y0fkbbhmid0skqxx2m3mpbphz6npw9fvim5kx7w4i6jrvfz"; libraryHaskellDepends = [ ansi-wl-pprint base containers directory exceptions filepath generic-data graphviz markov-chain-usage-model matrix mtl @@ -219158,6 +219765,28 @@ self: { broken = true; }) {}; + "rattletrap_11_2_1" = callPackage + ({ mkDerivation, aeson, aeson-pretty, array, base, bytestring + , containers, filepath, http-client, http-client-tls, HUnit, text + }: + mkDerivation { + pname = "rattletrap"; + version = "11.2.1"; + sha256 = "0kmr3178rilifbqs2zkifx47fdq279n4wzxbcr6kn71450xi5xyx"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-pretty array base bytestring containers filepath + http-client http-client-tls text + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ base bytestring filepath HUnit ]; + description = "Parse and generate Rocket League replays"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + broken = true; + }) {}; + "raven-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, hspec, http-conduit, mtl , network, random, resourcet, text, time, unordered-containers @@ -220124,6 +220753,8 @@ self: { libraryHaskellDepends = [ base readline StateVar ]; description = "Readline with variables (setX/getY) wrapped in state vars"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "readme-lhs" = callPackage @@ -220215,9 +220846,10 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "realworldhaskell"; - version = "0.0.1.0"; - sha256 = "0695y4af42vm50njpldx3i03ia4bws0lx3yhw6p2rv032jhmp5w6"; + version = "0.0.1.1"; + sha256 = "1gys7lcpl50nza5jgbmacw7n42c6s4f0jk7ga351w1g4z4ysrblg"; libraryHaskellDepends = [ base ]; + testHaskellDepends = [ base ]; description = "The Real World Haskell Book"; license = lib.licenses.publicDomain; }) {}; @@ -220496,6 +221128,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "record-operations" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "record-operations"; + version = "0.0.1"; + sha256 = "07wasqlzl1flrm16429mg5wcryd3p1sj1w7q8h59y31rm2ap643j"; + libraryHaskellDepends = [ base ]; + description = "polymorphic record operations"; + license = lib.licenses.bsd3; + }) {}; + "record-preprocessor" = callPackage ({ mkDerivation, base, base-prelude, basic-lens, conversion , conversion-text, record, record-syntax, text @@ -222311,6 +222954,8 @@ self: { pname = "regex-base"; version = "0.94.0.1"; sha256 = "1ngdmmrxs1rhvib052c6shfa40yad82jylylikz327r0zxpxkcbi"; + revision = "1"; + editedCabalFile = "19rzll80mpr4licfzz6qfy4i9xbmhxy4r7n1d523db73q09jvzrm"; libraryHaskellDepends = [ array base bytestring containers mtl text ]; @@ -222324,6 +222969,8 @@ self: { pname = "regex-compat"; version = "0.95.2.1"; sha256 = "0ivrdrcphrz3g6nr5wbsmfiv8i82caw0kf6z5qlmlq7xf9n3hywg"; + revision = "1"; + editedCabalFile = "1r9gvk0lifppydlns81zh8052941saaaahydvbcgnrz0jwn1di9j"; libraryHaskellDepends = [ array base regex-base regex-posix ]; description = "Replaces/enhances \"Text.Regex\""; license = lib.licenses.bsd3; @@ -222505,8 +223152,8 @@ self: { pname = "regex-pcre"; version = "0.95.0.0"; sha256 = "0nn76q4bsjnxim0j0d01jifmh36as9jdpcvm001a851vvq86zb8n"; - revision = "2"; - editedCabalFile = "0bvpy3rswyawv23s14nbxvgz5761s61g0shcj7p032i95iq7dj6d"; + revision = "3"; + editedCabalFile = "1mxy2y7dmv37hhsasm17x2mb9dhmzza13pc7jfrk77inpig78ib8"; libraryHaskellDepends = [ array base bytestring containers regex-base ]; @@ -222616,6 +223263,8 @@ self: { pname = "regex-tdfa"; version = "1.3.1.1"; sha256 = "1msrq31k4jmn2lmrdzn87jqarqhw265ca69rfg5jpa5adrzm3gmi"; + revision = "1"; + editedCabalFile = "02gwf740vs0jy3l6dgw72r8c04yggshia6w16n140ncpsici8c4r"; libraryHaskellDepends = [ array base bytestring containers mtl parsec regex-base text ]; @@ -226495,6 +227144,7 @@ self: { testHaskellDepends = [ base HUnit primitive QuickCheck ]; description = "mutable ring buffers with atomic updates in GHC Haskell"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "rings" = callPackage @@ -226736,8 +227386,8 @@ self: { }: mkDerivation { pname = "risc386"; - version = "0.0.20210125"; - sha256 = "0fc551nvmqgl1sj3c45bwjzc9ksqbwg17dzkipyyzdrgi1shawn2"; + version = "0.0.20210812"; + sha256 = "0fxwmah8f4jhs480hrvbvchkmxgfmnsswg0d5zlbdgsiqfln42qv"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ array base containers mtl pretty ]; @@ -231608,6 +232258,7 @@ self: { ]; description = "Scientific notation intended for tokenization"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "scion" = callPackage @@ -234209,13 +234860,16 @@ self: { }) {}; "sequence" = callPackage - ({ mkDerivation, base, containers, transformers }: + ({ mkDerivation, base, containers, QuickCheck, tasty + , tasty-quickcheck, transformers + }: mkDerivation { pname = "sequence"; - version = "0.9.8"; - sha256 = "0ayxy0lbkah90kpyjac0llv6lrbwymvfz2d3pdfrz1079si65jsh"; + version = "0.9.9.0"; + sha256 = "17jklfz4w73i7k4w22czc81wll8bi614wh513ra6hcnd06ba70rs"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base containers transformers ]; + testHaskellDepends = [ base QuickCheck tasty tasty-quickcheck ]; description = "A type class for sequences and various sequence data structures"; license = lib.licenses.bsd3; }) {}; @@ -236865,6 +237519,29 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "servant-streamly" = callPackage + ({ mkDerivation, base, bytestring, hspec, http-client, resourcet + , servant, servant-client, servant-server, streamly + , streamly-bytestring, wai, warp + }: + mkDerivation { + pname = "servant-streamly"; + version = "0.1.0.0"; + sha256 = "10f0pqhaypdk46v5gkpv3001k14v7ppfffv89x25lqlls9yrqfvf"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base resourcet servant streamly ]; + executableHaskellDepends = [ + base bytestring http-client resourcet servant servant-client + servant-server streamly streamly-bytestring wai warp + ]; + testHaskellDepends = [ + base hspec resourcet servant servant-server streamly + ]; + description = "Servant Stream support for streamly"; + license = lib.licenses.bsd3; + }) {}; + "servant-subscriber" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, blaze-builder , bytestring, case-insensitive, containers, directory, filepath @@ -238402,6 +239079,7 @@ self: { ]; description = "Utilities for building ATS projects with shake"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "shake-bench" = callPackage @@ -238455,16 +239133,16 @@ self: { }: mkDerivation { pname = "shake-cabal"; - version = "0.2.2.1"; - sha256 = "1vyz95qa5f6k0lqf24w60dmlszs1sv0sqv2p0sncn8ll7g785sx1"; - revision = "1"; - editedCabalFile = "04b9kd2jaim8qsgpji4xv7c9kmbfw089zla877qr67kvfwp6qy6m"; + version = "0.2.2.2"; + sha256 = "1z1l4mah7nmpa6ycx9f5ynr9rn24irs1w44nq1j3ck25b408g460"; libraryHaskellDepends = [ base binary Cabal composition-prelude deepseq directory filepath hashable shake ]; description = "Shake library for use with cabal"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "shake-cabal-build" = callPackage @@ -243432,6 +244110,7 @@ self: { libraryHaskellDepends = [ base bytesmith primitive ]; description = "Parse arrays of tokens"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "smith-cli" = callPackage @@ -245319,17 +245998,19 @@ self: { "snowchecked" = callPackage ({ mkDerivation, base, bytestring, data-default, deepseq, hedgehog - , time, wide-word + , text, text-conversions, time, wide-word }: mkDerivation { pname = "snowchecked"; - version = "0.0.0.3"; - sha256 = "08a4v3i3ky4vbllag7wmmf4qbnf6dan93h7ipcngxk9vhx9wh4vh"; + version = "0.0.1.0"; + sha256 = "1128b0a4q7vnzz07ddalp6rjcmyvg98r8z77pzj573scrp214abn"; libraryHaskellDepends = [ - base bytestring data-default deepseq time wide-word + base bytestring data-default deepseq text text-conversions time + wide-word ]; testHaskellDepends = [ - base bytestring data-default deepseq hedgehog time wide-word + base bytestring data-default deepseq hedgehog text text-conversions + time wide-word ]; description = "A checksummed variation on Twitter's Snowflake UID generation algorithm"; license = lib.licenses.asl20; @@ -251281,6 +251962,55 @@ self: { license = lib.licenses.mit; }) {}; + "store_0_7_12" = callPackage + ({ mkDerivation, array, async, base, base-orphans + , base64-bytestring, bifunctors, bytestring, cereal, cereal-vector + , clock, containers, contravariant, criterion, cryptohash, deepseq + , directory, filepath, free, ghc-prim, hashable, hspec + , hspec-smallcheck, integer-gmp, lifted-base, monad-control + , mono-traversable, nats, 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.12"; + sha256 = "1r6wajaxjlh38bivzmcdx8p0x89g04p6alddlibpa356drzl3jbp"; + libraryHaskellDepends = [ + array async base base-orphans base64-bytestring bifunctors + bytestring containers contravariant cryptohash deepseq directory + filepath free ghc-prim hashable hspec hspec-smallcheck integer-gmp + lifted-base monad-control mono-traversable nats 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 filepath free ghc-prim hashable hspec hspec-smallcheck + integer-gmp lifted-base monad-control mono-traversable nats 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 filepath free ghc-prim hashable hspec + hspec-smallcheck integer-gmp lifted-base monad-control + mono-traversable nats 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 = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "store-core" = callPackage ({ mkDerivation, base, bytestring, ghc-prim, primitive, text , transformers @@ -252370,8 +253100,8 @@ self: { }: mkDerivation { pname = "streamly-posix"; - version = "0.1.0.1"; - sha256 = "1z6hmnhgglr5zwsaakn7c6d0cgq32pwcdds8fkn28y9p3yc89bvv"; + version = "0.1.0.2"; + sha256 = "14ncn4k0nd05rgbyf0apy4lk2w4lzsz4cbhykvfwxgf871yxd9lf"; libraryHaskellDepends = [ base bytestring hpath-posix safe-exceptions streamly streamly-bytestring transformers unix word8 @@ -252933,6 +253663,17 @@ self: { license = lib.licenses.bsd3; }) {}; + "string-interpreter" = callPackage + ({ mkDerivation, base }: + mkDerivation { + pname = "string-interpreter"; + version = "0.2.0.0"; + sha256 = "1bwdfbpmlfqixfwc02jxdyyv0pkiysh24pnmna12cwpvb9582f6n"; + libraryHaskellDepends = [ base ]; + description = "Is used in the recursive mode for phonetic languages approach"; + license = lib.licenses.mit; + }) {}; + "string-isos" = callPackage ({ mkDerivation, base, bytestring, mono-traversable, safe, text , type-iso @@ -255240,6 +255981,8 @@ self: { ]; description = "Clojure without alphanumerics"; license = lib.licenses.lgpl3Only; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "sweet-egison" = callPackage @@ -258700,8 +259443,8 @@ self: { }: mkDerivation { pname = "taskell"; - version = "1.11.2"; - sha256 = "0ycv054gh28c5llyfjvsdbyq1w5jhj25b9zphj2kya0jnvpkmm81"; + version = "1.11.3"; + sha256 = "1wymiy9cp8d3h17nbk6qfb1visdr30c6ivrygm6dwxrbambarvd8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -258877,8 +259620,8 @@ self: { }: mkDerivation { pname = "tasty-checklist"; - version = "1.0.2.0"; - sha256 = "0smd93c1zs44nwiz0dk87izg0c9cyvx2klzy126w0p0xcxwwbhlr"; + version = "1.0.3.0"; + sha256 = "0vlhpc50w8gzdix1ys42cgpdv8rnkffal2zn283pccf1lfbimbjk"; libraryHaskellDepends = [ base exceptions parameterized-utils text ]; @@ -258903,6 +259646,18 @@ self: { license = lib.licenses.mit; }) {}; + "tasty-dejafu_2_0_0_8" = callPackage + ({ mkDerivation, base, dejafu, random, tagged, tasty }: + mkDerivation { + pname = "tasty-dejafu"; + version = "2.0.0.8"; + sha256 = "0v0vkbj8nr4jg62a5c0qygj1pjkz1vnssiicafv87qis02j36myx"; + libraryHaskellDepends = [ base dejafu random tagged tasty ]; + description = "Deja Fu support for the Tasty test framework"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "tasty-discover" = callPackage ({ mkDerivation, base, containers, directory, filepath, Glob , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit @@ -262176,6 +262931,29 @@ self: { license = lib.licenses.gpl2Only; }) {}; + "texmath_0_12_3_1" = callPackage + ({ mkDerivation, base, bytestring, containers, directory, filepath + , mtl, pandoc-types, parsec, process, split, syb, temporary, text + , utf8-string, xml + }: + mkDerivation { + pname = "texmath"; + version = "0.12.3.1"; + sha256 = "1qyiihb9h7w7074p495yd4s8dj9adz0dy865gyp822z69jvmkcki"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base containers mtl pandoc-types parsec split syb text xml + ]; + testHaskellDepends = [ + base bytestring directory filepath process temporary text + utf8-string xml + ]; + description = "Conversion between formats used to represent mathematics"; + license = lib.licenses.gpl2Only; + hydraPlatforms = lib.platforms.none; + }) {}; + "texrunner" = callPackage ({ mkDerivation, attoparsec, base, bytestring, directory, filepath , HUnit, io-streams, lens, mtl, process, semigroups, temporary @@ -271011,6 +271789,8 @@ self: { ]; description = "A Haskell-based CLI Twitter client"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; + broken = true; }) {}; "twitter-conduit" = callPackage @@ -272139,6 +272919,26 @@ self: { license = lib.licenses.mit; }) {}; + "typed-process_0_2_6_1" = callPackage + ({ mkDerivation, async, base, base64-bytestring, bytestring, hspec + , process, stm, temporary, transformers, unliftio-core + }: + mkDerivation { + pname = "typed-process"; + version = "0.2.6.1"; + sha256 = "0w4c76qln49967nnhf7f1zj3gbdfqp2qgf5ym8svhqyhp5gh61ws"; + libraryHaskellDepends = [ + async base bytestring process stm transformers unliftio-core + ]; + testHaskellDepends = [ + async base base64-bytestring bytestring hspec process stm temporary + transformers unliftio-core + ]; + description = "Run external processes, with strong typing of streams"; + license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; + }) {}; + "typed-spreadsheet" = callPackage ({ mkDerivation, async, base, diagrams-cairo, diagrams-gtk , diagrams-lib, foldl, gtk, microlens, stm, text, transformers @@ -274861,6 +275661,8 @@ self: { pname = "universum"; version = "1.7.2"; sha256 = "1ka7q5vr9xkf8z5mzpkp648mpf8az7b14lnhbvfakg3v5xy3f7gb"; + revision = "1"; + editedCabalFile = "17w3zpbv5ap9as506fn43xlnh6sqxni8mmczlp5l86hvn7zd8y6z"; libraryHaskellDepends = [ base bytestring containers deepseq ghc-prim hashable microlens microlens-mtl mtl safe-exceptions stm text transformers @@ -276164,6 +276966,7 @@ self: { ]; description = "Memory efficient url type and parser"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "url-decoders" = callPackage @@ -276284,6 +277087,7 @@ self: { ]; description = "Painfully simple URL deployment"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "urn" = callPackage @@ -277060,6 +277864,7 @@ self: { ]; description = "UUID parsing using byteverse packages"; license = lib.licenses.mit; + hydraPlatforms = lib.platforms.none; }) {}; "uuid-crypto" = callPackage @@ -280311,8 +281116,8 @@ self: { }: mkDerivation { pname = "vulkan"; - version = "3.11.5"; - sha256 = "18g8ckarjqz4nws1gihx3wpywqwkiwg88qq071sjs7wvsnwbjf2s"; + version = "3.12.1"; + sha256 = "0y9ykv0dx5hvh2683yyn8mdl3jxqk9zaf2a1rkyr5zgc43wsbm05"; libraryHaskellDepends = [ base bytestring transformers vector ]; libraryPkgconfigDepends = [ vulkan ]; testHaskellDepends = [ @@ -280344,8 +281149,8 @@ self: { }: mkDerivation { pname = "vulkan-utils"; - version = "0.5.1"; - sha256 = "1552vk9nzvcpkgh5b9lln9gl6rxg1jr8z7blgp3sss3pjsvi3s11"; + version = "0.5.2"; + sha256 = "05h54dzci8ahnxshrcd7l6bpg1q8llnrwycgpbpn12cf6ddmdc59"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base bytestring containers dependent-map dependent-sum extra @@ -281452,6 +282257,7 @@ self: { ]; description = "Route to different middlewares based on the incoming Accept header"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "wai-middleware-crowd" = callPackage @@ -284411,6 +285217,20 @@ self: { hydraPlatforms = lib.platforms.none; }) {}; + "wgpu-raw-hs" = callPackage + ({ mkDerivation, base, GLFW-b, unix }: + mkDerivation { + pname = "wgpu-raw-hs"; + version = "0.1.0.2"; + sha256 = "1hagn99jdmwjcyz2afmmd9ws31dncas9fssv6lx75kshar6x4rah"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ base GLFW-b unix ]; + executableHaskellDepends = [ base GLFW-b ]; + description = "WGPU Raw"; + license = lib.licenses.bsd3; + }) {}; + "what4" = callPackage ({ mkDerivation, attoparsec, base, bifunctors, bimap, bv-sized , bytestring, config-value, containers, contravariant @@ -286437,6 +287257,7 @@ self: { ]; description = "A simple CLI utility for interacting with a websocket"; license = lib.licenses.bsd3; + hydraPlatforms = lib.platforms.none; }) {}; "ws-chans" = callPackage @@ -288564,8 +289385,8 @@ self: { }: mkDerivation { pname = "xmobar"; - version = "0.38"; - sha256 = "1h7y5bnrsxc9k92zn5pfyimpdvm9245b93rxf0ff1avssnp1i31s"; + version = "0.39"; + sha256 = "1k1n3ff0ikdmfq0mi8r2vpqg1iq6hsw1drvxps6k98rvvn87pws6"; configureFlags = [ "-fwith_alsa" "-fwith_conduit" "-fwith_datezone" "-fwith_dbus" "-fwith_inotify" "-fwith_iwlib" "-fwith_mpd" "-fwith_mpris" @@ -291019,19 +291840,19 @@ self: { "yesod-auth-lti13" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base64-bytestring , bytestring, containers, cryptonite, http-client, http-conduit - , jose-jwt, load-env, lti13, microlens, oidc-client, random + , jose-jwt, load-env, lti13, microlens, oidc-client , safe-exceptions, text, time, warp, yesod, yesod-auth, yesod-core }: mkDerivation { pname = "yesod-auth-lti13"; - version = "0.2.0.2"; - sha256 = "19x8a3jfwrsrizg8lj8wrc9k2b0p4lga3q5fqqa60jjsr6lm73j3"; + version = "0.2.0.3"; + sha256 = "06xlpdirr7s4l9a9sxydn7vj0z9dy600yn6nmccv042awkdg5l0f"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty base base64-bytestring bytestring containers cryptonite http-client http-conduit jose-jwt load-env lti13 - microlens oidc-client random safe-exceptions text time warp yesod + microlens oidc-client safe-exceptions text time warp yesod yesod-auth yesod-core ]; description = "A yesod-auth plugin for LTI 1.3"; @@ -293461,8 +294282,8 @@ self: { }: mkDerivation { pname = "yst"; - version = "0.7.1"; - sha256 = "0clvfkdrmw7lmrcyn8cilgf0k7438c384vwvjx256pyl46y3ym5m"; + version = "0.7.1.2"; + sha256 = "1wg1vvf7wna5pv2mgs66c82rjan0ig4vv6vv2vlsnxzbpkn7vvf5"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -293472,7 +294293,7 @@ self: { split text time unordered-containers yaml ]; description = "Builds a static website from templates and data in YAML or CSV files"; - license = "GPL"; + license = lib.licenses.gpl2Plus; hydraPlatforms = lib.platforms.none; broken = true; }) {}; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix index 6bbcabbf5a..4aead5d188 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/non-hackage-packages.nix @@ -26,14 +26,15 @@ self: super: { nix-output-monitor = self.callPackage ../../tools/nix/nix-output-monitor { }; - # cabal2nix --revision https://github.com/hasura/ci-info-hs.git - ci-info = self.callPackage ../misc/haskell/hasura/ci-info {}; - # cabal2nix --revision https://github.com/hasura/pg-client-hs.git - pg-client = self.callPackage ../misc/haskell/hasura/pg-client {}; - # cabal2nix --revision https://github.com/hasura/graphql-parser-hs.git - graphql-parser = self.callPackage ../misc/haskell/hasura/graphql-parser {}; - # cabal2nix --subpath server --maintainer offline --no-check --revision 1.2.1 https://github.com/hasura/graphql-engine.git - graphql-engine = self.callPackage ../misc/haskell/hasura/graphql-engine {}; + # hasura graphql-engine is not released to hackage. + # https://github.com/hasura/graphql-engine/issues/7391 + ci-info = self.callPackage ../misc/haskell/hasura/ci-info.nix {}; + pg-client = self.callPackage ../misc/haskell/hasura/pg-client.nix {}; + graphql-parser = self.callPackage ../misc/haskell/hasura/graphql-parser.nix {}; + graphql-engine = self.callPackage ../misc/haskell/hasura/graphql-engine.nix {}; + hasura-resource-pool = self.callPackage ../misc/haskell/hasura/pool.nix {}; + hasura-ekg-core = self.callPackage ../misc/haskell/hasura/ekg-core.nix {}; + hasura-ekg-json = self.callPackage ../misc/haskell/hasura/ekg-json.nix {}; # Unofficial fork until PRs are merged https://github.com/pcapriotti/optparse-applicative/pulls/roberth # cabal2nix --maintainer roberth https://github.com/hercules-ci/optparse-applicative.git > pkgs/development/misc/haskell/hercules-ci-optparse-applicative.nix diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patch b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patch new file mode 100644 index 0000000000..9035185dc2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/graphql-engine-mapkeys.patch @@ -0,0 +1,33 @@ +diff --git a/server/src-lib/Data/HashMap/Strict/Extended.hs b/server/src-lib/Data/HashMap/Strict/Extended.hs +index eaff0dfba..9902cadd0 100644 +--- a/src-lib/Data/HashMap/Strict/Extended.hs ++++ b/src-lib/Data/HashMap/Strict/Extended.hs +@@ -7,7 +7,6 @@ module Data.HashMap.Strict.Extended + , groupOnNE + , differenceOn + , lpadZip +- , mapKeys + , unionsWith + ) where + +@@ -54,20 +53,6 @@ lpadZip left = catMaybes . flip A.alignWith left \case + That b -> Just (Nothing, b) + These a b -> Just (Just a, b) + +--- | @'mapKeys' f s@ is the map obtained by applying @f@ to each key of @s@. +--- +--- The size of the result may be smaller if @f@ maps two or more distinct +--- keys to the same new key. In this case the value at the greatest of the +--- original keys is retained. +--- +--- > mapKeys (+ 1) (fromList [(5,"a"), (3,"b")]) == fromList [(4, "b"), (6, "a")] +--- > mapKeys (\ _ -> 1) (fromList [(1,"b"), (2,"a"), (3,"d"), (4,"c")]) == singleton 1 "c" +--- > mapKeys (\ _ -> 3) (fromList [(1,"b"), (2,"a"), (3,"d"), (4,"c")]) == singleton 3 "c" +--- +--- copied from https://hackage.haskell.org/package/containers-0.6.4.1/docs/src/Data.Map.Internal.html#mapKeys +-mapKeys :: (Ord k2, Hashable k2) => (k1 -> k2) -> HashMap k1 a -> HashMap k2 a +-mapKeys f = fromList . foldrWithKey (\k x xs -> (f k, x) : xs) [] +- + -- | The union of a list of maps, with a combining operation: + -- (@'unionsWith' f == 'Prelude.foldl' ('unionWith' f) 'empty'@). + -- diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/hasura-884-compat.patch b/third_party/nixpkgs/pkgs/development/haskell-modules/patches/hasura-884-compat.patch deleted file mode 100644 index bc000ba9cc..0000000000 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/patches/hasura-884-compat.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs -index 6cb70cf0..0c3789cd 100644 ---- server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs -+++ server/src-lib/Hasura/GraphQL/Transport/WebSocket/Server.hs -@@ -45,7 +45,7 @@ import GHC.AssertNF - import qualified ListT - import qualified Network.WebSockets as WS - import qualified StmContainers.Map as STMMap --import qualified System.IO.Error as E -+--import qualified System.IO.Error as E - - import qualified Hasura.Logging as L - -@@ -287,12 +287,6 @@ createServerApp (WSServer logger@(L.Logger writeLog) serverStatus) wsHandlers !p - let rcv = forever $ do - -- Process all messages serially (important!), in a separate thread: - msg <- liftIO $ -- -- Re-throw "receiveloop: resource vanished (Connection reset by peer)" : -- -- https://github.com/yesodweb/wai/blob/master/warp/Network/Wai/Handler/Warp/Recv.hs#L112 -- -- as WS exception signaling cleanup below. It's not clear why exactly this gets -- -- raised occasionally; I suspect an equivalent handler is missing from WS itself. -- -- Regardless this should be safe: -- handleJust (guard . E.isResourceVanishedError) (\()-> throw WS.ConnectionClosed) $ - WS.receiveData conn - writeLog $ WSLog wsId (EMessageReceived $ TBS.fromLBS msg) Nothing - _hOnMessage wsHandlers wsConn msg diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ceptre/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ceptre/default.nix index c3fa6a645e..56d37dd4e9 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/ceptre/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/ceptre/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, mlton }: stdenv.mkDerivation { - name = "ceptre-2016-11-27"; + pname = "ceptre"; + version = "unstable-2016-11-27"; src = fetchgit { url = "https://github.com/chrisamaphone/interactive-lp"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/scsh/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/scsh/default.nix index 6dcb8bd27c..ce44624497 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/scsh/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/scsh/default.nix @@ -1,7 +1,8 @@ { lib, stdenv, fetchgit, autoreconfHook, scheme48 }: stdenv.mkDerivation { - name = "scsh-0.7pre"; + pname = "scsh"; + version = "0.7pre"; src = fetchgit { url = "git://github.com/scheme/scsh.git"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/a52dec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/a52dec/default.nix index 74122f7ed2..1322ec10eb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/a52dec/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/a52dec/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "ATSC A/52 stream decoder"; - homepage = "https://liba52.sourceforge.net/"; + homepage = "https://liba52.sourceforge.io/"; platforms = platforms.unix; license = licenses.gpl2Plus; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/alure/default.nix b/third_party/nixpkgs/pkgs/development/libraries/alure/default.nix index 9ff83dcec4..a1bb5798b0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/alure/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/alure/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A utility library to help manage common tasks with OpenAL applications"; - homepage = "https://kcat.strangesoft.net/alure.html"; + homepage = "https://github.com/kcat/alure"; license = licenses.mit; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/boolstuff/default.nix b/third_party/nixpkgs/pkgs/development/libraries/boolstuff/default.nix index 9b1840256a..c7520ff783 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/boolstuff/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/boolstuff/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for operations on boolean expression binary trees"; - homepage = "https://perso.b2b2c.ca/~sarrazip/dev/boolstuff.html"; + homepage = "http://perso.b2b2c.ca/~sarrazip/dev/boolstuff.html"; license = "GPL"; maintainers = [ lib.maintainers.marcweber ]; platforms = lib.platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/libraries/capnproto/default.nix b/third_party/nixpkgs/pkgs/development/libraries/capnproto/default.nix index da6aae64db..a27a54b1ea 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/capnproto/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/capnproto/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "capnproto"; - version = "0.8.0"; + version = "0.9.0"; src = fetchurl { url = "https://capnproto.org/capnproto-c++-${version}.tar.gz"; - sha256 = "03f1862ljdshg7d0rg3j7jzgm3ip55kzd2y91q7p0racax3hxx6i"; + sha256 = "sha256-soBUp6K/6kK/w5LI0AljDZTXLozoaiOtbxi15yV0Bk8="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix index 640136ec8b..f015773e20 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/grpc/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "grpc"; - version = "1.39.0"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too + version = "1.39.1"; # N.B: if you change this, change pythonPackages.grpcio-tools to a matching version too src = fetchFromGitHub { owner = "grpc"; repo = "grpc"; rev = "v${version}"; - sha256 = "1wa7n7mf20fnvxqw093kr7a4c7vilcmx9yl3hicnyfcd663jgqvd"; + sha256 = "1yrr04g6faphh4hwzryqrwzgcr0hqqh05x9mc3vhpzmdkrrbz4zn"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpqxx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpqxx/default.nix index a1d9911751..e95adbd629 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpqxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpqxx/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libpqxx"; - version = "7.5.2"; + version = "7.6.0"; src = fetchFromGitHub { owner = "jtv"; repo = pname; rev = version; - sha256 = "15ifd28v6xbbx931icydy8xmkd8030b20xzqjja6vwwvzss2w9fa"; + sha256 = "sha256-shcGJebjXJ3ORvcdINJFLiuW7ySqe6HyPUQioeUG/wM="; }; nativeBuildInputs = [ gnused python3 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pupnp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pupnp/default.nix index 4b80b7ba5a..ffa08a6316 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pupnp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pupnp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "libupnp"; - version = "1.14.6"; + version = "1.14.8"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "pupnp"; repo = "pupnp"; rev = "release-${version}"; - sha256 = "1f9861q5dicp6rx3jnp1j788xfjfaf3k4620p9r0b0k0lj2gk38c"; + sha256 = "sha256-Ipgb7fpIT+P/LwcF8ZmW4C1lj57f5rOQXwUl1Kh/oD8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/talloc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/talloc/default.nix index f37f3d34d4..07d830f00c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/talloc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/talloc/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "talloc"; - version = "2.3.2"; + version = "2.3.3"; src = fetchurl { url = "mirror://samba/talloc/${pname}-${version}.tar.gz"; - sha256 = "sha256-J6A++Z44TXeRJN91XesinNF2H5Reym0gDoz9m/Upe9c="; + sha256 = "sha256-a+lbI2i9CvHEzXqIFG62zuoY5Gw//JMwv2JitA0diqo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/thrift/0.10.nix b/third_party/nixpkgs/pkgs/development/libraries/thrift/0.10.nix index d81912b07c..001de25e99 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/thrift/0.10.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/thrift/0.10.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkg-config, bison -, flex, twisted +{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python3, pkg-config, bison +, flex }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ - boost zlib libevent openssl python bison flex twisted + boost zlib libevent openssl bison flex (python3.withPackages (ps: [ps.twisted])) ]; preConfigure = "export PY_PREFIX=$out"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix b/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix index a34fc36484..6460be99fd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/thrift/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python, cmake, pkg-config -, bison, flex, twisted +{ lib, stdenv, fetchurl, boost, zlib, libevent, openssl, python3, cmake, pkg-config +, bison, flex , static ? stdenv.hostPlatform.isStatic }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkg-config bison flex ]; buildInputs = [ boost zlib libevent openssl ] - ++ lib.optionals (!static) [ python twisted ]; + ++ lib.optionals (!static) [ (python3.withPackages (ps: [ps.twisted])) ]; preConfigure = "export PY_PREFIX=$out"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix index 872e7fbc4f..7e1f36f0f9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ucx/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "ucx"; - version = "1.10.1"; + version = "1.11.0"; src = fetchFromGitHub { owner = "openucx"; repo = "ucx"; rev = "v${version}"; - sha256 = "1jl7wrmcpf6lakpi1gvjcs18cy0mmwgsv5wdd80zyl41cpd8gm8d"; + sha256 = "1ww5a9m1jbjjhsjlvjvlcvcv0sv388irfx8xdh0pd9w03xv754d0"; }; nativeBuildInputs = [ autoreconfHook doxygen ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/3.6.nix b/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/3.6.nix index 725af51487..e8082e5044 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/3.6.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/3.6.nix @@ -1,17 +1,19 @@ -{ stdenv, lib, fetchFromGitHub, fetchpatch, mcpp, bzip2, expat, openssl, db5 +{ stdenv, lib, fetchFromGitHub +, mcpp, bzip2, expat, openssl, db5 , darwin, libiconv, Security +, zeroc-ice # to share meta , cpp11 ? false }: stdenv.mkDerivation rec { pname = "zeroc-ice"; - version = "3.6.3"; + version = "3.6.5"; src = fetchFromGitHub { owner = "zeroc-ice"; repo = "ice"; rev = "v${version}"; - sha256 = "05xympbns32aalgcfcpxwfd7bvg343f16xpg6jv5s335ski3cjy2"; + sha256 = "073h7v1f2sw77cr1a6xxa5l9j547pz24sxa9qdjc4zki0ivcnq15"; }; buildInputs = [ mcpp bzip2 expat openssl db5 ] @@ -27,13 +29,8 @@ stdenv.mkDerivation rec { ''; patches = [ - # Fixes compilation issues with GCC 8 using one of the patches - # provided in https://github.com/zeroc-ice/ice/issues/82 - ( fetchpatch { - url = "https://github.com/zeroc-ice/ice/commit/a6a4981616b669432ff7b588179d6e93694d9e3f.patch"; - sha256 = "17j5r7gsa3izrm7zln4mrp7l16h532gvmpas0kzglybicbiz7d56"; - stripLen = 1; - }) + # Fixes compilation warning about uninitialied variables (in test code) + ./uninitialized-variable-warning.patch ]; preBuild = '' @@ -58,10 +55,5 @@ stdenv.mkDerivation rec { rm -rf $out/share/slice ''; - meta = with lib; { - homepage = "http://www.zeroc.com/ice.html"; - description = "The internet communications engine"; - license = licenses.gpl2; - platforms = platforms.unix; - }; + inherit (zeroc-ice) meta; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix index f522c18103..fcd8363485 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/default.nix @@ -1,5 +1,7 @@ -{ stdenv, lib, fetchFromGitHub, bzip2, expat, openssl, lmdb +{ stdenv, lib, fetchFromGitHub +, bzip2, expat, libedit, lmdb, openssl , darwin, libiconv, Security +, python3 # for tests only , cpp11 ? false }: @@ -21,16 +23,16 @@ let in stdenv.mkDerivation rec { pname = "zeroc-ice"; - version = "3.7.2"; + version = "3.7.6"; src = fetchFromGitHub { owner = "zeroc-ice"; repo = "ice"; rev = "v${version}"; - sha256 = "0m9lh79dfpcwcp2jhmj0wqdcsw3rl633x2hzfw9n2i34jjv64fvg"; + sha256 = "0zc8gmlzl2f38m1fj6pv2vm8ka7fkszd6hx2lb8gfv65vn3m4sk4"; }; - buildInputs = [ zeroc_mcpp bzip2 expat openssl lmdb ] + buildInputs = [ zeroc_mcpp bzip2 expat libedit lmdb openssl ] ++ lib.optionals stdenv.isDarwin [ darwin.cctools libiconv Security ]; NIX_CFLAGS_COMPILE = "-Wno-error=class-memaccess -Wno-error=deprecated-copy"; @@ -51,12 +53,25 @@ in stdenv.mkDerivation rec { ) ''; - buildFlags = [ "srcs" ]; # no tests; they require network - enableParallelBuilding = true; outputs = [ "out" "bin" "dev" ]; + doCheck = true; + checkInputs = with python3.pkgs; [ passlib ]; + checkPhase = with lib; let + # these tests require network access so we need to skip them. + brokenTests = map escapeRegex [ + "Ice/udp" "Glacier2" "IceGrid/simple" "IceStorm" "IceDiscovery/simple" + ]; + # matches CONFIGS flag in makeFlagsArray + configFlag = optionalString cpp11 "--config=cpp11-shared"; + in '' + runHook preCheck + ${python3.interpreter} ./cpp/allTests.py ${configFlag} --rfilter='${concatStringsSep "|" brokenTests}' + runHook postCheck + ''; + postInstall = '' mkdir -p $bin $dev/share mv $out/bin $bin @@ -66,7 +81,7 @@ in stdenv.mkDerivation rec { meta = with lib; { homepage = "https://www.zeroc.com/ice.html"; description = "The internet communications engine"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.unix; maintainers = with maintainers; [ abbradar ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/uninitialized-variable-warning.patch b/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/uninitialized-variable-warning.patch new file mode 100644 index 0000000000..878dee26bb --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/zeroc-ice/uninitialized-variable-warning.patch @@ -0,0 +1,20 @@ +diff --git a/test/Glacier2/dynamicFiltering/TestControllerI.h b/test/Glacier2/dynamicFiltering/TestControllerI.h +index 7e21639..1279200 100644 +--- a/test/Glacier2/dynamicFiltering/TestControllerI.h ++++ b/test/Glacier2/dynamicFiltering/TestControllerI.h +@@ -21,13 +21,12 @@ struct SessionTuple + { + Glacier2::SessionPrx session; + Glacier2::SessionControlPrx sessionControl; +- bool configured; ++ bool configured = false; + + SessionTuple() {} + SessionTuple(Glacier2::SessionPrx s, Glacier2::SessionControlPrx control): + session(s), +- sessionControl(control), +- configured(false) ++ sessionControl(control) + {} + + SessionTuple& diff --git a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/ci-info/default.nix b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/ci-info.nix similarity index 67% rename from third_party/nixpkgs/pkgs/development/misc/haskell/hasura/ci-info/default.nix rename to third_party/nixpkgs/pkgs/development/misc/haskell/hasura/ci-info.nix index 2770e74a69..21b78ca76b 100644 --- a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/ci-info/default.nix +++ b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/ci-info.nix @@ -1,3 +1,5 @@ +# This has been automatically generated by the script +# ./update.sh. This should not be changed by hand. { mkDerivation, aeson, aeson-casing, base, fetchgit, hashable , hpack, lib, template-haskell, text, th-lift-instances , unordered-containers @@ -7,8 +9,8 @@ mkDerivation { version = "0.1.0.0"; src = fetchgit { url = "https://github.com/hasura/ci-info-hs.git"; - sha256 = "0rn1799z4y7z1c6ijrr0gscarg25zmnfq0z9rrmk4ad727vf1ppc"; - rev = "6af5a68450347a02295a9cd050d05a8b2f5c06ab"; + sha256 = "018vfyg0y2sn497nigjrcs6b1v3i9bna06dsbvgr6wjikcl6dhh4"; + rev = "68247a83738ac4bb9f719f0e4213aeb7be9565cf"; fetchSubmodules = true; }; libraryHaskellDepends = [ @@ -19,4 +21,5 @@ mkDerivation { prePatch = "hpack"; homepage = "https://github.com/hasura/ci-info-hs#readme"; license = lib.licenses.mit; + maintainers = with lib.maintainers; [ lassulus ]; } diff --git a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/ekg-core.nix b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/ekg-core.nix new file mode 100644 index 0000000000..6a9b115702 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/ekg-core.nix @@ -0,0 +1,34 @@ +# This has been automatically generated by the script +# ./update.sh. This should not be changed by hand. +{ mkDerivation, async, atomic-primops, base, containers, criterion +, fetchgit, generic-random, ghc-prim, hashable, hspec +, hspec-smallcheck, HUnit, inspection-testing, lib, markdown-unlit +, primitive, QuickCheck, smallcheck, text, unordered-containers +}: +mkDerivation { + pname = "ekg-core"; + version = "0.1.1.7"; + src = fetchgit { + url = "https://github.com/hasura/ekg-core.git"; + sha256 = "1s58kjg1kbhsyfyj0zwhnnws9hg9zwj9jylpwicg54yi78w962ys"; + rev = "9fc8f94685c149a909b66bad4167455d8ae1002c"; + fetchSubmodules = true; + }; + libraryHaskellDepends = [ + atomic-primops base containers ghc-prim hashable inspection-testing + primitive text unordered-containers + ]; + testHaskellDepends = [ + async atomic-primops base containers generic-random ghc-prim + hashable hspec hspec-smallcheck HUnit inspection-testing + markdown-unlit primitive QuickCheck smallcheck text + unordered-containers + ]; + testToolDepends = [ markdown-unlit ]; + benchmarkHaskellDepends = [ base criterion ]; + doHaddock = false; + homepage = "https://github.com/tibbe/ekg-core"; + description = "Tracking of system metrics"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ lassulus ]; +} diff --git a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/ekg-json.nix b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/ekg-json.nix new file mode 100644 index 0000000000..e115e2c40b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/ekg-json.nix @@ -0,0 +1,22 @@ +# This has been automatically generated by the script +# ./update.sh. This should not be changed by hand. +{ mkDerivation, aeson, base, ekg-core, fetchgit, lib, text +, unordered-containers, vector +}: +mkDerivation { + pname = "ekg-json"; + version = "0.1.0.7"; + src = fetchgit { + url = "https://github.com/hasura/ekg-json.git"; + sha256 = "1yf9x7gh66q27c3wv5m00ijf2qpiwm53jjlhrj2yc1glv684wf4v"; + rev = "f25b9ddb7aae18059ef707a5ce30d6a54a63db13"; + fetchSubmodules = true; + }; + libraryHaskellDepends = [ + aeson base ekg-core text unordered-containers vector + ]; + homepage = "https://github.com/tibbe/ekg-json"; + description = "JSON encoding of ekg metrics"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ lassulus ]; +} diff --git a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine.nix b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine.nix new file mode 100644 index 0000000000..d8faf17145 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine.nix @@ -0,0 +1,81 @@ +# This has been automatically generated by the script +# ./update.sh. This should not be changed by hand. +{ mkDerivation, aeson, aeson-casing, ansi-wl-pprint, asn1-encoding +, asn1-types, async, attoparsec, attoparsec-iso8601, auto-update +, base, base16-bytestring, base64-bytestring, binary, byteorder +, bytestring, case-insensitive, ci-info, containers, cron +, cryptonite, data-has, deepseq, dependent-map, dependent-sum +, directory, ekg-core, ekg-json, exceptions, fast-logger, fetchgit +, file-embed, filepath, ghc-heap-view, graphql-parser, hashable +, hashable-time, hspec, hspec-core, hspec-expectations +, hspec-expectations-lifted, http-api-data, http-client +, http-client-tls, http-conduit, http-types, immortal +, insert-ordered-containers, jose, kan-extensions, lens, lens-aeson +, lib, lifted-async, lifted-base, list-t, memory, mime-types +, mmorph, monad-control, monad-loops, monad-validate, mtl, mustache +, mysql, mysql-simple, natural-transformation, network, network-uri +, odbc, optparse-applicative, pem, pg-client, postgresql-binary +, postgresql-libpq, pretty-simple, process, profunctors, psqueues +, QuickCheck, quickcheck-instances, random, regex-tdfa +, resource-pool, retry, safe, safe-exceptions, scientific +, semialign, semigroups, semver, shakespeare, some, split +, Spock-core, stm, stm-containers, tagged, template-haskell, text +, text-builder, text-conversions, these, time, transformers +, transformers-base, unix, unordered-containers, uri-encode +, utf8-string, uuid, validation, vector, vector-instances, wai +, warp, websockets, wreq, x509, x509-store, yaml, zlib +}: +mkDerivation { + pname = "graphql-engine"; + version = "1.0.0"; + src = fetchgit { + url = "https://github.com/hasura/graphql-engine.git"; + sha256 = "04s8rczvm0l5dbh14g2vav2wbqb4fg51471fncqf36s59img14b7"; + rev = "cf6f3edc1f6df7843dfb91be6dcb0fd7cc94d133"; + fetchSubmodules = true; + }; + postUnpack = "sourceRoot+=/server; echo source root reset to $sourceRoot"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-casing ansi-wl-pprint asn1-encoding asn1-types async + attoparsec attoparsec-iso8601 auto-update base base16-bytestring + base64-bytestring binary byteorder bytestring case-insensitive + ci-info containers cron cryptonite data-has deepseq dependent-map + dependent-sum directory ekg-core ekg-json exceptions fast-logger + file-embed filepath ghc-heap-view graphql-parser hashable + hashable-time http-api-data http-client http-client-tls + http-conduit http-types immortal insert-ordered-containers jose + kan-extensions lens lens-aeson lifted-async lifted-base list-t + memory mime-types mmorph monad-control monad-loops monad-validate + mtl mustache mysql mysql-simple network network-uri odbc + optparse-applicative pem pg-client postgresql-binary + postgresql-libpq pretty-simple process profunctors psqueues + QuickCheck quickcheck-instances random regex-tdfa resource-pool + retry safe-exceptions scientific semialign semigroups semver + shakespeare some split Spock-core stm stm-containers tagged + template-haskell text text-builder text-conversions these time + transformers transformers-base unix unordered-containers uri-encode + utf8-string uuid validation vector vector-instances wai warp + websockets wreq x509 x509-store yaml zlib + ]; + executableHaskellDepends = [ + base bytestring ekg-core kan-extensions pg-client text + text-conversions time unix + ]; + testHaskellDepends = [ + aeson base bytestring containers cron dependent-map dependent-sum + graphql-parser hspec hspec-core hspec-expectations + hspec-expectations-lifted http-client http-client-tls http-types + insert-ordered-containers jose kan-extensions lens lifted-base + mmorph monad-control mtl natural-transformation network-uri + optparse-applicative pg-client process QuickCheck safe scientific + split template-haskell text time transformers-base + unordered-containers vector + ]; + doCheck = false; + homepage = "https://www.hasura.io"; + description = "GraphQL API over Postgres"; + license = lib.licenses.asl20; + maintainers = with lib.maintainers; [ lassulus ]; +} diff --git a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix deleted file mode 100644 index 9e7d448e4c..0000000000 --- a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-engine/default.nix +++ /dev/null @@ -1,75 +0,0 @@ -{ mkDerivation, aeson, aeson-casing, ansi-wl-pprint, asn1-encoding -, asn1-types, async, attoparsec, attoparsec-iso8601, auto-update -, base, base64-bytestring, byteorder, bytestring, case-insensitive -, ci-info, containers, criterion, cryptonite, data-has, deepseq -, dependent-map, dependent-sum, directory, ekg-core, ekg-json -, fast-logger, fetchgit, file-embed, filepath, generic-arbitrary -, ghc-heap-view, graphql-parser, hashable, hspec, hspec-core -, hspec-expectations-lifted, http-client, http-client-tls -, http-types, immortal, insert-ordered-containers, jose, lens -, lifted-async, lifted-base, list-t, mime-types, monad-control -, monad-time, monad-validate, mtl, mustache, mwc-probability -, mwc-random, natural-transformation, network, network-uri -, optparse-applicative, pem, pg-client, postgresql-binary -, postgresql-libpq, process, profunctors, psqueues, QuickCheck -, regex-tdfa, safe, scientific, semver, shakespeare, split -, Spock-core, lib, stm, stm-containers, template-haskell, text -, text-builder, text-conversions, th-lift-instances, these, time -, transformers, transformers-base, unix, unordered-containers -, uri-encode, uuid, vector, wai, wai-websockets, warp, websockets -, wreq, x509, yaml, zlib, witherable, semialign, validation, cron -}: -mkDerivation { - pname = "graphql-engine"; - version = "1.0.0"; - src = fetchgit { - url = "https://github.com/hasura/graphql-engine.git"; - sha256 = "sha256-tNKoi3dtoXj0nn4qBgLBroo7SgX7SdVaHtBqjs1S3hQ="; - rev = "1e3eb035d3c915032ba23e502bcb0132b4d54202"; - fetchSubmodules = true; - }; - postUnpack = "sourceRoot+=/server; echo source root reset to $sourceRoot"; - isLibrary = true; - isExecutable = true; - libraryHaskellDepends = [ - aeson aeson-casing ansi-wl-pprint asn1-encoding asn1-types async - attoparsec attoparsec-iso8601 auto-update base base64-bytestring - byteorder bytestring case-insensitive ci-info containers cryptonite - data-has deepseq dependent-map dependent-sum directory ekg-core - ekg-json fast-logger file-embed filepath generic-arbitrary - ghc-heap-view graphql-parser hashable http-client http-client-tls - http-types immortal insert-ordered-containers jose lens - lifted-async lifted-base list-t mime-types monad-control monad-time - monad-validate mtl mustache network network-uri - optparse-applicative pem pg-client postgresql-binary - postgresql-libpq process profunctors psqueues QuickCheck regex-tdfa - scientific semver shakespeare split Spock-core stm stm-containers - template-haskell text text-builder text-conversions - th-lift-instances these time transformers transformers-base unix - unordered-containers uri-encode uuid vector wai wai-websockets warp - websockets wreq x509 yaml zlib - witherable semialign validation - cron - ]; - executableHaskellDepends = [ - base bytestring pg-client text text-conversions - ]; - testHaskellDepends = [ - aeson base bytestring hspec hspec-core hspec-expectations-lifted - http-client http-client-tls lifted-base monad-control mtl - natural-transformation optparse-applicative pg-client process - QuickCheck safe split text time transformers-base - unordered-containers - ]; - benchmarkHaskellDepends = [ - async base bytestring criterion deepseq mwc-probability mwc-random - split text vector - ]; - doCheck = false; - homepage = "https://www.hasura.io"; - description = "GraphQL API over Postgres"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ offline ]; - hydraPlatforms = []; - broken = true; -} diff --git a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-parser.nix b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-parser.nix new file mode 100644 index 0000000000..0033584a15 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-parser.nix @@ -0,0 +1,33 @@ +# This has been automatically generated by the script +# ./update.sh. This should not be changed by hand. +{ mkDerivation, aeson, attoparsec, base, bytestring, containers +, criterion, deepseq, fetchgit, filepath, hashable, hedgehog, lib +, prettyprinter, scientific, template-haskell, text, text-builder +, th-lift-instances, unordered-containers, vector +}: +mkDerivation { + pname = "graphql-parser"; + version = "0.2.0.0"; + src = fetchgit { + url = "https://github.com/hasura/graphql-parser-hs.git"; + sha256 = "015b1h475k8wmhm9hkrvyxr985x7d8yc0xgcdqj7vmziixvfwwwj"; + rev = "79beb0e85e00422a8a15318c0bc573765fc7b246"; + fetchSubmodules = true; + }; + libraryHaskellDepends = [ + aeson attoparsec base bytestring containers deepseq filepath + hashable hedgehog prettyprinter scientific template-haskell text + text-builder th-lift-instances unordered-containers vector + ]; + testHaskellDepends = [ + attoparsec base bytestring hedgehog prettyprinter scientific text + text-builder + ]; + benchmarkHaskellDepends = [ + base bytestring criterion prettyprinter text text-builder + ]; + homepage = "https://github.com/hasura/graphql-parser-hs"; + description = "A native Haskell GraphQL parser"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ lassulus ]; +} diff --git a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix deleted file mode 100644 index dbd3edf006..0000000000 --- a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/graphql-parser/default.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ mkDerivation, aeson, attoparsec, base, bytestring, containers -, criterion, fetchgit, filepath, hedgehog, hpack, prettyprinter -, protolude, regex-tdfa, scientific, lib, template-haskell, text -, text-builder, th-lift-instances, unordered-containers, vector -}: -mkDerivation { - pname = "graphql-parser"; - version = "0.1.0.1"; - src = fetchgit { - url = "https://github.com/hasura/graphql-parser-hs.git"; - sha256 = "sha256-oem/h0AQPk7eSM/P6wMoWV9KirxutE4hnQWwrpQ6TGk="; - rev = "ba8e26fef1488cf3c8c08e86f02730f56ec84e1f"; - fetchSubmodules = true; - }; - libraryHaskellDepends = [ - aeson attoparsec base bytestring containers filepath hedgehog - prettyprinter protolude regex-tdfa scientific template-haskell text - text-builder th-lift-instances unordered-containers vector - ]; - libraryToolDepends = [ hpack ]; - testHaskellDepends = [ - aeson attoparsec base bytestring containers filepath hedgehog - prettyprinter protolude regex-tdfa scientific template-haskell text - text-builder th-lift-instances unordered-containers vector - ]; - benchmarkHaskellDepends = [ - aeson attoparsec base bytestring containers criterion filepath - hedgehog prettyprinter protolude regex-tdfa scientific - template-haskell text text-builder th-lift-instances - unordered-containers vector - ]; - doCheck = false; - prePatch = "hpack"; - homepage = "https://github.com/hasura/graphql-parser-hs#readme"; - license = lib.licenses.bsd3; -} diff --git a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pg-client.nix b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pg-client.nix new file mode 100644 index 0000000000..d1eb5e156e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pg-client.nix @@ -0,0 +1,36 @@ +# This has been automatically generated by the script +# ./update.sh. This should not be changed by hand. +{ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring +, Cabal, criterion, ekg-core, fetchgit, file-embed, hashable +, hashtables, hasql, hasql-pool, hasql-transaction, hspec, lib +, mmorph, monad-control, mtl, postgresql, postgresql-binary +, postgresql-libpq, resource-pool, retry, scientific +, template-haskell, text, text-builder, time, transformers-base +, uuid, vector +}: +mkDerivation { + pname = "pg-client"; + version = "0.1.0"; + src = fetchgit { + url = "https://github.com/hasura/pg-client-hs.git"; + sha256 = "1y79s3ai4h82szpm1j5n5ygybqr7cza9l0raxf39vgn66jhy1jd2"; + rev = "92975d0f8f933c8d06913dc97af259253bf7fb5f"; + fetchSubmodules = true; + }; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ + aeson aeson-casing attoparsec base bytestring ekg-core hashable + hashtables mmorph monad-control mtl postgresql-binary + postgresql-libpq resource-pool retry scientific template-haskell + text text-builder time transformers-base uuid vector + ]; + librarySystemDepends = [ postgresql ]; + testHaskellDepends = [ base bytestring hspec mtl ]; + benchmarkHaskellDepends = [ + base bytestring criterion file-embed hashable hasql hasql-pool + hasql-transaction mtl postgresql-libpq text text-builder + ]; + homepage = "https://github.com/hasura/platform"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ lassulus ]; +} diff --git a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pg-client/default.nix b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pg-client/default.nix deleted file mode 100644 index bccb3f6eda..0000000000 --- a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pg-client/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ mkDerivation, aeson, aeson-casing, attoparsec, base, bytestring -, criterion, fetchgit, file-embed, hashable, hashtables, hasql -, hasql-pool, hasql-transaction, monad-control, mtl -, postgresql-binary, postgresql-libpq, resource-pool, retry -, scientific, lib, template-haskell, text, text-builder, th-lift -, th-lift-instances, time, transformers-base, uuid, vector -}: -mkDerivation { - pname = "pg-client"; - version = "0.1.0"; - src = fetchgit { - url = "https://github.com/hasura/pg-client-hs.git"; - sha256 = "1941gj5yp24kx0xb1nd774nwp5vnpsp6m83isqkwpyz9spl4sq7l"; - rev = "70a849d09bea9461e72c5a5bbde06df65aab61c0"; - fetchSubmodules = true; - }; - libraryHaskellDepends = [ - aeson aeson-casing attoparsec base bytestring hashable hashtables - monad-control mtl postgresql-binary postgresql-libpq resource-pool - retry scientific template-haskell text text-builder th-lift - th-lift-instances time transformers-base uuid vector - ]; - testHaskellDepends = [ base ]; - benchmarkHaskellDepends = [ - base bytestring criterion file-embed hashable hasql hasql-pool - hasql-transaction mtl postgresql-libpq text text-builder - ]; - homepage = "https://github.com/hasura/platform"; - license = lib.licenses.bsd3; -} diff --git a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pool.nix b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pool.nix new file mode 100644 index 0000000000..a12d61f0fe --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/pool.nix @@ -0,0 +1,24 @@ +# This has been automatically generated by the script +# ./update.sh. This should not be changed by hand. +{ mkDerivation, base, fetchgit, hashable, hspec, lib, monad-control +, stm, time, transformers, transformers-base, vector +}: +mkDerivation { + pname = "resource-pool"; + version = "0.2.3.2"; + src = fetchgit { + url = "https://github.com/hasura/pool.git"; + sha256 = "00q1fxh72fgjwl1pi3lnp4xg8f3kfm6q12gs9scinwbymfgzarms"; + rev = "bc4c3f739a8fb8ec4444336a34662895831c9acf"; + fetchSubmodules = true; + }; + libraryHaskellDepends = [ + base hashable monad-control stm time transformers transformers-base + vector + ]; + testHaskellDepends = [ base hspec ]; + homepage = "http://github.com/bos/pool"; + description = "A high-performance striped resource pooling implementation"; + license = lib.licenses.bsd3; + maintainers = with lib.maintainers; [ lassulus ]; +} diff --git a/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/update.sh b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/update.sh new file mode 100755 index 0000000000..77a5d5fc6d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/misc/haskell/hasura/update.sh @@ -0,0 +1,85 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p cabal2nix curl jq -I nixpkgs=. +# +# This script will update the hasura derivations to the latest version using +# cabal2nix. +# +# Note that you should always try building hasura graphql-engine after updating it here, since +# some of the overrides in pkgs/development/haskell/configuration-nix.nix may +# need to be updated/changed. + +set -eo pipefail + +# This is the directory of this update.sh script. +script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" + +# graphql-engine derivation created with cabal2nix. +engine_derivation_file="${script_dir}/graphql-engine.nix" +parser_derivation_file="${script_dir}/graphql-parser.nix" +ciinfo_derivation_file="${script_dir}/ci-info.nix" +pgclient_derivation_file="${script_dir}/pg-client.nix" +pool_derivation_file="${script_dir}/pool.nix" +ekgcore_derivation_file="${script_dir}/ekg-core.nix" +ekgjson_derivation_file="${script_dir}/ekg-json.nix" + +# TODO: get current revision of graphql-engine in Nixpkgs. +# old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$engine_derivation_file")" + +# This is the latest release version of graphql-engine on GitHub. +new_version=$(curl --silent "https://api.github.com/repos/hasura/graphql-engine/releases" | jq '.[0].tag_name' --raw-output) + +echo "Running cabal2nix and outputting to ${engine_derivation_file}..." + +echo "# This has been automatically generated by the script" > "$engine_derivation_file" +echo "# ./update.sh. This should not be changed by hand." >> "$engine_derivation_file" + +cabal2nix --revision "$new_version" --subpath server --maintainer lassulus --no-check "https://github.com/hasura/graphql-engine.git" >> "$engine_derivation_file" + +echo "Running cabal2nix and outputting to ${parser_derivation_file}..." + +echo "# This has been automatically generated by the script" > "$parser_derivation_file" +echo "# ./update.sh. This should not be changed by hand." >> "$parser_derivation_file" + +cabal2nix --maintainer lassulus "https://github.com/hasura/graphql-parser-hs.git" >> "$parser_derivation_file" + +echo "Running cabal2nix and outputting to ${ciinfo_derivation_file}..." + +echo "# This has been automatically generated by the script" > "$ciinfo_derivation_file" +echo "# ./update.sh. This should not be changed by hand." >> "$ciinfo_derivation_file" + +cabal2nix --maintainer lassulus "https://github.com/hasura/ci-info-hs.git" >> "$ciinfo_derivation_file" + +echo "Running cabal2nix and outputting to ${pgclient_derivation_file}..." + +echo "# This has been automatically generated by the script" > "$pgclient_derivation_file" +echo "# ./update.sh. This should not be changed by hand." >> "$pgclient_derivation_file" + +cabal2nix --maintainer lassulus "https://github.com/hasura/pg-client-hs.git" >> "$pgclient_derivation_file" + +echo "Running cabal2nix and outputting to ${pool_derivation_file}..." + +echo "# This has been automatically generated by the script" > "$pool_derivation_file" +echo "# ./update.sh. This should not be changed by hand." >> "$pool_derivation_file" + +cabal2nix --maintainer lassulus "https://github.com/hasura/pool.git" >> "$pool_derivation_file" + +echo "Running cabal2nix and outputting to ${ekgcore_derivation_file}..." + +echo "# This has been automatically generated by the script" > "$ekgcore_derivation_file" +echo "# ./update.sh. This should not be changed by hand." >> "$ekgcore_derivation_file" + +cabal2nix --maintainer lassulus "https://github.com/hasura/ekg-core.git" >> "$ekgcore_derivation_file" + +echo "Running cabal2nix and outputting to ${ekgjson_derivation_file}..." + +echo "# This has been automatically generated by the script" > "$ekgjson_derivation_file" +echo "# ./update.sh. This should not be changed by hand." >> "$ekgjson_derivation_file" + +cabal2nix --maintainer lassulus "https://github.com/hasura/ekg-json.git" >> "$ekgjson_derivation_file" + +echo "###################" +echo "please update pkgs/servers/hasura/cli.nix vendorSha256" +echo "please update pkgs/development/haskell-modules/configuration-common.nix graphql-engine version" +echo "###################" + +echo "Finished." diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json index 7d1b6a9246..ec7db2ee8a 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -3,6 +3,8 @@ , "@antora/cli" , "@antora/site-generator-default" , "@bitwarden/cli" +, "@commitlint/cli" +, "@commitlint/config-conventional" , "@hyperspace/cli" , "@nestjs/cli" , "@squoosh/cli" diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix index 0406e46594..6f7594f412 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -1687,6 +1687,132 @@ let sha512 = "sR9Go0U6puXoXyW9UgIiIQhRcJ8jVOvGl4BptUiXAtheMs72WcakZ1udh6J0ZOivr3o8jAM+MTCHLP8FZMbVpQ=="; }; }; + "@commitlint/ensure-13.1.0" = { + name = "_at_commitlint_slash_ensure"; + packageName = "@commitlint/ensure"; + version = "13.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/ensure/-/ensure-13.1.0.tgz"; + sha512 = "NRGyjOdZQnlYwm9it//BZJ2Vm+4x7G9rEnHpLCvNKYY0c6RA8Qf7hamLAB8dWO12RLuFt06JaOpHZoTt/gHutA=="; + }; + }; + "@commitlint/execute-rule-13.0.0" = { + name = "_at_commitlint_slash_execute-rule"; + packageName = "@commitlint/execute-rule"; + version = "13.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-13.0.0.tgz"; + sha512 = "lBz2bJhNAgkkU/rFMAw3XBNujbxhxlaFHY3lfKB/MxpAa+pIfmWB3ig9i1VKe0wCvujk02O0WiMleNaRn2KJqw=="; + }; + }; + "@commitlint/format-13.1.0" = { + name = "_at_commitlint_slash_format"; + packageName = "@commitlint/format"; + version = "13.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/format/-/format-13.1.0.tgz"; + sha512 = "n46rYvzf+6Sm99TJjTLjJBkjm6JVcklt31lDO5Q+pCIV0NnJ4qIUcwa6wIL9a9Vqb1XzlMgtp27E0zyYArkvSg=="; + }; + }; + "@commitlint/is-ignored-13.1.0" = { + name = "_at_commitlint_slash_is-ignored"; + packageName = "@commitlint/is-ignored"; + version = "13.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-13.1.0.tgz"; + sha512 = "P6zenLE5Tn3FTNjRzmL9+/KooTXEI0khA2TmUbuei9KiycemeO4q7Xk7w7aXwFPNAbN0O9oI7z3z7cFpzKJWmQ=="; + }; + }; + "@commitlint/lint-13.1.0" = { + name = "_at_commitlint_slash_lint"; + packageName = "@commitlint/lint"; + version = "13.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/lint/-/lint-13.1.0.tgz"; + sha512 = "qH9AYSQDDTaSWSdtOvB3G1RdPpcYSgddAdFYqpFewlKQ1GJj/L+sM7vwqCG7/ip6AiM04Sry1sgmFzaEoFREUA=="; + }; + }; + "@commitlint/load-13.1.0" = { + name = "_at_commitlint_slash_load"; + packageName = "@commitlint/load"; + version = "13.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/load/-/load-13.1.0.tgz"; + sha512 = "zlZbjJCWnWmBOSwTXis8H7I6pYk6JbDwOCuARA6B9Y/qt2PD+NCo0E/7EuaaFoxjHl+o56QR5QttuMBrf+BJzg=="; + }; + }; + "@commitlint/message-13.0.0" = { + name = "_at_commitlint_slash_message"; + packageName = "@commitlint/message"; + version = "13.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/message/-/message-13.0.0.tgz"; + sha512 = "W/pxhesVEk8747BEWJ+VGQ9ILHmCV27/pEwJ0hGny1wqVquUR8SxvScRCbUjHCB1YtWX4dEnOPXOS9CLH/CX7A=="; + }; + }; + "@commitlint/parse-13.1.0" = { + name = "_at_commitlint_slash_parse"; + packageName = "@commitlint/parse"; + version = "13.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/parse/-/parse-13.1.0.tgz"; + sha512 = "xFybZcqBiKVjt6vTStvQkySWEUYPI0AcO4QQELyy29o8EzYZqWkhUfrb7K61fWiHsplWL1iL6F3qCLoxSgTcrg=="; + }; + }; + "@commitlint/read-13.1.0" = { + name = "_at_commitlint_slash_read"; + packageName = "@commitlint/read"; + version = "13.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/read/-/read-13.1.0.tgz"; + sha512 = "NrVe23GMKyL6i1yDJD8IpqCBzhzoS3wtLfDj8QBzc01Ov1cYBmDojzvBklypGb+MLJM1NbzmRM4PR5pNX0U/NQ=="; + }; + }; + "@commitlint/resolve-extends-13.0.0" = { + name = "_at_commitlint_slash_resolve-extends"; + packageName = "@commitlint/resolve-extends"; + version = "13.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-13.0.0.tgz"; + sha512 = "1SyaE+UOsYTkQlTPUOoj4NwxQhGFtYildVS/d0TJuK8a9uAJLw7bhCLH2PEeH5cC2D1do4Eqhx/3bLDrSLH3hg=="; + }; + }; + "@commitlint/rules-13.1.0" = { + name = "_at_commitlint_slash_rules"; + packageName = "@commitlint/rules"; + version = "13.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/rules/-/rules-13.1.0.tgz"; + sha512 = "b6F+vBqEXsHVghrhomG0Y6YJimHZqkzZ0n5QEpk03dpBXH2OnsezpTw5e+GvbyYCc7PutGbYVQkytuv+7xCxYA=="; + }; + }; + "@commitlint/to-lines-13.0.0" = { + name = "_at_commitlint_slash_to-lines"; + packageName = "@commitlint/to-lines"; + version = "13.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-13.0.0.tgz"; + sha512 = "mzxWwCio1M4/kG9/69TTYqrraQ66LmtJCYTzAZdZ2eJX3I5w52pSjyP/DJzAUVmmJCYf2Kw3s+RtNVShtnZ+Rw=="; + }; + }; + "@commitlint/top-level-13.0.0" = { + name = "_at_commitlint_slash_top-level"; + packageName = "@commitlint/top-level"; + version = "13.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/top-level/-/top-level-13.0.0.tgz"; + sha512 = "baBy3MZBF28sR93yFezd4a5TdHsbXaakeladfHK9dOcGdXo9oQe3GS5hP3BmlN680D6AiQSN7QPgEJgrNUWUCg=="; + }; + }; + "@commitlint/types-13.1.0" = { + name = "_at_commitlint_slash_types"; + packageName = "@commitlint/types"; + version = "13.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/types/-/types-13.1.0.tgz"; + sha512 = "zcVjuT+OfKt8h91vhBxt05RMcTGEx6DM7Q9QZeuMbXFk6xgbsSEDMMapbJPA1bCZ81fa/1OQBijSYPrKvtt06g=="; + }; + }; "@corestore/networker-1.2.0" = { name = "_at_corestore_slash_networker"; packageName = "@corestore/networker"; @@ -1696,6 +1822,16 @@ let sha512 = "ErfgH7yuwh6C7Y4AYM6A+Vv0lYV2c3sx9NNzCkIOB8pgp1cPmht4T4ZbLu0GiVj1XJ67AOPI0nhYfi4DB/h2rA=="; }; }; + "cosmiconfig-7.0.1" = { + name = "cosmiconfig"; + packageName = "cosmiconfig"; + version = "7.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.0.1.tgz"; + sha512 = + "a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ=="; + }; + }; "@cronvel/get-pixels-3.4.0" = { name = "_at_cronvel_slash_get-pixels"; packageName = "@cronvel/get-pixels"; @@ -4090,6 +4226,17 @@ let sha512 = "iWtpXfn1Zh4Vm37BzY8OSJ60Y9TqNOjk8J+KLIwcql9EuP+0C/C4WUn+vIQMfmnut3MxRmAYFE2B/LFYrjGC5Q=="; }; }; + "resolve-global-1.0.0" = { + name = "resolve-global"; + packageName = "resolve-global"; + version = "1.0.0"; + src = fetchurl { + url = + "https://registry.npmjs.org/resolve-global/-/resolve-global-1.0.0.tgz"; + sha512 = + "zFa12V4OLtT5XUX/Q4VLvTfBf+Ok0SPc1FNGM/z9ctUdiU618qwKpWnd0CHs3+RqROfyEg/DhuHbMWYqcgljEw=="; + }; + }; "@netflix/nerror-1.1.3" = { name = "_at_netflix_slash_nerror"; packageName = "@netflix/nerror"; @@ -102355,6 +102502,227 @@ in bypassCache = true; reconstructLock = true; }; + "@commitlint/config-conventional" = nodeEnv.buildNodePackage { + name = "_at_commitlint_slash_config-conventional"; + packageName = "@commitlint/config-conventional"; + version = "13.1.0"; + src = fetchurl { + url = + "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-13.1.0.tgz"; + sha512 = + "zukJXqdr6jtMiVRy3tTHmwgKcUMGfqKDEskRigc5W3k2aYF4gBAtCEjMAJGZgSQE4DMcHeok0pEV2ANmTpb0cw=="; + }; + dependencies = [ + sources."array-ify-1.0.0" + sources."compare-func-2.0.0" + sources."conventional-changelog-conventionalcommits-4.6.0" + sources."dot-prop-5.3.0" + sources."is-obj-2.0.0" + sources."lodash-4.17.21" + sources."q-1.5.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = + "Shareable commitlint config enforcing conventional commits"; + homepage = "https://github.com/conventional-changelog/commitlint#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; + "@commitlint/cli" = nodeEnv.buildNodePackage { + name = "_at_commitlint_slash_cli"; + packageName = "@commitlint/cli"; + version = "13.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@commitlint/cli/-/cli-13.1.0.tgz"; + sha512 = + "xN/uNYWtGTva5OMSd+xA6e6/c2jk8av7MUbdd6w2cw89u6z3fAWoyiH87X0ewdSMNYmW/6B3L/2dIVGHRDID5w=="; + }; + dependencies = [ + sources."@babel/code-frame-7.14.5" + sources."@babel/helper-validator-identifier-7.14.9" + (sources."@babel/highlight-7.14.5" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."has-flag-3.0.0" + sources."supports-color-5.5.0" + ]; + }) + sources."@commitlint/ensure-13.1.0" + sources."@commitlint/execute-rule-13.0.0" + sources."@commitlint/format-13.1.0" + sources."@commitlint/is-ignored-13.1.0" + sources."@commitlint/lint-13.1.0" + sources."@commitlint/load-13.1.0" + sources."@commitlint/message-13.0.0" + sources."@commitlint/parse-13.1.0" + sources."@commitlint/read-13.1.0" + sources."@commitlint/resolve-extends-13.0.0" + sources."@commitlint/rules-13.1.0" + sources."@commitlint/to-lines-13.0.0" + (sources."@commitlint/top-level-13.0.0" // { + dependencies = [ + sources."find-up-5.0.0" + sources."locate-path-6.0.0" + sources."p-limit-3.1.0" + sources."p-locate-5.0.0" + ]; + }) + sources."@commitlint/types-13.1.0" + sources."@types/minimist-1.2.2" + sources."@types/normalize-package-data-2.4.1" + sources."@types/parse-json-4.0.0" + sources."JSONStream-1.3.5" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."array-ify-1.0.0" + sources."arrify-1.0.1" + sources."callsites-3.1.0" + sources."camelcase-5.3.1" + sources."camelcase-keys-6.2.2" + sources."chalk-4.1.2" + sources."cliui-7.0.4" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."compare-func-2.0.0" + sources."conventional-changelog-angular-5.0.12" + sources."conventional-commits-parser-3.2.1" + sources."cosmiconfig-7.0.1" + sources."cross-spawn-7.0.3" + sources."dargs-7.0.0" + sources."decamelize-1.2.0" + (sources."decamelize-keys-1.1.0" // { + dependencies = [ sources."map-obj-1.0.1" ]; + }) + sources."dot-prop-5.3.0" + sources."emoji-regex-8.0.0" + sources."error-ex-1.3.2" + sources."escalade-3.1.1" + sources."escape-string-regexp-1.0.5" + sources."execa-5.1.1" + sources."find-up-4.1.0" + sources."fs-extra-10.0.0" + sources."function-bind-1.1.1" + sources."get-caller-file-2.0.5" + sources."get-stream-6.0.1" + sources."git-raw-commits-2.0.10" + sources."global-dirs-0.1.1" + sources."graceful-fs-4.2.8" + sources."hard-rejection-2.1.0" + sources."has-1.0.3" + sources."has-flag-4.0.0" + sources."hosted-git-info-4.0.2" + sources."human-signals-2.1.0" + (sources."import-fresh-3.3.0" // { + dependencies = [ sources."resolve-from-4.0.0" ]; + }) + sources."indent-string-4.0.0" + sources."inherits-2.0.4" + sources."ini-1.3.8" + sources."is-arrayish-0.2.1" + sources."is-core-module-2.6.0" + sources."is-fullwidth-code-point-3.0.0" + sources."is-obj-2.0.0" + sources."is-plain-obj-1.1.0" + sources."is-stream-2.0.1" + sources."is-text-path-1.0.1" + sources."isexe-2.0.0" + sources."js-tokens-4.0.0" + sources."json-parse-even-better-errors-2.3.1" + sources."jsonfile-6.1.0" + sources."jsonparse-1.3.1" + sources."kind-of-6.0.3" + sources."lines-and-columns-1.1.6" + sources."locate-path-5.0.0" + sources."lodash-4.17.21" + sources."lru-cache-6.0.0" + sources."map-obj-4.2.1" + sources."meow-8.1.2" + sources."merge-stream-2.0.0" + sources."mimic-fn-2.1.0" + sources."min-indent-1.0.1" + sources."minimist-options-4.1.0" + sources."normalize-package-data-3.0.3" + sources."npm-run-path-4.0.1" + sources."onetime-5.1.2" + sources."p-limit-2.3.0" + sources."p-locate-4.1.0" + sources."p-try-2.2.0" + sources."parent-module-1.0.1" + sources."parse-json-5.2.0" + sources."path-exists-4.0.0" + sources."path-key-3.1.1" + sources."path-parse-1.0.7" + sources."path-type-4.0.0" + sources."q-1.5.1" + sources."quick-lru-4.0.1" + (sources."read-pkg-5.2.0" // { + dependencies = [ + sources."hosted-git-info-2.8.9" + sources."normalize-package-data-2.5.0" + sources."semver-5.7.1" + sources."type-fest-0.6.0" + ]; + }) + (sources."read-pkg-up-7.0.1" // { + dependencies = [ sources."type-fest-0.8.1" ]; + }) + sources."readable-stream-3.6.0" + sources."redent-3.0.0" + sources."require-directory-2.1.1" + sources."resolve-1.20.0" + sources."resolve-from-5.0.0" + sources."resolve-global-1.0.0" + sources."safe-buffer-5.2.1" + sources."semver-7.3.5" + sources."shebang-command-2.0.0" + sources."shebang-regex-3.0.0" + sources."signal-exit-3.0.3" + sources."spdx-correct-3.1.1" + sources."spdx-exceptions-2.3.0" + sources."spdx-expression-parse-3.0.1" + sources."spdx-license-ids-3.0.10" + sources."split2-3.2.2" + sources."string-width-4.2.2" + sources."string_decoder-1.3.0" + sources."strip-ansi-6.0.0" + sources."strip-final-newline-2.0.0" + sources."strip-indent-3.0.0" + sources."supports-color-7.2.0" + sources."text-extensions-1.9.0" + sources."through-2.3.8" + sources."through2-4.0.2" + sources."trim-newlines-3.0.1" + sources."trim-off-newlines-1.0.1" + sources."type-fest-0.18.1" + sources."universalify-2.0.0" + sources."util-deprecate-1.0.2" + sources."validate-npm-package-license-3.0.4" + sources."which-2.0.2" + sources."wrap-ansi-7.0.0" + sources."y18n-5.0.8" + sources."yallist-4.0.0" + sources."yaml-1.10.2" + sources."yargs-17.1.1" + sources."yargs-parser-20.2.9" + sources."yocto-queue-0.1.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Lint your commit messages"; + homepage = "https://github.com/conventional-changelog/commitlint#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible/collections.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible/collections.nix index 05aa0b2b29..0c58defb58 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible/collections.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible/collections.nix @@ -72,7 +72,7 @@ buildPythonPackage rec { meta = with lib; { description = "Radically simple IT automation"; - homepage = "http://www.ansible.com"; + homepage = "https://www.ansible.com"; license = licenses.gpl3Plus; maintainers = with maintainers; [ hexa ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible/legacy.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible/legacy.nix index 7eb0f3f940..e7687f9b99 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible/legacy.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible/legacy.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { doCheck = false; meta = with lib; { - homepage = "http://www.ansible.com"; + homepage = "https://www.ansible.com"; description = "Radically simple IT automation"; license = [ licenses.gpl3 ] ; maintainers = with maintainers; [ joamaki costrouc hexa ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix index 5f09dda0f4..0827e5519a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix @@ -1,32 +1,43 @@ { lib , buildPythonPackage , fetchPypi -, pytest -, pytest-runner +, pytestCheckHook , six , html5lib , setuptools , packaging +, pythonOlder }: buildPythonPackage rec { pname = "bleach"; - version = "3.3.1"; + version = "4.0.0"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1yma53plrlw2llaqxv8yk0g5al0vvlywwzym18b78m3rm6jq6r1h"; + sha256 = "sha256-/6kiHGrCk5nMUPzDNHM2bt0M+NXiy7u2MpbcMn+2fMg="; }; - checkInputs = [ pytest pytest-runner ]; - propagatedBuildInputs = [ packaging six html5lib setuptools ]; + propagatedBuildInputs = [ + packaging + six + html5lib + setuptools + ]; - # Disable network tests - checkPhase = '' - pytest -k "not protocols" - ''; + checkInputs = [ + pytestCheckHook + ]; - meta = { + disabledTests = [ + # Disable network tests + "protocols" + ]; + + pythonImportsCheck = [ "bleach" ]; + + meta = with lib; { description = "An easy, HTML5, whitelisting HTML sanitizer"; longDescription = '' Bleach is an HTML sanitizing library that escapes or strips markup and @@ -41,7 +52,7 @@ buildPythonPackage rec { ''; homepage = "https://github.com/mozilla/bleach"; downloadPage = "https://github.com/mozilla/bleach/releases"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ prikhi ]; + license = licenses.asl20; + maintainers = with maintainers; [ prikhi ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix index c5f0fafde8..48ac17f66d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/certbot/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "certbot"; - version = "1.17.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-07UfTIZUbRD19BQ0xlZXlZo/oiVLDFNq+N2pDnWwbwI="; + sha256 = "sha256-j+MygstaOt3TMz8rEZE5OBYVZXWtrUyIuSO+qagKrjk="; }; sourceRoot = "source/${pname}"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datasette-template-sql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datasette-template-sql/default.nix new file mode 100644 index 0000000000..84c88aea93 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/datasette-template-sql/default.nix @@ -0,0 +1,33 @@ +{ buildPythonPackage +, fetchFromGitHub +, lib +, datasette +, pytestCheckHook +, pytest-asyncio +, sqlite-utils +}: + +buildPythonPackage rec { + pname = "datasette-template-sql"; + version = "1.0.2"; + + src = fetchFromGitHub { + owner = "simonw"; + repo = pname; + rev = version; + sha256 = "1ag5f62y445jscxnklcfd84pjinkknmrpk1kmm2j121p7484hrsn"; + }; + + propagatedBuildInputs = [ datasette ]; + + checkInputs = [ pytestCheckHook pytest-asyncio sqlite-utils ]; + + pythonImportsCheck = [ "datasette_template_sql" ]; + + meta = with lib; { + description = "Datasette plugin for executing SQL queries from templates"; + homepage = "https://datasette.io/plugins/datasette-template-sql"; + license = licenses.asl20; + maintainers = [ maintainers.MostAwesomeDude ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/djangoql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangoql/default.nix index c538a37314..bceb852655 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/djangoql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/djangoql/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "djangoql"; - version = "0.15.0"; + version = "0.15.2"; src = fetchPypi { inherit pname version; - sha256 = "ddd876b640faf941aface6e8554dc7e79a79ec00fee12da8a20f9f74301f7943"; + sha256 = "bd9d3accc5e84c439d22211676cf74ab746e557da9bc57afb27fee0ccd00e563"; }; propagatedBuildInputs = [ ply ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ftfy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ftfy/default.nix index 403ca52479..2d3ff1febf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ftfy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ftfy/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "ftfy"; - version = "5.9"; + version = "6.0.3"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "8c4fb2863c0b82eae2ab3cf353d9ade268dfbde863d322f78d6a9fd5cefb31e9"; + sha256 = "ba71121a9c8d7790d3e833c6c1021143f3e5c4118293ec3afb5d43ed9ca8e72b"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hiredis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hiredis/default.nix index ef10d19567..00ce786b00 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hiredis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hiredis/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "hiredis"; - version = "1.1.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "996021ef33e0f50b97ff2d6b5f422a0fe5577de21a8873b58a779a5ddd1c3132"; + sha256 = "81d6d8e39695f2c37954d1011c0480ef7cf444d4e3ae24bc5e89ee5de360139a"; }; propagatedBuildInputs = [ redis ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/immutables/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/immutables/default.nix index 196ea78bba..896db29f2c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/immutables/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/immutables/default.nix @@ -1,21 +1,37 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pytestCheckHook , pythonOlder +, mypy +, typing-extensions }: buildPythonPackage rec { pname = "immutables"; - version = "0.15"; - disabled = pythonOlder "3.5"; + version = "0.16"; + disabled = pythonOlder "3.6"; - src = fetchPypi { - inherit pname version; - sha256 = "3713ab1ebbb6946b7ce1387bb9d1d7f5e09c45add58c2a2ee65f963c171e746b"; + src = fetchFromGitHub { + owner = "MagicStack"; + repo = pname; + rev = "v${version}"; + sha256 = "1f6nlpvrs41cjrnikx48qd0rlf7d89h6dzlr5zcndzsim7fgsmgz"; }; - checkInputs = [ pytestCheckHook ]; + propagatedBuildInputs = [ + typing-extensions + ]; + + checkInputs = [ + mypy + pytestCheckHook + ]; + + disabledTests = [ + # Version mismatch + "testMypyImmu" + ]; pythonImportsCheck = [ "immutables" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/klein/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/klein/default.nix index f4c26edd0e..a2870f3ca7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/klein/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/klein/default.nix @@ -1,35 +1,29 @@ -{ lib, buildPythonPackage, fetchPypi, fetchpatch -, six, twisted, werkzeug, incremental -, mock }: +{ lib, buildPythonPackage, fetchPypi, python +, attrs, enum34, hyperlink, incremental, six, twisted, typing, tubes, werkzeug, zope_interface +, hypothesis, treq +}: buildPythonPackage rec { pname = "klein"; - version = "17.10.0"; + version = "21.8.0"; src = fetchPypi { inherit pname version; - sha256 = "30aaf0d78a987d5dbfe0968a07367ad0c73e02823cc8eef4c54f80ab848370d0"; + sha256 = "1mpydmz90d0n9dwa7mr6pgj5v0kczfs05ykssrasdq368dssw7ch"; }; - patches = [ - (fetchpatch { - name = "tests-expect-werkzeug-308.patch"; - url = "https://github.com/twisted/klein/commit/e2a5835b83e37a2bc5faefbfe1890c529b18b9c6.patch"; - sha256 = "03j0bj3l3hnf7f96rb27i4bzy1iih79ll5bcah7gybdi1wpznh8w"; - }) - ]; + propagatedBuildInputs = [ attrs enum34 hyperlink incremental six twisted typing tubes werkzeug zope_interface ]; - propagatedBuildInputs = [ six twisted werkzeug incremental ]; - - checkInputs = [ mock twisted ]; + checkInputs = [ hypothesis treq ]; checkPhase = '' - trial klein + ${python.interpreter} -m twisted.trial -j $NIX_BUILD_CORES klein ''; meta = with lib; { description = "Klein Web Micro-Framework"; homepage = "https://github.com/twisted/klein"; license = licenses.mit; + maintainers = with maintainers; [ exarkun ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/markdown2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/markdown2/default.nix index b40254f089..8b9fa11814 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/markdown2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/markdown2/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "markdown2"; - version = "2.4.0"; + version = "2.4.1"; # PyPI does not contain tests, so using GitHub instead. src = fetchFromGitHub { owner = "trentm"; repo = "python-markdown2"; rev = version; - sha256 = "sha256:03qmf087phpj0h9hx111k4r5pkm48dhb61mqhp1v75gd09k0z79z"; + sha256 = "0y7kh9jj8ys00qkfmmyqj63y21g7wn7yr715kj0j1nabs6xbp0y7"; }; checkInputs = [ pygments ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/memory-allocator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/memory-allocator/default.nix new file mode 100644 index 0000000000..cbb521ea98 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/memory-allocator/default.nix @@ -0,0 +1,27 @@ +{ lib +, fetchPypi +, buildPythonPackage +, cython +}: + +buildPythonPackage rec { + pname = "memory-allocator"; + version = "0.1.0"; + + src = fetchPypi { + inherit version; + pname = "memory_allocator"; + sha256 = "sha256-UUcR71e3eAQIQpmWM+AVQxVtgHvrNjaIlHo5pURUln0="; + }; + + propagatedBuildInputs = [ cython ]; + + pythonImportsCheck = [ "memory_allocator" ]; + + meta = with lib; { + description = "An extension class to allocate memory easily with cython"; + homepage = "https://github.com/sagemath/memory_allocator/"; + maintainers = teams.sage.members; + license = licenses.lgpl3Plus; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycdio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycdio/default.nix index 7dee3229f7..fb298e62ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycdio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycdio/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pycdio"; - version = "2.1.0"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "01b7vqqfry071p60sabydym7r3m3rxszyqpdbs1qi5rk2sfyblnn"; + sha256 = "61734db8c554b7b1a2cb2da2e2c15d3f9f5973a57cfb06f8854c38029004a9f8"; }; prePatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyenchant/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyenchant/default.nix index fec3efb9b3..3c5310690c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyenchant/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyenchant/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "pyenchant"; - version = "3.2.0"; + version = "3.2.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "6b97e9a9f132fa7c9029a6635d821ccad67d4980e68186d02c765b4256b6f152"; + sha256 = "5e206a1d6596904a922496f6c9f7d0b964b243905f401f5f2f40ea4d1f74e2cf"; }; propagatedBuildInputs = [ enchant2 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix index 3cea788643..761f4deed2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "pytest-sanic"; - version = "1.7.1"; + version = "1.8.1"; src = fetchFromGitHub { owner = "yunstanford"; repo = pname; rev = "v${version}"; - sha256 = "sha256-OtyulpSHUWERtcIRT5j3YtHciIxFiIFYKqtlEd1NSFw="; + sha256 = "128qxpqilqjhpjzjzzfzsgi4bc0vxwmz0k3xwry6fwhyzcf2bzl5"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-box/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-box/default.nix index 54a06d09f8..6410bbadd2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-box/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-box/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "python-box"; - version = "5.4.0"; + version = "5.4.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "cdgriffith"; repo = "Box"; rev = version; - sha256 = "sha256-1eRuTpwANyLjnAK1guPOQmH2EW0ITvC7nvyFcEUErz8="; + sha256 = "sha256-SkteajcWG7rBFMm6Xp6QCfkZfwthRituGL/RtICbtYk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix index c1a2de0a07..5d13a50a11 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-lsp-server/default.nix @@ -22,6 +22,15 @@ , setuptools , ujson , yapf +, withAutopep8 ? true +, withFlake8 ? true +, withMccabe ? true +, withPycodestyle ? true +, withPydocstyle ? true +, withPyflakes ? true +, withPylint ? true +, withRope ? true +, withYapf ? true }: buildPythonPackage rec { @@ -37,21 +46,20 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - autopep8 - flake8 jedi - mccabe pluggy - pycodestyle - pydocstyle - pyflakes - pylint python-lsp-jsonrpc - rope setuptools ujson - yapf - ]; + ] ++ lib.optional withAutopep8 autopep8 + ++ lib.optional withFlake8 flake8 + ++ lib.optional withMccabe mccabe + ++ lib.optional withPycodestyle pycodestyle + ++ lib.optional withPydocstyle pydocstyle + ++ lib.optional withPyflakes pyflakes + ++ lib.optional withPylint pylint + ++ lib.optional withRope rope + ++ lib.optional withYapf yapf; checkInputs = [ flaky @@ -62,6 +70,19 @@ buildPythonPackage rec { pytestCheckHook ]; + disabledTests = lib.optional (!withPycodestyle) "test_workspace_loads_pycodestyle_config"; + + disabledTestPaths = lib.optional (!withAutopep8) "test/plugins/test_autopep8_format.py" + ++ lib.optional (!withRope) "test/plugins/test_completion.py" + ++ lib.optional (!withFlake8) "test/plugins/test_flake8_lint.py" + ++ lib.optional (!withMccabe) "test/plugins/test_mccabe_lint.py" + ++ lib.optional (!withPycodestyle) "test/plugins/test_pycodestyle_lint.py" + ++ lib.optional (!withPydocstyle) "test/plugins/test_pydocstyle_lint.py" + ++ lib.optional (!withPyflakes) "test/plugins/test_pyflakes_lint.py" + ++ lib.optional (!withPylint) "test/plugins/test_pylint_lint.py" + ++ lib.optional (!withRope) "test/plugins/test_rope_rename.py" + ++ lib.optional (!withYapf) "test/plugins/test_yapf_format.py"; + postPatch = '' substituteInPlace setup.cfg \ --replace "--cov-report html --cov-report term --junitxml=pytest.xml" "" \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix index 7c3ca7a638..0c62eaf0d0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-hep-testdata/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "scikit-hep-testdata"; - version = "0.4.4"; + version = "0.4.6"; format = "pyproject"; # fetch from github as we want the data files @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "scikit-hep"; repo = pname; rev = "v${version}"; - sha256 = "1kd1nl62bydb2rk47ymh30l33jbaji3mb9zbvxlvxladrbqnxagp"; + sha256 = "16y84nrs8zn0vnarrniqjwq1sp6yrs0mx7ma0rdvzjafasiak9vm"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stumpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stumpy/default.nix index 3be5ffad1c..a72ca40c21 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stumpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stumpy/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "stumpy"; - version = "1.8.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "TDAmeritrade"; repo = "stumpy"; rev = "v${version}"; - sha256 = "0s7pamn39ymm1lp9z28isbdrd6ix98y9i4lfdk3ii95wvd3y50my"; + sha256 = "0x5kac8fqsi3fkfwjdn0d7anslprxaz6cizky9cyj0rpbp0b0yc3"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix index 4918e69922..7f6ef31d31 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix @@ -5,15 +5,17 @@ , typing-extensions , requests , yarl +, pythonOlder }: buildPythonPackage rec { pname = "transmission-rpc"; - version = "3.2.6"; + version = "3.2.7"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1k4yyrbdqxp43zsmcg37a99x4s2kwsm7yyajf810y2wx61nq49d1"; + sha256 = "36c022fddb45084c0d9f63db34abf79b66a0f2bab6484f4ac32eb2744a06fa15"; }; propagatedBuildInputs = [ @@ -25,11 +27,12 @@ buildPythonPackage rec { # no tests doCheck = false; + pythonImportsCheck = [ "transmission_rpc" ]; meta = with lib; { description = "Python module that implements the Transmission bittorent client RPC protocol"; - homepage = "https://pypi.python.org/project/transmission-rpc/"; + homepage = "https://github.com/Trim21/transmission-rpc"; license = licenses.mit; maintainers = with maintainers; [ eyjhb ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tubes/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tubes/default.nix new file mode 100644 index 0000000000..0dbfe22065 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tubes/default.nix @@ -0,0 +1,29 @@ +{ lib, buildPythonPackage, fetchPypi, python +, characteristic, six, twisted +}: + +buildPythonPackage rec { + pname = "tubes"; + version = "0.2.0"; + + src = fetchPypi { + pname = "Tubes"; + inherit version; + sha256 = "0sg1gg2002h1xsgxigznr1zk1skwmhss72dzk6iysb9k9kdgymcd"; + }; + + propagatedBuildInputs = [ characteristic six twisted ]; + + checkPhase = '' + ${python.interpreter} -m twisted.trial -j $NIX_BUILD_CORES tubes + ''; + + pythonImportsCheck = [ "tubes" ]; + + meta = with lib; { + description = "a data-processing and flow-control engine for event-driven programs"; + homepage = "https://github.com/twisted/tubes"; + license = licenses.mit; + maintainers = with maintainers; [ exarkun ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix index 421565725b..b09ccebde1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twisted/default.nix @@ -13,18 +13,19 @@ , service-identity , setuptools , idna +, typing-extensions }: buildPythonPackage rec { pname = "Twisted"; - version = "20.3.0"; + version = "21.7.0"; src = fetchPypi { inherit pname version; - extension = "tar.bz2"; - sha256 = "040yzha6cyshnn6ljgk2birgh6mh2cnra48xp5ina5vfsnsmab6p"; + extension = "tar.gz"; + sha256 = "01lh225d7lfnmfx4f4kxwl3963gjc9yg8jfkn1w769v34ia55mic"; }; - propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools ]; + propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools typing-extensions ]; passthru.extras.tls = [ pyopenssl service-identity idna ]; @@ -32,7 +33,7 @@ buildPythonPackage rec { # twisted.python.runtime.platform.supportsINotify() == False patchPhase = lib.optionalString stdenv.isLinux '' substituteInPlace src/twisted/python/_inotify.py --replace \ - "ctypes.util.find_library('c')" "'${stdenv.glibc.out}/lib/libc.so.6'" + "ctypes.util.find_library(\"c\")" "'${stdenv.glibc.out}/lib/libc.so.6'" ''; # Generate Twisted's plug-in cache. Twisted users must do it as well. See diff --git a/third_party/nixpkgs/pkgs/development/python-modules/txtorcon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/txtorcon/default.nix index 01a7cd3d87..23fa4735ef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/txtorcon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/txtorcon/default.nix @@ -1,10 +1,10 @@ -{lib, buildPythonPackage, fetchPypi, isPy3k, incremental, ipaddress, twisted +{ lib, python, buildPythonPackage, pythonOlder, fetchPypi, isPy3k, incremental, ipaddress, twisted , automat, zope_interface, idna, pyopenssl, service-identity, pytest, mock, lsof , GeoIP, isPy27}: buildPythonPackage rec { pname = "txtorcon"; - version = "20.0.0"; + version = "21.1.0"; checkInputs = [ pytest mock lsof GeoIP ]; propagatedBuildInputs = [ @@ -15,24 +15,21 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0yipb41w2icbj50d3z1j92d8w6xhbqd1rnmd31vzb5k3g20x0b0j"; + sha256 = "aebf0b9ec6c69a029f6b61fd534e785692e28fdcd2fd003ce3cc132b9393b7d6"; }; - # zope.interface issue - doCheck = isPy3k; - # Skip a failing test until fixed upstream: - # https://github.com/meejah/txtorcon/issues/250 + # Based on what txtorcon tox.ini will automatically test, allow back as far + # as Python 3.5. + disabled = pythonOlder "3.5"; + checkPhase = '' - pytest --ignore=test/test_util.py . + ${python.interpreter} -m twisted.trial -j $NIX_BUILD_CORES ./test ''; meta = { description = "Twisted-based Tor controller client, with state-tracking and configuration abstractions"; homepage = "https://github.com/meejah/txtorcon"; - maintainers = with lib.maintainers; [ jluttine ]; - # Currently broken on Python 2.7. See - # https://github.com/NixOS/nixpkgs/issues/71826 - broken = isPy27; + maintainers = with lib.maintainers; [ jluttine exarkun ]; license = lib.licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yamale/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yamale/default.nix index 5d29264413..f590e8d896 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yamale/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yamale/default.nix @@ -1,8 +1,8 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy3k -, pytest +, pythonOlder +, pytestCheckHook , pyyaml , ruamel_yaml }: @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "yamale"; version = "3.0.8"; - disabled = !isPy3k; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "23andMe"; @@ -26,8 +26,9 @@ buildPythonPackage rec { ]; checkInputs = [ - pytest + pytestCheckHook ]; + pythonImportsCheck = [ "yamale" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index ff5799df4a..ee40f1b8cf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -1,16 +1,16 @@ { lib, buildGoPackage, fetchFromGitLab, fetchurl }: let - version = "14.1.0"; + version = "14.2.0"; # 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}/binaries/gitlab-runner-helper/gitlab-runner-helper.x86_64"; - sha256 = "09p0biig07plf9qiwpsdllh6midi8kzpzk2s71rmms491g4634k2"; + sha256 = "1a5prg5yxs29zv8321cfqn1j638yihj7z7pniyd5aycgz5zra8lb"; }; docker_arm = fetchurl { url = "https://gitlab-runner-downloads.s3.amazonaws.com/v${version}/binaries/gitlab-runner-helper/gitlab-runner-helper.arm"; - sha256 = "0z5q5y9lsznwglpg7sd5af51v9640m85v4x4dcj5j37w24bi4wq0"; + sha256 = "0knw2r1lxri922283653vq9wkp1w85p0avhyajrik7c1wvi0flx6"; }; in buildGoPackage rec { @@ -30,7 +30,7 @@ buildGoPackage rec { owner = "gitlab-org"; repo = "gitlab-runner"; rev = "v${version}"; - sha256 = "1v2yxs92awwn4m6hq6wc53whfmk6fr4l6j87amcbdzcm4ikzxcvk"; + sha256 = "0b444nf9ipslcqim54y4m4flfy3dg38vcvcbzic1p76hph8p7s93"; }; patches = [ ./fix-shell-path.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix index cd9779c45e..6661dfce8f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "0.6.3"; + version = "0.6.4"; disabled = python3.pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-rGtaxa75cFv7LjRI5yuTgKW7F2t8llejcrnjKlUdyEY="; + sha256 = "sha256-etnHr0epu7L/qIYNnJ2NOEL1ZmE/U62KpXSsiWsJJn0="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix index 23bd3dd326..3b57693a28 100644 --- a/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix +++ b/third_party/nixpkgs/pkgs/development/tools/haskell/haskell-language-server/withWrapper.nix @@ -1,4 +1,4 @@ -{ lib, supportedGhcVersions ? [ "884" "8104" ], stdenv, haskellPackages +{ lib, supportedGhcVersions ? [ "884" "8106" ], stdenv, haskellPackages , haskell }: # # The recommended way to override this package is diff --git a/third_party/nixpkgs/pkgs/development/tools/mdk/default.nix b/third_party/nixpkgs/pkgs/development/tools/mdk/default.nix index df55c44f56..9c92764fda 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mdk/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { pname = "gnu-mdk"; version = "1.3.0"; src = fetchurl { - url = "mirror://ftp.gnu.org/gnu/mdk/v${version}/mdk-${version}.tar.gz"; + url = "mirror://gnu/gnu/mdk/v${version}/mdk-${version}.tar.gz"; sha256 = "0bhk3c82kyp8167h71vdpbcr852h5blpnwggcswqqwvvykbms7lb"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/grpc-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/grpc-tools/default.nix index 3e06f10cbf..96bdce6d0e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/grpc-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/grpc-tools/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "grpc-tools"; - version = "1.10.0"; + version = "1.11.2"; src = fetchFromGitHub { owner = "grpc"; repo = "grpc-node"; - rev = "3a094f01711942f79abd8a536c45a91b574d626f"; # version 1.10.0 was not tagged - sha256 = "1a7l91kxc3g7mqfqvhc3nb7zy0n21ifs5ck0qqg09qh3f44q04xm"; + rev = "grpc-tools@${version}"; + sha256 = "00432y19pjcimwachjcqpzra21vzmlqchhhlqxnk98bfh25kxdcb"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix index 24e2e0fea6..075698ac43 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "reviewdog"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "18fk4xzl6ys3azyw9ap14zgf3av5fdsrdn4mxx9calimvzbl4nfp"; + sha256 = "sha256-PneUN59ddYvhVIXqZeDCh0tWADkRTU9Dj0HNf0V8s3g="; }; - vendorSha256 = "1qcp8v426500cpfrchazsh5rw4nr0c31vmrhbfgb9js4vxrn8acr"; + vendorSha256 = "sha256-NI5pzKfUTjXqDukeQ1wFN/D0TBeXfDPGL69oEL7reCE="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix index cc5f6f72a4..1d33f5929b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terracognita"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "cycloidio"; repo = pname; rev = "v${version}"; - sha256 = "119rbjg3lsm73mdw6ymvslyj4y4ghj3a3dvxnvkrm55v9g0s03l9"; + sha256 = "sha256-n+aCNKGujvmXSFmLo2h1d29NFgdk/G+ehGwMHCJQoU8="; }; - vendorSha256 = "1fvp53d694a4aj8l4hj7q2lvyadn9y9c52q4bzl6yrfjq6708y8d"; + vendorSha256 = "sha256-i6AkLAXGOXe3jmAKKQN6aX/DvovSS9CYFYO28bYIdUw="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/tf2pulumi/default.nix b/third_party/nixpkgs/pkgs/development/tools/tf2pulumi/default.nix index 9dc4091377..8a1a03c163 100644 --- a/third_party/nixpkgs/pkgs/development/tools/tf2pulumi/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/tf2pulumi/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tf2pulumi"; - version = "0.10.0"; + version = "0.11.1"; src = fetchFromGitHub { owner = "pulumi"; repo = "tf2pulumi"; rev = "v${version}"; - sha256 = "199c4hd236mfz9c44rpzpbr3w3fjj8pbw656jd9k3v2igzw942c7"; + sha256 = "sha256-4sEsWMkGRpB3gMGUOPh7n/nNwEp+ErKQK0qcT5ImaZ4="; }; - vendorSha256 = "1cwyag67q0361szfjv1cyi51cg1bbmkpy34y33hn53aa55pkm1fw"; + vendorSha256 = "sha256-wsgNrDnFXbpanEULEjf6OxOeMYmWzjE7vpVUB/UFNp8="; buildFlagsArray = '' -ldflags=-s -w -X=github.com/pulumi/tf2pulumi/version.Version=${src.rev} diff --git a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix index 0822e1ee63..cba0227fd1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yarn2nix-moretea/yarn2nix/default.nix @@ -4,7 +4,7 @@ }: let - inherit (pkgs) stdenv lib fetchurl linkFarm callPackage git rsync makeWrapper; + inherit (pkgs) stdenv lib fetchurl linkFarm callPackage git rsync makeWrapper runCommandLocal; compose = f: g: x: f (g x); id = x: x; @@ -414,21 +414,16 @@ in rec { ''; }; - fixup_yarn_lock = stdenv.mkDerivation { - name = "fixup_yarn_lock"; + fixup_yarn_lock = runCommandLocal "fixup_yarn_lock" + { + buildInputs = [ nodejs ]; + } '' + mkdir -p $out/lib + mkdir -p $out/bin - buildInputs = [ nodejs ]; + cp ${./lib/urlToName.js} $out/lib/urlToName.js + cp ${./internal/fixup_yarn_lock.js} $out/bin/fixup_yarn_lock - phases = [ "installPhase" ]; - - installPhase = '' - mkdir -p $out/lib - mkdir -p $out/bin - - cp ${./lib/urlToName.js} $out/lib/urlToName.js - cp ${./internal/fixup_yarn_lock.js} $out/bin/fixup_yarn_lock - - patchShebangs $out - ''; - }; + patchShebangs $out + ''; } diff --git a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix index 0c758d934a..9a03d48e79 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yq-go/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "yq-go"; - version = "4.11.2"; + version = "4.12.0"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-IzsI0jS+chm/xOdL1O11qxQTstKcUeZ9YxL7RtKHBZw="; + sha256 = "sha256-AyI3RwWuHH760jUCCWhlBUkYYQ553QOmjFkdnvqKBtk="; }; - vendorSha256 = "sha256-X162NQ+NgOUbwEA6xdnuy0u18/GQLhR3zzi+TVgzMIc="; + vendorSha256 = "sha256-u7elWOW/tz1ISM/KC1njkZmPi8AEEssZ5QtxK/+1/1I="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix index e0aa5fb7bd..113f0cf95c 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "16.6.2"; - sha256 = "1svrkm2zq8dyvw2l7gvgm75x2fqarkbpc33970521r3iz6hwp547"; + version = "16.7.0"; + sha256 = "0drd7zyadjrhng9k0mspz456j3pmr7kli5dd0kx8grbqsgxzv1gs"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; } diff --git a/third_party/nixpkgs/pkgs/games/banner/default.nix b/third_party/nixpkgs/pkgs/games/banner/default.nix index 084dd37d32..613947c677 100644 --- a/third_party/nixpkgs/pkgs/games/banner/default.nix +++ b/third_party/nixpkgs/pkgs/games/banner/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; meta = with lib; { - homepage = "http://software.cedar-solutions.com/utilities.html"; + homepage = "https://software.cedar-solutions.com/utilities.html"; description = "Print large banners to ASCII terminals"; license = licenses.gpl2Only; diff --git a/third_party/nixpkgs/pkgs/games/bitsnbots/default.nix b/third_party/nixpkgs/pkgs/games/bitsnbots/default.nix deleted file mode 100644 index e5e718e3ca..0000000000 --- a/third_party/nixpkgs/pkgs/games/bitsnbots/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ lib, stdenv, fetchurl, SDL, lua, libGLU, libGL }: - -stdenv.mkDerivation rec { - pname = "bitsnbots"; - version = "20111230"; - - src = fetchurl { - url = "http://moikmellah.org/downloads/bitsnbots/bitsnbots.source.tgz"; - sha256 = "1iiclm6bfpp2p6d692hpnw25xyr48ki1xkcxa7fvh5b7m1519gsp"; - }; - - patchPhase = '' - sed -i '/^INCLUDE/d' Makefile.linux - ''; - - makefile = "Makefile.linux"; - - NIX_CFLAGS_COMPILE = "-I${SDL.dev}/include/SDL"; - - NIX_LDFLAGS = "-lGL"; - - installPhase = '' - mkdir -p $out/share/${pname}-${version} - cp -R bitsnbots resource scripts README $out/share/${pname}-${version} - mkdir -p $out/bin - ln -s $out/share/${pname}-${version}/bitsnbots $out/bin - ''; - - buildInputs = [ SDL lua libGLU libGL ]; - - meta = { - description = "Simple puzzle game with moving robots"; - homepage = "http://moikmellah.org/blog/?page_id=19"; - license = lib.licenses.gpl3Plus; - platforms = with lib.platforms; linux; - }; -} diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix index e449de9ca2..8d228890d0 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/betterlockscreen/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation rec { pname = "betterlockscreen"; - version = "4.0.1"; + version = "4.0.3"; src = fetchFromGitHub { owner = "pavanjadhaw"; repo = "betterlockscreen"; rev = "v${version}"; - sha256 = "sha256-eteuNEGc1BOlYgV7/hwe7z4zqqs/6EJzB88126U1jiU="; + sha256 = "sha256-d4uI/S7Kr8yvzc4/L0BX8+TBXb4AVNMJp4gb8uXgBwA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/deprecated.json b/third_party/nixpkgs/pkgs/misc/vim-plugins/deprecated.json index 41373adf62..e9d405d910 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/deprecated.json +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/deprecated.json @@ -3,10 +3,18 @@ "date": "2020-03-27", "new": "vim-gist" }, + "nvim-bufferline-lua": { + "date": "2021-08-22", + "new": "bufferline-nvim" + }, "nvim-lsp": { "date": "2020-08-31", "new": "nvim-lspconfig" }, + "nvim-toggleterm-lua": { + "date": "2021-08-22", + "new": "toggleterm-nvim" + }, "vim-jade": { "date": "2020-03-27", "new": "vim-pug" diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 819c4ae469..b607ff0142 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -77,12 +77,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-08-09"; + version = "2021-08-21"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "a099fe24b2e898c93c0aa4391e5a5631932684a6"; - sha256 = "0gp764xcspvwmhqhjf8f94y2wxw32ids0zfy22r1z0s2zm85088r"; + rev = "f896744feec260fb196d38bba23308080c04192c"; + sha256 = "1j30gi0arpmya26cjcd5spdb1l7p4djkvpkfvd267bs2fdyh958q"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -173,12 +173,12 @@ final: prev: asyncomplete-vim = buildVimPluginFrom2Nix { pname = "asyncomplete-vim"; - version = "2021-05-04"; + version = "2021-08-19"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "asyncomplete.vim"; - rev = "6c653c3f8f1c1cf7a34522c9555d5160f36d29ee"; - sha256 = "1zzdybfswlh66gw8a3imkwf7m6g13rlf6dqyg71c6bfmn3zlx2l0"; + rev = "73ac8e4e4525ba48e82d0f30643987b015233d4e"; + sha256 = "0gbmkxrxcwr5adzp2j7dd64dpzc775m1b9sv0si96gh9pb6119q2"; }; meta.homepage = "https://github.com/prabirshrestha/asyncomplete.vim/"; }; @@ -341,12 +341,12 @@ final: prev: bracey-vim = buildVimPluginFrom2Nix { pname = "bracey-vim"; - version = "2021-05-11"; + version = "2021-08-20"; src = fetchFromGitHub { owner = "turbio"; repo = "bracey.vim"; - rev = "457933c107db65ff7e2695e07209a9a2934544b7"; - sha256 = "1x8c8l9x4i9n2rlh3a8zha0ni85v04p32w7yciwxp7ddlwzf3lwh"; + rev = "4e1a22acc01787814819df1057d039d4ecf357eb"; + sha256 = "05cz8hx2jk3zp1h65j4pfpvdvcff65wp59j7j796ljnjaggj9kh2"; }; meta.homepage = "https://github.com/turbio/bracey.vim/"; }; @@ -387,6 +387,18 @@ final: prev: meta.homepage = "https://github.com/jlanzarotta/bufexplorer/"; }; + bufferline-nvim = buildVimPluginFrom2Nix { + pname = "bufferline-nvim"; + version = "2021-08-21"; + src = fetchFromGitHub { + owner = "akinsho"; + repo = "bufferline.nvim"; + rev = "35ac1c1e2e6f7cbf6a1ad027d8bf019a284b28d5"; + sha256 = "1sdq5yjav7ak5lkw0kiz8mwffnxva94w1xav8y8kxy8f95b78a2g"; + }; + meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; + }; + BufOnly-vim = buildVimPluginFrom2Nix { pname = "BufOnly-vim"; version = "2010-10-18"; @@ -425,24 +437,24 @@ final: prev: caw-vim = buildVimPluginFrom2Nix { pname = "caw-vim"; - version = "2021-04-15"; + version = "2021-08-21"; src = fetchFromGitHub { owner = "tyru"; repo = "caw.vim"; - rev = "42637427b1760f3f3006fafe95fb3e25fedca07b"; - sha256 = "1xyc50y7cicqwvzqyj0jm3bzqbwcy39v4mdjjx2czlmzzgv8qlqy"; + rev = "2c0cd18aa113cc255daf4366f1d01a7a25ce0110"; + sha256 = "1sa7mhqvfgyr3fsdyl9bjb7scw8ii4y9ig4n3qq77lm4k7snzp2v"; }; meta.homepage = "https://github.com/tyru/caw.vim/"; }; chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-08-19"; + version = "2021-08-22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "69544e754415ff9788e8ed55fa89ab23554b2526"; - sha256 = "1p73am7r6740k4l7vyndcd2pxdx9qpyicp8f07lcx950k4qq7yr2"; + rev = "b84f08364a3b3a6eb9795ecdab418d1e786b0be4"; + sha256 = "0jh6xbiqrnldk1l2p1jqfi34wwci7nx2pxhvcv0fi9mb7r5bzvmw"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -473,12 +485,12 @@ final: prev: ci_dark = buildVimPluginFrom2Nix { pname = "ci_dark"; - version = "2021-06-20"; + version = "2021-08-21"; src = fetchFromGitHub { owner = "yunlingz"; repo = "ci_dark"; - rev = "8ff6b42196ccb1f84b781a8ccb10bc117ad58e88"; - sha256 = "0ym3sg6vd0jwqq33dx5vfblhf0hjis9zfp0fcsn4iyiq0rf7jphz"; + rev = "a2fb69aabbe2bbbf1fd08d34c168f2348a4af493"; + sha256 = "1fd6pk0vl8il42d53rzddlbbk5r4k0gz95bk964pc81z38bmskcw"; }; meta.homepage = "https://github.com/yunlingz/ci_dark/"; }; @@ -617,12 +629,12 @@ final: prev: cmp_luasnip = buildVimPluginFrom2Nix { pname = "cmp_luasnip"; - version = "2021-08-16"; + version = "2021-08-21"; src = fetchFromGitHub { owner = "saadparwaiz1"; repo = "cmp_luasnip"; - rev = "1852a9e9e3a0e0ba0363e3be6c87f46982fba549"; - sha256 = "1ji3ys0k0sw23yh4yk3pgb2ab895jfsjnsjrpy0idvmxclk20l0m"; + rev = "fc033ce441b29f1755fd2314125772d21e5c5127"; + sha256 = "1np6x7wybh7w1m06h03sczv35a7ag3j37a8sk0yjcm95vysmwikd"; }; meta.homepage = "https://github.com/saadparwaiz1/cmp_luasnip/"; }; @@ -701,12 +713,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-08-18"; + version = "2021-08-22"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "e141be935e45800947f4f88ea89a2067c5d7b47f"; - sha256 = "0k2ll4vcjsj8xak4ki9h6m89rkhzdb0d70n4p34hhajf6li4lbfc"; + rev = "5f5e3135de04c9e245c1ecf53b67836c692fd06a"; + sha256 = "1cljdxgqxiyq6gg71pg9k5b8iwvj8nzg4m7llzj957lrhfpavfxg"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -822,12 +834,12 @@ final: prev: compe-tmux = buildVimPluginFrom2Nix { pname = "compe-tmux"; - version = "2021-08-09"; + version = "2021-08-19"; src = fetchFromGitHub { owner = "andersevenrud"; repo = "compe-tmux"; - rev = "e9b92b703389732a4b6100b890daacc5f2115636"; - sha256 = "0czf30dwnksp72ppsydkw2z93s39m5jcmzdrpvlg39zmalxcgbll"; + rev = "9109c5e39881cc300518888d5cd501606cbb7e0f"; + sha256 = "15n1r2dnxbbx49xv5i4aq5vkxf8rn3fviwz886hpcxvzxp39gw35"; }; meta.homepage = "https://github.com/andersevenrud/compe-tmux/"; }; @@ -1098,12 +1110,12 @@ final: prev: defx-icons = buildVimPluginFrom2Nix { pname = "defx-icons"; - version = "2021-03-07"; + version = "2021-08-21"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "defx-icons"; - rev = "563bc2d07d6c369a293ea8cb2fad8afd38bf4a02"; - sha256 = "0gp65vf7lb00k4pk9iyr2zm6q3lfz16ad70hh3ldnj2azdfz539m"; + rev = "82c3eb13bed83453d2361a72d4af7b52a74b2b93"; + sha256 = "0gvrk7spf1fkyvldcrs03d50sck9gbhn52mk0d19awxylf765ygz"; }; meta.homepage = "https://github.com/kristijanhusak/defx-icons/"; }; @@ -1158,12 +1170,12 @@ final: prev: denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2021-08-18"; + version = "2021-08-21"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "72871ae8f4e75e0271e096b4c37854dde49012d8"; - sha256 = "07n8pda0y7hn38xv94w8gzmf0qn4l8sbp0hviznknc0jmch1rxvd"; + rev = "bde582bc5c898ce849c586255a71cec5eccef194"; + sha256 = "0p090sh70n1kxdv0wl7nby596gvlkyk7p2rbgl5z4igqqdaizdh3"; }; meta.homepage = "https://github.com/Shougo/denite.nvim/"; }; @@ -1448,12 +1460,12 @@ final: prev: diffview-nvim = buildVimPluginFrom2Nix { pname = "diffview-nvim"; - version = "2021-07-25"; + version = "2021-08-20"; src = fetchFromGitHub { owner = "sindrets"; repo = "diffview.nvim"; - rev = "2411f5303192a9c8056ec174fb995773f90b52b8"; - sha256 = "03ssikggkymsxwvf5c9w7w9jv4b0ivk25p3b0i0lwvw3fpzdbsgn"; + rev = "e0ffb1cb7c5ea9e693e5ee5ee3ce1e5f78916ed6"; + sha256 = "1s3j2hdswrvw0vj6qycxyh71zg24b38anxr59ragq0hjm05zddb1"; }; meta.homepage = "https://github.com/sindrets/diffview.nvim/"; }; @@ -1654,12 +1666,12 @@ final: prev: fcitx-vim = buildVimPluginFrom2Nix { pname = "fcitx-vim"; - version = "2021-08-15"; + version = "2021-08-20"; src = fetchFromGitHub { owner = "lilydjwg"; repo = "fcitx.vim"; - rev = "4042bbb29c50a592062563f5042951abec696702"; - sha256 = "1y5c1nan5gajrz1l0zkqx0y3a8cpam6l62yd7x19z6dzn7m1b5yb"; + rev = "3554b279a09f0edf31129ad162613e5954097fd0"; + sha256 = "1bhjylsw6b44nhmsiy0xvligrdnh9gnz27cwriqxp7lfv5pcz0ch"; }; meta.homepage = "https://github.com/lilydjwg/fcitx.vim/"; }; @@ -2063,12 +2075,12 @@ final: prev: glow-nvim = buildVimPluginFrom2Nix { pname = "glow-nvim"; - version = "2021-08-19"; + version = "2021-08-20"; src = fetchFromGitHub { owner = "ellisonleao"; repo = "glow.nvim"; - rev = "bee0d2db015f8499d2102367f2c60154b38ee7c2"; - sha256 = "0racy87lqhalw26m9m2ikc002j263jlnnpn77aryc0hn5rh9dhsd"; + rev = "a6ee89368525e59fd4e834ee59bd5df6327ee949"; + sha256 = "1nh06qipvyb66kzgc20c7b3fjxdibjmdazc6lkbkk2gbc42nghb7"; }; meta.homepage = "https://github.com/ellisonleao/glow.nvim/"; }; @@ -2099,12 +2111,12 @@ final: prev: goto-preview = buildVimPluginFrom2Nix { pname = "goto-preview"; - version = "2021-06-20"; + version = "2021-08-20"; src = fetchFromGitHub { owner = "rmagatti"; repo = "goto-preview"; - rev = "39aa1e0334b577c59c4f7177ef36624bdd83f100"; - sha256 = "0rr22r1yp7s3hqfdqf48wlv2bqw9j5izwgm3np7x1ygp85xizcbg"; + rev = "017efbcb377a6c0e16c4902328cf34d7257cbd1c"; + sha256 = "11n09m7agy9b5zx0cralam7gsr2bfwpf4564z2iwxgia3186bs8g"; }; meta.homepage = "https://github.com/rmagatti/goto-preview/"; }; @@ -2135,12 +2147,12 @@ final: prev: gruvbox-community = buildVimPluginFrom2Nix { pname = "gruvbox-community"; - version = "2021-08-18"; + version = "2021-08-20"; src = fetchFromGitHub { owner = "gruvbox-community"; repo = "gruvbox"; - rev = "f29a88b5e16c8a6c8e774ba06854b2832bef50b1"; - sha256 = "1p6103h8ac60c7lzlnn71kp6xrpzkmnh4nrw69s3p91mfbp73hxb"; + rev = "dba3e04ab97bf80d41c0d30f34ecde8ca2762c47"; + sha256 = "1kryx30fzj33lm969jgx3715s3cz5cp7hlxjs5d29a11gqbmpi0n"; }; meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; @@ -2387,12 +2399,12 @@ final: prev: indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline-nvim"; - version = "2021-08-05"; + version = "2021-08-21"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "134a1ace3274e14cf3f2c9b845f6a62c58d2f2de"; - sha256 = "1n3cbfvm4jdiwhv2hc6379xqjpjpdfzvz9zs2zpb1pj9qjdznqcc"; + rev = "f912393a296194e7201523a2a0b0bcd6a009de90"; + sha256 = "093bxpv3l2q25wr6xvdsnr4krlwxds0rq3168nnfwf0hy8645c7c"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2796,12 +2808,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed-nvim"; - version = "2021-08-17"; + version = "2021-08-21"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "08f5bcfee90e2fe91e9c4cf2538ac17bc27c90af"; - sha256 = "0impdwlrd5jbcbmyk32r0dy0jwq3481l3ajryvbj7cqhjibm71nv"; + rev = "177ef542f6f26147f16be7b07c1e6fcfa66bf128"; + sha256 = "0c6bwdgi2d43jar05zcfarsas3r7y9v7igr3ldsgd7491wf8hjhg"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -2892,12 +2904,12 @@ final: prev: lsp_signature-nvim = buildVimPluginFrom2Nix { pname = "lsp_signature-nvim"; - version = "2021-08-18"; + version = "2021-08-20"; src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "42b2c3b0767cf08616f0428eb57c254748a80d83"; - sha256 = "1p3dp9csj43bjgjfmv1aa3497ph2nmfdylinwqx15kgpgfhk2qxg"; + rev = "ea9525f20297220ddfb6c6eb0423dad80301980e"; + sha256 = "1hqrmn6ggl6xadx5klb8z5jh3szwd7p8xyb7pclxds628l9rr9sp"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -2952,12 +2964,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-08-19"; + version = "2021-08-22"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "e3d057b2cc0d6ff7250ba1bb108d17e40b2904e8"; - sha256 = "02k612ib8974ra0221ldf8vrzk3na64g4w1z60mzy3i53qdjayh9"; + rev = "6d398e3443933a68607215538e614662d2ffa5c8"; + sha256 = "0ll54nqa3lxzhxyjsya8y4qiyyicfsp5yz25mjdgqmvvf4i39jxz"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3324,12 +3336,12 @@ final: prev: neco-vim = buildVimPluginFrom2Nix { pname = "neco-vim"; - version = "2021-08-19"; + version = "2021-08-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "neco-vim"; - rev = "344b753261fdd298c1b47ee59ac8268bd338e00f"; - sha256 = "0nmrjsylj46fdz96jidfg74y8yn55rkw9w41332zswm9h5mwp4av"; + rev = "5acaca6d173e1566b207c5477f06e7e49efe1a76"; + sha256 = "040jliyl8zs617kdw7xa4kjxyxakdz16gk5vp1j0zmaynwlfwf8n"; }; meta.homepage = "https://github.com/Shougo/neco-vim/"; }; @@ -3372,12 +3384,12 @@ final: prev: neogit = buildVimPluginFrom2Nix { pname = "neogit"; - version = "2021-08-17"; + version = "2021-08-21"; src = fetchFromGitHub { owner = "TimUntersberger"; repo = "neogit"; - rev = "5cdf492b9844dcac4de7c3001bc1871decc6251f"; - sha256 = "0mzp2hifll0jkw1p7ycxlbysiqs2zrlka4x5s92xp050q33zj1il"; + rev = "06000011b9a8b1f2f843489c32afdb487e163c14"; + sha256 = "1qy7w190z3zvmb04pybcgxkc75hkivkj8msksbw1xlyhj7n9vz9h"; }; meta.homepage = "https://github.com/TimUntersberger/neogit/"; }; @@ -3456,12 +3468,12 @@ final: prev: neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2021-08-06"; + version = "2021-08-20"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "f490d5db67f91c41f86a9d796b42af9a6a3b0d01"; - sha256 = "1n0fd71hjyrw22p4a2cd3l153p1bnjw15y9vpdzncchy7r6wxdcs"; + rev = "c1634915a8f798cded2bef39c6f24a9d988aca10"; + sha256 = "02cvrxfy6n7z5xl5ijw2fkz81j7lm18agyx6qs11a5l5f515h4a2"; }; meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; @@ -3648,12 +3660,12 @@ final: prev: nord-nvim = buildVimPluginFrom2Nix { pname = "nord-nvim"; - version = "2021-08-16"; + version = "2021-08-20"; src = fetchFromGitHub { owner = "shaunsingh"; repo = "nord.nvim"; - rev = "4d1bef41e01fbdcb31a47d722e107b29a1f9f428"; - sha256 = "1v9d7dsmchmkzqqf92rzhscv4n0n75jm0hqkq49m11d62dc5aic9"; + rev = "d2b6f9d4688a381f26a652df7e1b6a49e9f33542"; + sha256 = "03jjx1mblqwdrz7g280wvdyq9sbfj6spf8k61gcq1gy7bb4qjfp7"; }; meta.homepage = "https://github.com/shaunsingh/nord.nvim/"; }; @@ -3778,18 +3790,6 @@ final: prev: meta.homepage = "https://github.com/ojroques/nvim-bufdel/"; }; - nvim-bufferline-lua = buildVimPluginFrom2Nix { - pname = "nvim-bufferline-lua"; - version = "2021-08-11"; - src = fetchFromGitHub { - owner = "akinsho"; - repo = "nvim-bufferline.lua"; - rev = "067ec55a10ef8a58f8c7b45621daca759ab54437"; - sha256 = "1lm6jwsngqnhfh43r3s1qf2qynfd92d7pyp7a2myxcdzhcdhn08f"; - }; - meta.homepage = "https://github.com/akinsho/nvim-bufferline.lua/"; - }; - nvim-cm-racer = buildVimPluginFrom2Nix { pname = "nvim-cm-racer"; version = "2017-07-27"; @@ -3804,12 +3804,12 @@ final: prev: nvim-cmp = buildVimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2021-08-17"; + version = "2021-08-21"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "f12fd73f11c979384ae82d2b1cd9332b5cf5f661"; - sha256 = "1qpk4a7r89431pad4afqxyxx1csi0h7wjgwh07fp4rfacr6k005m"; + rev = "f3a54918944d2c8778e6f13e2fc3ec4251863afb"; + sha256 = "0zjmvpxx46dy1q7jg1a7r51nqc7wzqa8vjzd8ff8nphs0j5zlvfn"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -3910,14 +3910,26 @@ final: prev: meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; + nvim-gps = buildVimPluginFrom2Nix { + pname = "nvim-gps"; + version = "2021-08-22"; + src = fetchFromGitHub { + owner = "smiteshp"; + repo = "nvim-gps"; + rev = "f365bc331c1fd752429427cdfed4aa142e9fc74f"; + sha256 = "1phzrw37y9gzcimy5r3phy2x53c9b2q5l3v5ipcx1k4q6pfkh026"; + }; + meta.homepage = "https://github.com/smiteshp/nvim-gps/"; + }; + nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-08-05"; + version = "2021-08-21"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "929cb313e90589576348c3a2e9a18bac8a56999c"; - sha256 = "0j48zy517px40w119xad97zja0p7fspapnd1n70w3lq9ank0l7a1"; + rev = "dd827f091554065736105c72e1256d1fc8f4f445"; + sha256 = "11jndab13dhd6pqzbd385awzhmxvzz68aza09qmfqkjvmcs1gy8c"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -3960,24 +3972,24 @@ final: prev: nvim-lightbulb = buildVimPluginFrom2Nix { pname = "nvim-lightbulb"; - version = "2021-06-05"; + version = "2021-08-21"; src = fetchFromGitHub { owner = "kosayoda"; repo = "nvim-lightbulb"; - rev = "388cc8caaf3e10836810aabbb9283a27dd8584cd"; - sha256 = "0a7izbvpwn0sx9gvpczvl57fy9rm7jaibc4m44asjz501m04lbra"; + rev = "e94e434f4549c9c331f875931b3e804fb1d2bc16"; + sha256 = "0043vzjp4p48xw03xn9g5l0daplg3rfijqxdq00kp0s6np3c312j"; }; meta.homepage = "https://github.com/kosayoda/nvim-lightbulb/"; }; nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-08-18"; + version = "2021-08-20"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "e2601bb4b8d125e3f96274fe57136004dce4c587"; - sha256 = "0yvz273qy2qf82f5yfkzh8zncwkg0hwkjy7b47f3bf65g5nwibzn"; + rev = "9adbacf29835bf521a99a8d3f0b6f2157b1b9166"; + sha256 = "0k4b6qsrvlgxr600x9wgkfdraqczx49zqyqfz88xf6pjbx0zyach"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4054,26 +4066,14 @@ final: prev: meta.homepage = "https://github.com/norcalli/nvim-terminal.lua/"; }; - nvim-toggleterm-lua = buildVimPluginFrom2Nix { - pname = "nvim-toggleterm-lua"; - version = "2021-08-15"; - src = fetchFromGitHub { - owner = "akinsho"; - repo = "nvim-toggleterm.lua"; - rev = "775012662eb2070e44b294d43938fa2625a9c836"; - sha256 = "0q39ddq6yb1iscgp1mdgdyhz0cmb794ycbfd5ph3xp8ffly4z7hk"; - }; - meta.homepage = "https://github.com/akinsho/nvim-toggleterm.lua/"; - }; - nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-08-14"; + version = "2021-08-21"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "d74af818c085e1ffdcf7e9afc101de8cbe3ad883"; - sha256 = "1524p6zd3q2bmrik7xbqwlin4pdv566vlr54mxhxpb5lx70yn43w"; + rev = "c75e4a63b73f223a80835ab3b75f602dc3e60e66"; + sha256 = "0n3h9pv029nplr2d102p8gj7ygx69iha9hgpzy7kfn4pwsaz7vzq"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; @@ -4681,12 +4681,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring-nvim"; - version = "2021-08-18"; + version = "2021-08-21"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "ab4c6b0fb37bcadbc55ae02c9638bbc424dc8842"; - sha256 = "0j54rv7gq31m8g0jwb6smvipgcd9pizry39vqx97wfbikcsw3zab"; + rev = "df03980e5fcdbcf1d126c63713be2781e3c0ba42"; + sha256 = "0z93igf1adnm183zamk3y10lbqg6diy42grg1k853a2xrrmjbhfk"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -4741,12 +4741,12 @@ final: prev: rnvimr = buildVimPluginFrom2Nix { pname = "rnvimr"; - version = "2021-08-04"; + version = "2021-08-22"; src = fetchFromGitHub { owner = "kevinhwang91"; repo = "rnvimr"; - rev = "75eb226fe32ef18add0fc70715cbcc7550ecb698"; - sha256 = "12skmq1zlpkk8y05503p01rxfdkqdl3mdhf8bbgq3f2ky7d7iarj"; + rev = "9f75ac3734bde4cd2cc1726b6936650ac4e144d6"; + sha256 = "03jgq6rd3rxs6hn2ksh8nbkbv7lpabcb7372xifq5vhgqqfj447j"; }; meta.homepage = "https://github.com/kevinhwang91/rnvimr/"; }; @@ -5139,12 +5139,12 @@ final: prev: sql-nvim = buildVimPluginFrom2Nix { pname = "sql-nvim"; - version = "2021-08-19"; + version = "2021-08-21"; src = fetchFromGitHub { owner = "tami5"; repo = "sql.nvim"; - rev = "2feef57bef147cf502b4491e3fc6c58a05f3096e"; - sha256 = "0zyjbhhn33nbz7cf9vhr94gn38pvr5hd9d31sirdwqy49shvwlc1"; + rev = "eb1f0512c3b781740090877b39bc9332c01edb46"; + sha256 = "1dykwqv01fcf8k2q8fz7z4zgc9wh4v551b9mwm44n2lqzg35swzg"; }; meta.homepage = "https://github.com/tami5/sql.nvim/"; }; @@ -5247,12 +5247,12 @@ final: prev: symbols-outline-nvim = buildVimPluginFrom2Nix { pname = "symbols-outline-nvim"; - version = "2021-08-19"; + version = "2021-08-21"; src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "2047f401e7a9f0024cc48f7bbe8cc73bc199f883"; - sha256 = "0d5bcg4l4vfsr0pydcslj574ib6qxqsnhgi6k61p4wa4v1c6aif2"; + rev = "40b7d5cbaa51c031061827c48e6a05748db7e91d"; + sha256 = "1mk4g1kgg2as3kk010wd9x2f4v60an68mqflpk97ng6a52laj5nw"; }; meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; @@ -5332,12 +5332,12 @@ final: prev: tagalong-vim = buildVimPluginFrom2Nix { pname = "tagalong-vim"; - version = "2021-06-28"; + version = "2021-08-19"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "tagalong.vim"; - rev = "e04ed6f46da5b55450a52e7de1025f1486d55839"; - sha256 = "0bcmli82a58zvyqpacz5zyz9k9q8x39rcci095lz6ab6vnwhbl47"; + rev = "6c8c0f4903daed1c11087a014a8bc23ac4334850"; + sha256 = "1vcymd05pacs3ywf4bq20vhn46a3d4hpl2lwcbc5z1cv18iwd3ip"; }; meta.homepage = "https://github.com/AndrewRadev/tagalong.vim/"; }; @@ -5416,12 +5416,12 @@ final: prev: telescope-frecency-nvim = buildVimPluginFrom2Nix { pname = "telescope-frecency-nvim"; - version = "2021-08-05"; + version = "2021-08-22"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope-frecency.nvim"; - rev = "459041fb42d81c65444b147d25b1e28b0c8ac8f9"; - sha256 = "0n4bv22azqgvqk00dcnxzafpx1mkdfm6ds3w6pyn0mflkfninfb7"; + rev = "f8cf92a6372054a912e19e8b192c9e1c5261c831"; + sha256 = "1mgihx3kqj70blyqv2yjhn4kw8374f13c3qxxq3mhpv9vcbwb6id"; }; meta.homepage = "https://github.com/nvim-telescope/telescope-frecency.nvim/"; }; @@ -5501,12 +5501,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-08-19"; + version = "2021-08-21"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "d6d28dbe324de9826a579155076873888169ba0f"; - sha256 = "0gxp54b5p1hbaigm7xq0c7dcnq1dbncp80fl8nrmwax34r6rv4d1"; + rev = "8381a215e091dc9e1f6ad9ceaeadf35ef3cfed8f"; + sha256 = "0cn1ynvva8nzjyrp285ficfa74wky0gikii2hysdi0g4ndnh6ypa"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5620,6 +5620,18 @@ final: prev: meta.homepage = "https://github.com/freitass/todo.txt-vim/"; }; + toggleterm-nvim = buildVimPluginFrom2Nix { + pname = "toggleterm-nvim"; + version = "2021-08-22"; + src = fetchFromGitHub { + owner = "akinsho"; + repo = "toggleterm.nvim"; + rev = "5a4429d33cc8f286a0ad30b89084ec5284d6a652"; + sha256 = "0rflwn9bbnffly5i66n3hxrf9cgbpqphqc2p6bjpxlyydda1vdx3"; + }; + meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; + }; + tokyonight-nvim = buildVimPluginFrom2Nix { pname = "tokyonight-nvim"; version = "2021-08-06"; @@ -6378,12 +6390,12 @@ final: prev: vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-08-16"; + version = "2021-08-21"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "4a7e9bad08ccfebcf294ea0091d74ee64d98d236"; - sha256 = "0b5ldixvf2f3bk7ivzb3s7zb8s4ir7gayli1i6bdq753flkjq0bx"; + rev = "299a5d23f6c8d8f51bbd4aeb01f8c1c27d4a0604"; + sha256 = "090hm59p6n44740irfkxv5r40iyr4mady30zqcswbx4r1xhd8vzc"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -7158,12 +7170,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-08-19"; + version = "2021-08-22"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "81f293852ec195727a657c7d247af5cc3f705c45"; - sha256 = "0a5411vcmgssb9j7mpr43zpi2hjnp4md8fvjxjkhx6in69pvyh91"; + rev = "5d1a276b455dd9a32375a5ac84050adff67062e3"; + sha256 = "1bm3fwbg9nmdxpvaqrs31g88ij5b5wxip2s4j9v1i0c0w5jplxjn"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -7230,12 +7242,12 @@ final: prev: vim-gitbranch = buildVimPluginFrom2Nix { pname = "vim-gitbranch"; - version = "2017-05-27"; + version = "2021-08-20"; src = fetchFromGitHub { owner = "itchyny"; repo = "vim-gitbranch"; - rev = "8118dc1cdd387bd609852be4bf350360ce881193"; - sha256 = "01gvd96mnzfc5s0951zzq122birg5svnximkldgb9kv5bmsnmh3j"; + rev = "1a8ba866f3eaf0194783b9f8573339d6ede8f1ed"; + sha256 = "0nd6wwc0xd5b9djlcf18phmzjaqc3l7imarh1cil9644n1ls0l00"; }; meta.homepage = "https://github.com/itchyny/vim-gitbranch/"; }; @@ -7326,12 +7338,12 @@ final: prev: vim-grepper = buildVimPluginFrom2Nix { pname = "vim-grepper"; - version = "2021-05-10"; + version = "2021-08-20"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-grepper"; - rev = "b80004c050501122d58f82712b21d0b7c8dfc019"; - sha256 = "049552dvsk14hx4h9rp9g65xkf13n42z304lzxca69j5q6k1qrdl"; + rev = "1c3c4c616df2fa118289df17bfc3961fe0a2993b"; + sha256 = "0kdrz7b5kdl2cs05anx3pq4yb746x773bfqlbkrg56h6jrgpx1wx"; }; meta.homepage = "https://github.com/mhinz/vim-grepper/"; }; @@ -7699,12 +7711,12 @@ final: prev: vim-javacomplete2 = buildVimPluginFrom2Nix { pname = "vim-javacomplete2"; - version = "2021-03-18"; + version = "2021-08-21"; src = fetchFromGitHub { owner = "artur-shaik"; repo = "vim-javacomplete2"; - rev = "b01e32ec3d005423d5e6043b18b563086a623dc8"; - sha256 = "0d9a6ynir9hgl9yp0mh0ng935llj4z9jkd9rvpddskcvq7h5590c"; + rev = "54a4b02edef78509621d180794df0c6924e48b3b"; + sha256 = "08hi6r1cspkklir9qa6x4h4a3zs404hvcwsspylysv7asnv8jncf"; }; meta.homepage = "https://github.com/artur-shaik/vim-javacomplete2/"; }; @@ -8865,12 +8877,12 @@ final: prev: vim-rails = buildVimPluginFrom2Nix { pname = "vim-rails"; - version = "2021-06-01"; + version = "2021-08-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rails"; - rev = "3b3796352a6f1a68e54e5f7ae5e0c1b9103fab0e"; - sha256 = "1f0xns0h55szamms17wi06k1ninvygsc4yw82hr29kfq94hvn57l"; + rev = "03a5c3e85411db1488cdfd1029d2a91f9327c8a2"; + sha256 = "0x72948i7ilzavf3922hl5d5vmq57f8a7zazpvlmnzs0msvvqzwr"; }; meta.homepage = "https://github.com/tpope/vim-rails/"; }; @@ -8913,12 +8925,12 @@ final: prev: vim-rhubarb = buildVimPluginFrom2Nix { pname = "vim-rhubarb"; - version = "2021-07-16"; + version = "2021-08-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-rhubarb"; - rev = "b4aad6dc43660db554bba2942026fb9965f1a45e"; - sha256 = "04ckpl3q1k4l530fhf5srbklfqdz4rfrcapwsa92n4bwskfxbnsp"; + rev = "e804fb67b75697f98f500f67ed11e891e370bd04"; + sha256 = "11cifxc6i2h00f71w28f2q5zr76198672g9ccx8ah5i7xw5a949x"; }; meta.homepage = "https://github.com/tpope/vim-rhubarb/"; }; @@ -9802,12 +9814,12 @@ final: prev: vim-vsnip-integ = buildVimPluginFrom2Nix { pname = "vim-vsnip-integ"; - version = "2020-12-31"; + version = "2021-08-21"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip-integ"; - rev = "60dfbb0dc73cfc4828e9328251a46ccbd7e9b5fe"; - sha256 = "0nv8imllzpm5zvg2n3c5mb7lc1v1fn6jmqy8vgmv2fp1050p3dy3"; + rev = "8f94cdd9ca6c3e6c328edaf22029f1bf17f3d1c5"; + sha256 = "1wh44m7jn1s7jyk0g9flf2qhkqgcl5amfi5w7dwjqkr8z495r29h"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip-integ/"; }; @@ -10114,12 +10126,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-08-03"; + version = "2021-08-20"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "57ce0992803fcf22c0557550fff45e3fe869f707"; - sha256 = "0136i5yisg6ndvg7rcsr9qqrslgzafbl006csx7s51khd5qmfgmb"; + rev = "14f34ea6d12b71a720356ce83c386f8ba393e700"; + sha256 = "1w680m5xwv6imyc4rd5mpj76w2ac6qgvfsaw33xd9wpgl3ld444j"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -10127,12 +10139,12 @@ final: prev: vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-08-19"; + version = "2021-08-22"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "5b8c24681831bd816b0e70c0b6b597c2c3945755"; - sha256 = "1f9ih0r9vqazrspd0h8jvrv3m66akd0aj9misgkh7fh3mnvmwzri"; + rev = "058f139985f4eede396d83f45a6b2e7b3924a012"; + sha256 = "1nxxw6k0y5ccsvm39h4mfrk93ply2xh5y1lihhwy17vaigwyx687"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index 7e0f2580cf..e0028c8547 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -6,8 +6,8 @@ ahmedkhalf/lsp-rooter.nvim@main airblade/vim-gitgutter airblade/vim-rooter ajmwagar/vim-deus -akinsho/nvim-bufferline.lua -akinsho/nvim-toggleterm.lua +akinsho/bufferline.nvim +akinsho/toggleterm.nvim aklt/plantuml-syntax allendang/nvim-expand-expr@main altercation/vim-colors-solarized @@ -666,6 +666,7 @@ sjl/gundo.vim sjl/splice.vim sk1418/last256 slashmili/alchemist.vim +smiteshp/nvim-gps sodapopcan/vim-twiggy solarnz/arcanist.vim sonph/onehalf diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/xattr/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/xattr/default.nix new file mode 100644 index 0000000000..1aa8b49e88 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/xattr/default.nix @@ -0,0 +1,73 @@ +{ lib +, stdenv +, fetchzip +, buildPythonPackage +, python +, ed +, unifdef +}: + +buildPythonPackage rec { + pname = "xattr"; + version = "61.60.1"; + + src = fetchzip rec { + url = "https://opensource.apple.com/tarballs/python_modules/python_modules-${version}.tar.gz"; + sha256 = "19kydl7w4vpdi7zmfd5z9vjkq24jfk2cv4j0pppw69j06czhdwwi"; + }; + + sourceRoot = "${src.name}/Modules/xattr-0.6.4"; + format = "other"; + + nativeBuildInputs = [ + ed + unifdef + ]; + + makeFlags = [ + "OBJROOT=$(PWD)" + "DSTROOT=${placeholder "out"}" + "OSL=${placeholder "doc"}/share/xattr/OpenSourceLicenses" + "OSV=${placeholder "doc"}/share/xattr/OpenSourceVersions" + ]; + + # need to use `out` instead of `bin` since buildPythonPackage ignores the latter + outputs = [ "out" "doc" "python" ]; + + # We need to patch a reference to gnutar in an included Makefile + postUnpack = '' + chmod u+w $sourceRoot/.. + ''; + + postPatch = '' + substituteInPlace ../Makefile.inc --replace gnutar tar + substituteInPlace Makefile --replace "/usr" "" + ''; + + preInstall = '' + # prevent setup.py from trying to download setuptools + sed -i xattr-*/setup.py -e '/ez_setup/d' + + # create our custom target dirs we patch in + mkdir -p "$doc/share/xattr/"OpenSource{Licenses,Versions} + mkdir -p "$python/lib/${python.libPrefix}" + ''; + + # move python package to its own output to reduce clutter + postInstall = '' + mv "$out/lib/python" "$python/${python.sitePackages}" + rmdir "$out/lib" + ''; + + makeWrapperArgs = [ + "--prefix" "PYTHONPATH" ":" "${placeholder "python"}/${python.sitePackages}" + ]; + + meta = with lib; { + description = "Display and manipulate extended attributes"; + license = [ licenses.psfl licenses.mit ]; # see $doc/share/xattr/OpenSourceLicenses + maintainers = [ maintainers.sternenseemann ]; + homepage = "https://opensource.apple.com/source/python_modules/"; + platforms = lib.platforms.darwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/cramfsswap/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/cramfsswap/default.nix index f47482c111..ee3c12d251 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/cramfsswap/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/cramfsswap/default.nix @@ -2,13 +2,18 @@ stdenv.mkDerivation rec { pname = "cramfsswap"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "mirror://debian/pool/main/c/cramfsswap/${pname}_${version}.tar.gz"; - sha256 = "0c6lbx1inkbcvvhh3y6fvfaq3w7d1zv7psgpjs5f3zjk1jysi9qd"; + url = "mirror://debian/pool/main/c/cramfsswap/${pname}_${version}.tar.xz"; + sha256 = "10mj45zx71inaa3l1d81g64f7yn1xcprvq4v4yzpdwbxqmqaikw1"; }; + # Needed for cross-compilation + postPatch = '' + substituteInPlace Makefile --replace 'strip ' '$(STRIP) ' + ''; + buildInputs = [zlib]; installPhase = '' @@ -18,7 +23,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Swap endianess of a cram filesystem (cramfs)"; homepage = "https://packages.debian.org/sid/utils/cramfsswap"; - license = licenses.gpl2; + license = licenses.gpl2Only; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix index 1355d5bc9a..3f810fd93a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware/5.1.138.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { description = "Firmware for cards supported by the b43 kernel module"; - homepage = "http://wireless.kernel.org/en/users/Drivers/b43"; + homepage = "https://wireless.wiki.kernel.org/en/users/drivers/b43"; license = lib.licenses.unfree; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix index 45019dd5a9..1116d96a63 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/b43-firmware/6.30.163.46.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Firmware for cards supported by the b43 kernel module"; - homepage = "http://wireless.kernel.org/en/users/Drivers/b43"; + homepage = "https://wireless.wiki.kernel.org/en/users/drivers/b43"; downloadPage = "http://www.lwfinger.com/b43-firmware"; license = licenses.unfree; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index c3f0aa7425..5625cb6e0e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,26 +1,26 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.243-hardened1.patch", - "sha256": "0ngz1ywkxjqyv92wirj9m6l99p4caj6n75h2mv0a6rhk9r4di6p6", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.243-hardened1/linux-hardened-4.14.243-hardened1.patch" + "name": "linux-hardened-4.14.244-hardened1.patch", + "sha256": "0cm5ylwxz2lzjx8c7z90h443sw7mjbr33cbrgfhaczvdzm6wxx0b", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.244-hardened1/linux-hardened-4.14.244-hardened1.patch" }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.202-hardened1.patch", - "sha256": "0bylyc7k5azs8335mmzrgsx42cg8l3vm4izzikc8kchs2grb1q5v", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.202-hardened1/linux-hardened-4.19.202-hardened1.patch" + "name": "linux-hardened-4.19.204-hardened1.patch", + "sha256": "08i7985aqiiyi6h42rgf4hc09di3iy5p3i7iajzyfrzxfmgkdgdz", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.204-hardened1/linux-hardened-4.19.204-hardened1.patch" }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.57-hardened1.patch", - "sha256": "0zqv77k0i4q5w4qhgiknvrh4fav1jc4a2i9cdracwqlrk8fgmiih", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.57-hardened1/linux-hardened-5.10.57-hardened1.patch" + "name": "linux-hardened-5.10.60-hardened1.patch", + "sha256": "0hnc12ypggwln4b5i1zqd9mmhdkcky24xj4jxqp23dwzp03pwfh8", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.60-hardened1/linux-hardened-5.10.60-hardened1.patch" }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.139-hardened1.patch", - "sha256": "0lznmwy8yqc8rq5pr0akxclpnwz98pgai6ib5a3d77ncfham6fnl", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.139-hardened1/linux-hardened-5.4.139-hardened1.patch" + "name": "linux-hardened-5.4.142-hardened1.patch", + "sha256": "05195sxrs99gfwbb8icg8rzvqljhf1gpyhxr8da3qg6b4rvvnf0p", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.142-hardened1/linux-hardened-5.4.142-hardened1.patch" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/update.py b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/update.py index e96ac9ca85..8ff6510792 100755 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/update.py +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/update.py @@ -226,7 +226,7 @@ for release in repo.get_releases(): else: # Fall back to the latest patch for this major kernel version, # skipping patches for kernels newer than the packaged one. - if kernel_version > packaged_kernel_version: + if '.'.join(str(x) for x in kernel_version) > '.'.join(str(x) for x in packaged_kernel_version): continue elif ( kernel_key not in releases or releases[kernel_key].version < version diff --git a/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix b/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix index a3ff060f93..33541da86b 100644 --- a/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -27,12 +27,12 @@ stdenv.mkDerivation rec { pname = "rabbitmq-server"; - version = "3.9.3"; + version = "3.9.4"; # when updating, consider bumping elixir version in all-packages.nix src = fetchurl { url = "https://github.com/rabbitmq/rabbitmq-server/releases/download/v${version}/${pname}-${version}.tar.xz"; - sha256 = "sha256-33nrS29t/a8D8Rl+d/ipRU2923QKr+EAN3rgxisCR0U="; + sha256 = "sha256-L2ftgdk7QmWl3iQR52G4SwZyI4NURybVMQ1WtcHPvHE="; }; nativeBuildInputs = [ unzip xmlto docbook_xml_dtd_45 docbook_xsl zip rsync ]; diff --git a/third_party/nixpkgs/pkgs/servers/filtron/default.nix b/third_party/nixpkgs/pkgs/servers/filtron/default.nix new file mode 100644 index 0000000000..36d64db4e2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/filtron/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "filtron"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "asciimoo"; + repo = "filtron"; + rev = "v${version}"; + sha256 = "18d3h0i2sfqbc0bjx26jm2n9f37zwp8z9z4wd17sw7nvkfa72a26"; + }; + + vendorSha256 = "05q2g591xl08h387mm6njabvki19yih63dfsafgpc9hyk5ydf2n9"; + + # The upstream test checks are obsolete/unmaintained. + doCheck = false; + + meta = with lib; { + description = "Reverse HTTP proxy to filter requests by different rules."; + homepage = "https://github.com/asciimoo/filtron"; + license = licenses.agpl3; + maintainers = [ maintainers.dasj19 ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/hasura/cli.nix b/third_party/nixpkgs/pkgs/servers/hasura/cli.nix index 4413324e15..4338f1bcae 100644 --- a/third_party/nixpkgs/pkgs/servers/hasura/cli.nix +++ b/third_party/nixpkgs/pkgs/servers/hasura/cli.nix @@ -9,7 +9,7 @@ buildGoModule rec { subPackages = [ "cmd/hasura" ]; - vendorSha256 = "sha256-Fp6o3xZ/964q8yzJJFrqWZtQ5zYNy6Wreh42YxWjNbU="; + vendorSha256 = "1pkc9bh5s2vqnpkmnm91zaihh98b3drhiv4lcpi98rhln8r52b1k"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/http/unit/default.nix b/third_party/nixpkgs/pkgs/servers/http/unit/default.nix index f3238cc4bd..d08161c76b 100644 --- a/third_party/nixpkgs/pkgs/servers/http/unit/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/unit/default.nix @@ -30,14 +30,14 @@ let php80-unit = php80.override phpConfig; in stdenv.mkDerivation rec { - version = "1.24.0"; + version = "1.25.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = pname; rev = version; - sha256 = "0214dvwz31hxjxnqk3fkqhn2xznaqdrb96m5s2k8ll8rldmk1gd6"; + sha256 = "sha256-8Xv7YTvwuI0evBO1Te4oI1IoJ0AnK8OVZoZTYtfYKfw="; }; nativeBuildInputs = [ which ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/icinga2/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/icinga2/default.nix index 44be5b97e6..7079ae4ff8 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/icinga2/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/icinga2/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "icinga2${nameSuffix}"; - version = "2.13.0"; + version = "2.13.1"; src = fetchFromGitHub { owner = "icinga"; repo = "icinga2"; rev = "v${version}"; - sha256 = "sha256-ibZruP9/8D3DJSTFkIi84ADPGjwWeyTCHv/tTEcy6ns="; + sha256 = "sha256-cGVUNO3p00bkPd4tPbipevuixHz8ptk6W8y1rl3dge8="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/servers/swego/default.nix b/third_party/nixpkgs/pkgs/servers/swego/default.nix index c71d705a00..9009abb920 100644 --- a/third_party/nixpkgs/pkgs/servers/swego/default.nix +++ b/third_party/nixpkgs/pkgs/servers/swego/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "swego"; - version = "0.94"; + version = "0.97"; src = fetchFromGitHub { owner = "nodauf"; repo = "Swego"; rev = "v${version}"; - sha256 = "sha256-PquedlfBzNSXa3l6IIHlf6Xb4M4uEb1XCKRfN229IEA="; + sha256 = "sha256-T4xkjNdOSD0kHLVfwUz1PrFokLmnbzcj/pbV36W+2ZQ="; }; - vendorSha256 = "sha256-TK1LN9EmVH95jPO6K7gtCwdnW4WOKH3K7Q0FhgNMVUQ="; + vendorSha256 = "sha256-GiYJfykcBvIoJ0zvdtT3P+iHmBgBWIeOTaniFysAPHs="; postInstall = '' mv $out/bin/src $out/bin/$pname diff --git a/third_party/nixpkgs/pkgs/shells/elvish/default.nix b/third_party/nixpkgs/pkgs/shells/elvish/default.nix index de25503e4a..6ef08992f9 100644 --- a/third_party/nixpkgs/pkgs/shells/elvish/default.nix +++ b/third_party/nixpkgs/pkgs/shells/elvish/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "elvish"; - version = "0.15.0"; + version = "0.16.1"; excludedPackages = [ "website" ]; @@ -12,10 +12,10 @@ buildGoModule rec { owner = "elves"; repo = pname; rev = "v${version}"; - sha256 = "1jksdpf86miz1dv3vrmvpvz4k1c2m23dway6a7b1cypg03c68a75"; + sha256 = "sha256-i7RJiR1Mta2TrWBSUk0WM3InMV2cwbdlp3KHUdZgQ8I="; }; - vendorSha256 = "124m9680pl7wrh7ld7v39dfl86r6vih1pjk3bmbihy0fjgxnnq0b"; + vendorSha256 = "sha256-5tZwGrp/L9L+pf/yp8zlbb0voe60+if+NNf8ua2MujI="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/X11/arandr/default.nix b/third_party/nixpkgs/pkgs/tools/X11/arandr/default.nix index e6f4b5f6ff..4e4146a559 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/arandr/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/arandr/default.nix @@ -32,7 +32,7 @@ in buildPythonApplication rec { propagatedBuildInputs = [ xrandr pygobject3 ]; meta = { - homepage = "http://christian.amsuess.com/tools/arandr/"; + homepage = "https://christian.amsuess.com/tools/arandr/"; description = "A simple visual front end for XRandR"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.domenkozar ]; diff --git a/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix b/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix index 94f97e29af..7114d6801b 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix @@ -265,7 +265,7 @@ in pythonPackages.buildPythonApplication rec { meta = with lib; { description = "Music tagger and library organizer"; - homepage = "http://beets.io"; + homepage = "https://beets.io"; license = licenses.mit; maintainers = with maintainers; [ aszlig doronbehar lovesegfault pjones ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix index c2e022ca4b..4d901d6889 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix @@ -16,16 +16,16 @@ in buildGoModule rec { pname = "gocryptfs"; - version = "2.0.1"; + version = "2.1"; src = fetchFromGitHub { owner = "rfjakob"; repo = pname; rev = "v${version}"; - sha256 = "0wiagmym8mwi0vpvrs5ryn3zjwha8ilh7xkavvkd1gqd5laln0kp"; + sha256 = "sha256-nACBEOL/vnqxdAGI37k9bxgQKgpi35/tsuCxsQ9I2sw="; }; - vendorSha256 = "10az8n7z4rhsk1af2x6v3pmxg4zp7c9cal35ily8bdzzcb9cpgs0"; + vendorSha256 = "sha256-Q/oBT5xdLpgQCIk7KES6c8+BaCQVUIwCwVufl4oTFRs="; nativeBuildInputs = [ pkg-config diff --git a/third_party/nixpkgs/pkgs/tools/graphics/nip2/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/nip2/default.nix index 5fa2d26396..4297db1c8b 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/nip2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/nip2/default.nix @@ -1,5 +1,19 @@ -{ lib, stdenv, fetchurl, pkg-config, glib, libxml2, flex, bison, vips, gtk2 -, fftw, gsl, goffice, libgsf }: +{ lib +, stdenv +, fetchurl +, pkg-config +, glib +, libxml2 +, flex +, bison +, vips +, gtk2 +, fftw +, gsl +, goffice +, libgsf +, makeWrapper +}: stdenv.mkDerivation rec { pname = "nip2"; @@ -10,11 +24,28 @@ stdenv.mkDerivation rec { sha256 = "0l7n427njif53npqn02gfjjly8y3khbrkzqxp10j5vp9h97psgiw"; }; - buildInputs = - [ pkg-config glib libxml2 flex bison vips - gtk2 fftw gsl goffice libgsf + nativeBuildInputs = [ + bison + flex + pkg-config + makeWrapper ]; + buildInputs = [ + glib + libxml2 + vips + gtk2 + fftw + gsl + goffice + libgsf + ]; + + postFixup = '' + wrapProgram $out/bin/nip2 --set VIPSHOME "$out" + ''; + meta = with lib; { homepage = "https://github.com/libvips/nip2"; description = "Graphical user interface for VIPS image processing system"; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix index 7e291c7821..bfe9a1875e 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/vips/default.nix @@ -1,34 +1,44 @@ -{ lib, stdenv +{ lib +, stdenv , pkg-config , glib , libxml2 , expat -, fftw -, orc -, lcms -, imagemagick -, openexr -, libtiff -, libjpeg -, libgsf -, libexif -, libheif -, librsvg , ApplicationServices , Foundation -, python27 -, libpng +, python3 , fetchFromGitHub , fetchpatch , autoreconfHook , gtk-doc , gobject-introspection -, + # Optional dependencies +, libjpeg +, libexif +, librsvg +, poppler +, libgsf +, libtiff +, fftw +, lcms2 +, libpng +, libimagequant +, imagemagick +, pango +, orc +, matio +, cfitsio +, libwebp +, openexr +, openjpeg +, libjxl +, openslide +, libheif }: stdenv.mkDerivation rec { pname = "vips"; - version = "8.11.2"; + version = "8.11.3"; outputs = [ "bin" "out" "man" "dev" ]; @@ -36,7 +46,7 @@ stdenv.mkDerivation rec { owner = "libvips"; repo = "libvips"; rev = "v${version}"; - sha256 = "sha256-Psb+LrpTWtZwO9ekOLJIXsy8W49jW4Jdi+EmiJ+1MsQ="; + sha256 = "sha256-CWuULuUMBV2VUCZEBg0MzS7rXI8UUkNh5XPV2eA8xt8="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -54,22 +64,31 @@ stdenv.mkDerivation rec { buildInputs = [ glib libxml2 - fftw - orc - lcms - imagemagick - openexr - libtiff - libjpeg - libgsf - libexif - libheif - libpng - librsvg - python27 - libpng expat - ] ++ lib.optionals stdenv.isDarwin [ApplicationServices Foundation]; + (python3.withPackages (p: [ p.pycairo ])) + # Optional dependencies + libjpeg + libexif + librsvg + poppler + libgsf + libtiff + fftw + lcms2 + libpng + libimagequant + imagemagick + pango + orc + matio + cfitsio + libwebp + openexr + openjpeg + libjxl + openslide + libheif + ] ++ lib.optionals stdenv.isDarwin [ ApplicationServices Foundation ]; # Required by .pc file propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix b/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix index 423f1abd8b..de0f13c77f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/bat/default.nix @@ -13,15 +13,15 @@ rustPlatform.buildRustPackage rec { pname = "bat"; - version = "0.18.2"; + version = "0.18.3"; src = fetchFromGitHub { owner = "sharkdp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Y8CmVOIDPQ9kpggOlKnxLV0oOyNRow0r/nvxNpCtYNU="; + sha256 = "sha256-3XwnlSPlyEE4oznXK59/rooZLtj1+VbozprXU2W0J5I="; }; - cargoSha256 = "sha256-MdfBldImyW8QV0P3zPrYT2Vi9zChvXePI2T8tRsrlcQ="; + cargoSha256 = "sha256-g5yfE/s1N6EgI2ikiJbypI4iQbXPu6zGNoSVC6ldoWo="; nativeBuildInputs = [ pkg-config installShellFiles makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/betterdiscord-installer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/betterdiscord-installer/default.nix index f1aefd9b75..1de5b7c4cf 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/betterdiscord-installer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/betterdiscord-installer/default.nix @@ -24,7 +24,7 @@ in appimageTools.wrapType2 { meta = with lib; { description = "Installer for BetterDiscord"; - homepage = "https://betterdiscord.net"; + homepage = "https://betterdiscord.app"; license = licenses.mit; maintainers = [ maintainers.ivar ]; platforms = [ "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix index 44b52e27c4..35fc8343b5 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.174.2"; + version = "0.175.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-o/rDqYjOI+HxThQA7cflWUhCdsb6m4XOuzI753upmio="; + sha256 = "sha256-4mdQTcaIIGNZ0pgVNfy3LBtc1te2dpkMA29nAUzg9aE="; }; - vendorSha256 = "sha256-P91wi2Fqo9+Yccqoqmsx0IbjSGUpiKIh7uOsgsR9c+0="; + vendorSha256 = "sha256-7I/955dPHV8Rkp6VevkebkZaNtSlbzIsGc8qFjtcMXk="; buildFlagsArray = [ "-ldflags=" diff --git a/third_party/nixpkgs/pkgs/tools/misc/shadowenv/default.nix b/third_party/nixpkgs/pkgs/tools/misc/shadowenv/default.nix index 1f2d48b86e..07ad8c719f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/shadowenv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/shadowenv/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowenv"; - version = "2.0.3"; + version = "2.0.4"; src = fetchFromGitHub { owner = "Shopify"; repo = pname; rev = version; - sha256 = "1h8hfyxxl4bpx8azzxj0snmzccn6xjd9vc2iyp8i2ar7aiyhf5yd"; + sha256 = "sha256-BXCIb91EOpu/GUVvmFZbycuWYAS1n5Sxg5OiYx5rlPA="; }; - cargoSha256 = "1ixjkb82863z160spylza2a5hk82x0c4wjjnzgakbzgrwv29pai3"; + cargoSha256 = "sha256-Hn+128ZQljTroebDQBBNynSq7WTZLpB5sdA2Gz54pOU="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/teleconsole/default.nix b/third_party/nixpkgs/pkgs/tools/misc/teleconsole/default.nix index 63277c90d4..3bf1f5cd34 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/teleconsole/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/teleconsole/default.nix @@ -25,7 +25,6 @@ buildGoPackage rec { ''; CGO_ENABLED = 1; - buildFlags = [ "-ldflags" ]; meta = with lib; { homepage = "https://www.teleconsole.com/"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/bgpdump/default.nix b/third_party/nixpkgs/pkgs/tools/networking/bgpdump/default.nix index 18d72daa00..f60b60c399 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/bgpdump/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/bgpdump/default.nix @@ -1,19 +1,21 @@ -{ lib, stdenv, fetchurl, autoreconfHook, zlib, bzip2 }: +{ lib, stdenv, fetchFromGitHub, autoreconfHook, zlib, bzip2 }: stdenv.mkDerivation rec { pname = "bgpdump"; - version = "1.6.0"; + version = "1.6.2"; - src = fetchurl { - url = "https://ris.ripe.net/source/bgpdump/libbgpdump-1.6.0.tgz"; - sha256 = "144369gj35mf63nz4idqwsvgsirw7fybm8kkk07yymrjp8jr3aqk"; + src = fetchFromGitHub { + owner = "RIPE-NCC"; + repo = "bgpdump"; + rev = "v${version}"; + sha256 = "sha256-1HXMf9mHManR7jhonU2Agon0YFXOlM9APIN1Zm840AM="; }; nativeBuildInputs = [ autoreconfHook ]; buildInputs = [ zlib bzip2 ]; meta = { - homepage = "https://bitbucket.org/ripencc/bgpdump/"; + homepage = "https://github.com/RIPE-NCC/bgpdump"; description = "Analyze dump files produced by Zebra/Quagga or MRT"; license = lib.licenses.hpnd; maintainers = with lib.maintainers; [ lewo ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/brook/default.nix b/third_party/nixpkgs/pkgs/tools/networking/brook/default.nix index b6f7cb1869..c45f79fb24 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/brook/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/brook/default.nix @@ -1,26 +1,23 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "brook"; - version = "20200201"; - - goPackagePath = "github.com/txthinking/brook"; + version = "20210701"; src = fetchFromGitHub { owner = "txthinking"; repo = pname; rev = "v${version}"; - sha256 = "0fyw2q99gapnrg836x299sgagx94a5jpw4x3gnsf69fih7cqp9lm"; + sha256 = "sha256-MYd9q1pjrdLbgIoIakHeBuCjlEjXib0CNivZiqk5hns="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-iaaXLpzN69yHBcAi9GS+G7LupX/7VABo1XFNegk+i3Q="; meta = with lib; { homepage = "https://github.com/txthinking/brook"; description = "A cross-platform Proxy/VPN software"; - license = with licenses; [ gpl3 ]; + license = with licenses; [ gpl3Only ]; platforms = platforms.linux; maintainers = with maintainers; [ xrelkd ]; }; } - diff --git a/third_party/nixpkgs/pkgs/tools/networking/brook/deps.nix b/third_party/nixpkgs/pkgs/tools/networking/brook/deps.nix deleted file mode 100644 index 9ccb446b5e..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/brook/deps.nix +++ /dev/null @@ -1,165 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/urfave/cli"; - fetch = { - type = "git"; - url = "https://github.com/urfave/cli"; - rev = "3f8c3bca5729c9b679beffd0d88a67d468f832fd"; - sha256 = "07m5dfp5190wczdw2vqzz4srcpjz5lci1z12rzww9pg9pdjs63gy"; - }; - } - { - goPackagePath = "github.com/cpuguy83/go-md2man"; - fetch = { - type = "git"; - url = "https://github.com/cpuguy83/go-md2man"; - rev = "217d7bd9dd5494abdf2877afbeb24ba0e11b43d6"; - sha256 = "0vsmdrh5c5ngrnq91yg40l8388vh7l1p4wlv4lh7p977dp75ivg6"; - }; - } - { - goPackagePath = "github.com/gorilla/mux"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/mux"; - rev = "75dcda0896e109a2a22c9315bca3bb21b87b2ba5"; - sha256 = "1d0sy1paa055ic84sp3766s9pa24q008hf77dc842vrgvn8p3wmh"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "c3e18be99d19e6b3e8f1559eea2c161a665c4b6b"; - sha256 = "03n1n0nwz3k9qshmriycqznnnvd3dkzsfwpnfjzzvafjxk9kyapv"; - }; - } - { - goPackagePath = "github.com/mdp/qrterminal"; - fetch = { - type = "git"; - url = "https://github.com/mdp/qrterminal"; - rev = "b74f0e01e9f532111951caf89df78e5619193db5"; - sha256 = "1xz5f3dfkdwd6svnbh98rlr5pfr4s4hrqs4vffn9wy5vb336pp8p"; - }; - } - { - goPackagePath = "github.com/miekg/dns"; - fetch = { - type = "git"; - url = "https://github.com/miekg/dns"; - rev = "6c0c4e6581f8e173cc562c8b3363ab984e4ae071"; - sha256 = "0fpd9alvhzrkb1c31n4lrxlpv1nlhy51w1yg39xxb3mjmrb7lby1"; - }; - } - { - goPackagePath = "github.com/patrickmn/go-cache"; - fetch = { - type = "git"; - url = "https://github.com/patrickmn/go-cache"; - rev = "46f407853014144407b6c2ec7ccc76bf67958d93"; - sha256 = "08155wdk2883qw37p7wgrpv8wb9lbx4cpfgrraivdavs3qbjlq5j"; - }; - } - { - goPackagePath = "github.com/shurcooL/sanitized_anchor_name"; - fetch = { - type = "git"; - url = "https://github.com/shurcooL/sanitized_anchor_name"; - rev = "7bfe4c7ecddb3666a94b053b422cdd8f5aaa3615"; - sha256 = "1gv9p2nr46z80dnfjsklc6zxbgk96349sdsxjz05f3z6wb6m5l8f"; - }; - } - { - goPackagePath = "github.com/txthinking/gotun2socks"; - fetch = { - type = "git"; - url = "https://github.com/txthinking/gotun2socks"; - rev = "35016fdae05e78db993d43f55eb96ddbe3958252"; - sha256 = "11rl8pqyd6jzi5alpymzi0i5q7pk2492di44v85g7r24y6livrjg"; - }; - } - { - goPackagePath = "github.com/txthinking/socks5"; - fetch = { - type = "git"; - url = "https://github.com/txthinking/socks5"; - rev = "254e122c4eaf8657900905ed5bed5777870b9df8"; - sha256 = "1q43sxzacj216mdzl44khhx51w1z78jpraw955dnjv9va0zqbhmi"; - }; - } - { - goPackagePath = "github.com/txthinking/x"; - fetch = { - type = "git"; - url = "https://github.com/txthinking/x"; - rev = "99b19c1440b66f803ee98b30b6829651cc3f90cc"; - sha256 = "0vzw9wxlgj21y35qv580806vy6k6w1z5yqd5n6ccnq8cd3lvmx70"; - }; - } - { - goPackagePath = "github.com/urfave/negroni"; - fetch = { - type = "git"; - url = "https://github.com/urfave/negroni"; - rev = "f4316798d5d3acd39eb6784301b19f27f471415f"; - sha256 = "0w4iva6s8v8sk95l8mb1a67v0bn4h7njyylv9dnwma0d3l7k24y3"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "69ecbb4d6d5dab05e49161c6e77ea40a030884e1"; - sha256 = "1ylm1lp1miihaq93p8rh2yh823qljqkyqwk3gjzk2bdvzz427pr5"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "6afb5195e5aab057fda82e27171243402346b0ad"; - sha256 = "1aiz41q2yxgg3dxfkn33ff54vhaxbiwcps9j3ia1xx4cqxim38zw"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "9fbb57f87de9ccfe3a99d4e3270ce8a926ebba4f"; - sha256 = "0qaz2jjkrxzgkapmjqingdwamrgq2aiblxvzzgrcsv2qhkj0wdps"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "929e72ca90deac4784bbe451caf10faa5b256ebe"; - sha256 = "0kwyw87bx0rsc5bbqrrg36yv2b7rs4ijs4p4444s8zwzq6sw24y8"; - }; - } - { - goPackagePath = "gopkg.in/russross/blackfriday.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/russross/blackfriday.v2"; - rev = "d3b5b032dc8e8927d31a5071b56e14c89f045135"; - sha256 = "0nlz7isdd4rgnwzs68499hlwicxz34j2k2a0b8jy0y7ycd2bcr5j"; - }; - } - { - goPackagePath = "rsc.io/qr"; - fetch = { - type = "git"; - url = "https://github.com/rsc/qr"; - rev = "ca9a01fc2f9505024045632c50e5e8cd6142fafe"; - sha256 = "04yx493g0fqp8i59zjxnl4k3s0cl0kr5m8xh0ph8m10r1hkw0xr3"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/tools/networking/socat/2.x.nix b/third_party/nixpkgs/pkgs/tools/networking/socat/2.x.nix deleted file mode 100644 index 0105fa322c..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/socat/2.x.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, stdenv, fetchurl, openssl }: - -stdenv.mkDerivation rec { - name = "socat-2.0.0-b9"; - - src = fetchurl { - url = "http://www.dest-unreach.org/socat/download/${name}.tar.bz2"; - sha256 = "1ll395xjv4byvv0k2zjbxk8vp3mg3y2w5paa05wv553bqsjv1vs9"; - }; - - buildInputs = [ openssl ]; - - patches = lib.singleton ./libressl-fixes.patch ; - - meta = with lib; { - description = "A utility for bidirectional data transfer between two independent data channels"; - homepage = "http://www.dest-unreach.org/socat/"; - repositories.git = "git://repo.or.cz/socat.git"; - platforms = platforms.unix; - license = licenses.gpl2; - maintainers = [ maintainers.eelco ]; - broken = true; # broken with openssl 1.1 - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/networking/socat/libressl-fixes.patch b/third_party/nixpkgs/pkgs/tools/networking/socat/libressl-fixes.patch deleted file mode 100644 index cf66033584..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/socat/libressl-fixes.patch +++ /dev/null @@ -1,173 +0,0 @@ -Patch from OpenBSD ---- a/sslcls.c Sat Jan 24 03:15:22 2015 -+++ b/sslcls.c Sat Jul 18 20:01:59 2015 -@@ -55,6 +55,7 @@ const SSL_METHOD *sycSSLv2_server_method(void) { - } - #endif - -+#ifdef HAVE_SSLv3_client_method - const SSL_METHOD *sycSSLv3_client_method(void) { - const SSL_METHOD *result; - Debug("SSLv3_client_method()"); -@@ -62,7 +63,9 @@ const SSL_METHOD *sycSSLv3_client_method(void) { - Debug1("SSLv3_client_method() -> %p", result); - return result; - } -+#endif - -+#ifdef HAVE_SSLv3_server_method - const SSL_METHOD *sycSSLv3_server_method(void) { - const SSL_METHOD *result; - Debug("SSLv3_server_method()"); -@@ -70,6 +73,7 @@ const SSL_METHOD *sycSSLv3_server_method(void) { - Debug1("SSLv3_server_method() -> %p", result); - return result; - } -+#endif - - const SSL_METHOD *sycSSLv23_client_method(void) { - const SSL_METHOD *result; -@@ -331,14 +335,6 @@ void sycSSL_free(SSL *ssl) { - return; - } - --int sycRAND_egd(const char *path) { -- int result; -- Debug1("RAND_egd(\"%s\")", path); -- result = RAND_egd(path); -- Debug1("RAND_egd() -> %d", result); -- return result; --} -- - DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u) { - DH *result; - Debug4("PEM_read_bio_DHparams(%p, %p, %p, %p)", -@@ -375,7 +371,7 @@ int sycFIPS_mode_set(int onoff) { - } - #endif /* WITH_FIPS */ - --#if OPENSSL_VERSION_NUMBER >= 0x00908000L -+#if (OPENSSL_VERSION_NUMBER >= 0x00908000L) && !defined(OPENSSL_NO_COMP) - const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl) { - const COMP_METHOD *result; - Debug1("SSL_get_current_compression(%p)", ssl); ---- a/sslcls.h Sat Jan 24 11:15:22 2015 -+++ b/sslcls.h Mon Apr 13 15:06:25 2015 -@@ -47,7 +47,6 @@ X509 *sycSSL_get_peer_certificate(SSL *ssl); - int sycSSL_shutdown(SSL *ssl); - void sycSSL_CTX_free(SSL_CTX *ctx); - void sycSSL_free(SSL *ssl); --int sycRAND_egd(const char *path); - - DH *sycPEM_read_bio_DHparams(BIO *bp, DH **x, pem_password_cb *cb, void *u); - -@@ -55,7 +54,7 @@ BIO *sycBIO_new_file(const char *filename, const char - - int sycFIPS_mode_set(int onoff); - --#if OPENSSL_VERSION_NUMBER >= 0x00908000L -+#if (OPENSSL_VERSION_NUMBER >= 0x00908000L) && !defined(OPENSSL_NO_COMP) - const COMP_METHOD *sycSSL_get_current_compression(SSL *ssl); - const COMP_METHOD *sycSSL_get_current_expansion(SSL *ssl); - const char *sycSSL_COMP_get_name(const COMP_METHOD *comp); -@@ -98,7 +97,6 @@ const char *sycSSL_COMP_get_name(const COMP_METHOD *co - #define sycSSL_shutdown(s) SSL_shutdown(s) - #define sycSSL_CTX_free(c) SSL_CTX_free(c) - #define sycSSL_free(s) SSL_free(s) --#define sycRAND_egd(p) RAND_egd(p) - - #define sycPEM_read_bio_DHparams(b,x,p,u) PEM_read_bio_DHparams(b,x,p,u) - ---- a/xio-openssl.c Sat Jan 24 15:33:42 2015 -+++ b/xio-openssl.c Mon Apr 13 14:59:12 2015 -@@ -108,7 +108,6 @@ const struct optdesc opt_openssl_key = { "open - const struct optdesc opt_openssl_dhparam = { "openssl-dhparam", "dh", OPT_OPENSSL_DHPARAM, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC }; - const struct optdesc opt_openssl_cafile = { "openssl-cafile", "cafile", OPT_OPENSSL_CAFILE, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC }; - const struct optdesc opt_openssl_capath = { "openssl-capath", "capath", OPT_OPENSSL_CAPATH, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC }; --const struct optdesc opt_openssl_egd = { "openssl-egd", "egd", OPT_OPENSSL_EGD, GROUP_OPENSSL, PH_SPEC, TYPE_FILENAME, OFUNC_SPEC }; - const struct optdesc opt_openssl_pseudo = { "openssl-pseudo", "pseudo", OPT_OPENSSL_PSEUDO, GROUP_OPENSSL, PH_SPEC, TYPE_BOOL, OFUNC_SPEC }; - #if OPENSSL_VERSION_NUMBER >= 0x00908000L - const struct optdesc opt_openssl_compress = { "openssl-compress", "compress", OPT_OPENSSL_COMPRESS, GROUP_OPENSSL, PH_SPEC, TYPE_STRING, OFUNC_SPEC }; -@@ -147,7 +146,7 @@ int xio_reset_fips_mode(void) { - static void openssl_conn_loginfo(SSL *ssl) { - Notice1("SSL connection using %s", SSL_get_cipher(ssl)); - --#if OPENSSL_VERSION_NUMBER >= 0x00908000L -+#if (OPENSSL_VERSION_NUMBER >= 0x00908000L) && !defined(OPENSSL_NO_COMP) - { - const COMP_METHOD *comp, *expansion; - -@@ -722,7 +721,6 @@ int - char *opt_dhparam = NULL; /* file name of DH params */ - char *opt_cafile = NULL; /* certificate authority file */ - char *opt_capath = NULL; /* certificate authority directory */ -- char *opt_egd = NULL; /* entropy gathering daemon socket path */ - #if OPENSSL_VERSION_NUMBER >= 0x00908000L - char *opt_compress = NULL; /* compression method */ - #endif -@@ -741,7 +739,6 @@ int - retropt_string(opts, OPT_OPENSSL_CAPATH, &opt_capath); - retropt_string(opts, OPT_OPENSSL_KEY, &opt_key); - retropt_string(opts, OPT_OPENSSL_DHPARAM, &opt_dhparam); -- retropt_string(opts, OPT_OPENSSL_EGD, &opt_egd); - retropt_bool(opts,OPT_OPENSSL_PSEUDO, &opt_pseudo); - #if OPENSSL_VERSION_NUMBER >= 0x00908000L - retropt_string(opts, OPT_OPENSSL_COMPRESS, &opt_compress); -@@ -877,10 +874,6 @@ int - } - } - -- if (opt_egd) { -- sycRAND_egd(opt_egd); -- } -- - if (opt_pseudo) { - long int randdata; - /* initialize libc random from actual microseconds */ -@@ -1098,7 +1091,7 @@ static int openssl_SSL_ERROR_SSL(int level, const char - if (e == ((ERR_LIB_RAND<<24)| - (RAND_F_SSLEAY_RAND_BYTES<<12)| - (RAND_R_PRNG_NOT_SEEDED)) /*0x24064064*/) { -- Error("too few entropy; use options \"egd\" or \"pseudo\""); -+ Error("too few entropy; use option \"pseudo\""); - stat = STAT_NORETRY; - } else { - Msg2(level, "%s(): %s", funcname, ERR_error_string(e, buf)); ---- a/xio-openssl.h Sun Jun 23 07:16:48 2013 -+++ b/xio-openssl.h Sat Apr 19 15:58:21 2014 -@@ -21,7 +21,6 @@ extern const struct optdesc opt_openssl_key; - extern const struct optdesc opt_openssl_dhparam; - extern const struct optdesc opt_openssl_cafile; - extern const struct optdesc opt_openssl_capath; --extern const struct optdesc opt_openssl_egd; - extern const struct optdesc opt_openssl_pseudo; - #if OPENSSL_VERSION_NUMBER >= 0x00908000L - extern const struct optdesc opt_openssl_compress; ---- a/xioopts.c Sat Jan 24 11:15:22 2015 -+++ b/xioopts.c Mon Apr 13 15:06:25 2015 -@@ -412,7 +412,6 @@ const struct optname optionnames[] = { - #ifdef ECHOPRT - IF_TERMIOS("echoprt", &opt_echoprt) - #endif -- IF_OPENSSL("egd", &opt_openssl_egd) - IF_ANY ("end-close", &opt_end_close) - IF_TERMIOS("eof", &opt_veof) - IF_TERMIOS("eol", &opt_veol) -@@ -1102,7 +1101,6 @@ const struct optname optionnames[] = { - IF_OPENSSL("openssl-compress", &opt_openssl_compress) - #endif - IF_OPENSSL("openssl-dhparam", &opt_openssl_dhparam) -- IF_OPENSSL("openssl-egd", &opt_openssl_egd) - #if WITH_FIPS - IF_OPENSSL("openssl-fips", &opt_openssl_fips) - #endif ---- a/xioopts.h Sat Jan 24 11:15:22 2015 -+++ b/xioopts.h Mon Apr 13 15:06:25 2015 -@@ -478,7 +478,6 @@ enum e_optcode { - OPT_OPENSSL_COMPRESS, - #endif - OPT_OPENSSL_DHPARAM, -- OPT_OPENSSL_EGD, - OPT_OPENSSL_FIPS, - OPT_OPENSSL_KEY, - OPT_OPENSSL_METHOD, diff --git a/third_party/nixpkgs/pkgs/tools/security/apg/apg.patch b/third_party/nixpkgs/pkgs/tools/security/apg/apg.patch deleted file mode 100644 index abc22647d5..0000000000 --- a/third_party/nixpkgs/pkgs/tools/security/apg/apg.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -rc apg-2.2.3/Makefile apg-2.2.3-new/Makefile -*** apg-2.2.3/Makefile 2003-08-07 17:40:30.000000000 +0200 ---- apg-2.2.3-new/Makefile 2013-07-24 12:25:31.159938436 +0200 -*************** -*** 113,131 **** - if test -x ./apg; then \ - ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \ - ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \ -! ./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apg ${INSTALL_PREFIX}${APG_BIN_DIR}; \ - ./install-sh -c -m 0444 ./doc/man/apg.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \ - fi - if test -x ./apgd; then \ - ./mkinstalldirs ${INSTALL_PREFIX}${APGD_BIN_DIR}; \ - ./mkinstalldirs ${INSTALL_PREFIX}${APGD_MAN_DIR}; \ -! ./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apgd ${INSTALL_PREFIX}${APGD_BIN_DIR}; \ - ./install-sh -c -m 0444 ./doc/man/apgd.8 ${INSTALL_PREFIX}${APGD_MAN_DIR}; \ - fi - if test -x ./apgbfm; then \ - ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \ - ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \ -! ./install-sh -c -m 0755 -o root -g ${FIND_GROUP} ./apgbfm ${INSTALL_PREFIX}${APG_BIN_DIR}; \ - ./install-sh -c -m 0444 ./doc/man/apgbfm.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \ - fi - ---- 113,131 ---- - if test -x ./apg; then \ - ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \ - ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \ -! ./install-sh -c -m 0755 ./apg ${INSTALL_PREFIX}${APG_BIN_DIR}; \ - ./install-sh -c -m 0444 ./doc/man/apg.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \ - fi - if test -x ./apgd; then \ - ./mkinstalldirs ${INSTALL_PREFIX}${APGD_BIN_DIR}; \ - ./mkinstalldirs ${INSTALL_PREFIX}${APGD_MAN_DIR}; \ -! ./install-sh -c -m 0755 ./apgd ${INSTALL_PREFIX}${APGD_BIN_DIR}; \ - ./install-sh -c -m 0444 ./doc/man/apgd.8 ${INSTALL_PREFIX}${APGD_MAN_DIR}; \ - fi - if test -x ./apgbfm; then \ - ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \ - ./mkinstalldirs ${INSTALL_PREFIX}${APG_MAN_DIR}; \ -! ./install-sh -c -m 0755 ./apgbfm ${INSTALL_PREFIX}${APG_BIN_DIR}; \ - ./install-sh -c -m 0444 ./doc/man/apgbfm.1 ${INSTALL_PREFIX}${APG_MAN_DIR}; \ - fi - diff --git a/third_party/nixpkgs/pkgs/tools/security/apg/default.nix b/third_party/nixpkgs/pkgs/tools/security/apg/default.nix index cfcadd7574..a283678e0a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/apg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/apg/default.nix @@ -1,25 +1,18 @@ -{ lib, stdenv, fetchurl, openssl }: +{ lib, stdenv, fetchFromGitHub, openssl, autoreconfHook }: stdenv.mkDerivation rec { pname = "apg"; - version = "2.3.0b"; + version = "unstable-2015-01-29"; - src = fetchurl { - url = "http://www.adel.nursat.kz/apg/download/apg-${version}.tar.gz"; - sha256 = "14lbq81xrcsmpk1b9qmqyz7n6ypf08zcxvcvp6f7ybcyf0lj1rfi"; + src = fetchFromGitHub { + owner = "wilx"; + repo = "apg"; + rev = "7ecdbac79156c8864fa3ff8d61e9f1eb264e56c2"; + sha256 = "sha256-+7TrJACdm/i/pc0dsp8edEIOjx8cip+x0Qc2gONajSE="; }; - configurePhase = '' - substituteInPlace Makefile --replace /usr/local "$out" - ''; - makeFlags = ["CC=${stdenv.cc.targetPrefix}cc"]; - patches = [ - ./apg.patch - ./phony-install-target.patch - ]; + nativeBuildInputs = [ autoreconfHook ]; - postPatch = lib.optionalString stdenv.isDarwin '' - sed -i -e 's|APG_CLIBS += -lcrypt|APG_CLIBS += -L${openssl.out}/lib -lcrypto|' Makefile - ''; + buildInputs = [ openssl ]; meta = { description = "Tools for random password generation"; @@ -66,7 +59,7 @@ stdenv.mkDerivation rec { * Ability to enforce remote users to use only allowed type of password generation ''; - homepage = "http://www.adel.nursat.kz/apg/"; + homepage = "https://github.com/wilx/apg"; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ astsmtl ]; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/tools/security/apg/phony-install-target.patch b/third_party/nixpkgs/pkgs/tools/security/apg/phony-install-target.patch deleted file mode 100644 index 9edf50b4b5..0000000000 --- a/third_party/nixpkgs/pkgs/tools/security/apg/phony-install-target.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -ur a/Makefile b/Makefile ---- a/Makefile 2003-08-08 00:40:39.000000000 +0900 -+++ b/Makefile 2018-04-05 22:29:39.284191020 +0900 -@@ -142,6 +142,7 @@ - strip ${CS_PROGNAME} - strip ${BFM_PROGNAME} - -+.PHONY: install - install: - if test -x ./apg; then \ - ./mkinstalldirs ${INSTALL_PREFIX}${APG_BIN_DIR}; \ diff --git a/third_party/nixpkgs/pkgs/tools/security/pwgen/default.nix b/third_party/nixpkgs/pkgs/tools/security/pwgen/default.nix index fc410f1984..7870add420 100644 --- a/third_party/nixpkgs/pkgs/tools/security/pwgen/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/pwgen/default.nix @@ -1,17 +1,29 @@ -{lib, stdenv, fetchurl, autoreconfHook}: +{ lib +, stdenv +, autoreconfHook +, fetchFromGitHub +}: + stdenv.mkDerivation rec { pname = "pwgen"; version = "2.08"; - src = fetchurl { - url = "https://github.com/tytso/pwgen/archive/v${version}.tar.gz"; - sha256 = "8d6e94f28655e61d6126290e3eafad4d17d7fba0d0d354239522a740a270bb2f"; + src = fetchFromGitHub { + owner = "tytso"; + repo = pname; + rev = "v${version}"; + sha256 = "1j6c6m9fcy24jn8mk989x49yk765xb26lpr8yhpiaqk206wlss2z"; }; - nativeBuildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ + autoreconfHook + ]; - meta = { + meta = with lib; { description = "Password generator which creates passwords which can be easily memorized by a human"; - platforms = lib.platforms.all; + homepage = "https://github.com/tytso/pwgen"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fab ]; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/tor/default.nix b/third_party/nixpkgs/pkgs/tools/security/tor/default.nix index b3c98ac013..a472b502b6 100644 --- a/third_party/nixpkgs/pkgs/tools/security/tor/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/tor/default.nix @@ -30,11 +30,11 @@ let in stdenv.mkDerivation rec { pname = "tor"; - version = "0.4.6.6"; + version = "0.4.6.7"; src = fetchurl { url = "https://dist.torproject.org/${pname}-${version}.tar.gz"; - sha256 = "04ifi18cj4cw5lhfzgfrrc42j7qqdmbvxq24xlhj0dsmljdih8rl"; + sha256 = "16hga7195va8v0x062dc05nbz4sm3dscifcqpl8235dj47hmqrpz"; }; outputs = [ "out" "geoip" ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/openipmi/default.nix b/third_party/nixpkgs/pkgs/tools/system/openipmi/default.nix new file mode 100644 index 0000000000..c462c2457a --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/system/openipmi/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, popt, ncurses, python3, readline, lib }: + +stdenv.mkDerivation rec { + pname = "OpenIPMI"; + version = "2.0.31"; + + src = fetchurl { + url = "mirror://sourceforge/openipmi/OpenIPMI-${version}.tar.gz"; + sha256 = "05wpkn74nxqp5p6sa2yaf2ajrh8b0gfkb7y4r86lnigz4rvz6lkh"; + }; + + buildInputs = [ ncurses popt python3 readline ]; + + outputs = [ "out" "lib" "dev" "man" ]; + + meta = with lib; { + homepage = "https://openipmi.sourceforge.io/"; + description = "A user-level library that provides a higher-level abstraction of IPMI and generic services"; + license = with licenses; [ gpl2Only lgpl2Only ]; + platforms = platforms.linux; + maintainers = with maintainers; [ arezvov SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/bcat/Gemfile b/third_party/nixpkgs/pkgs/tools/text/bcat/Gemfile deleted file mode 100644 index a25a2e8909..0000000000 --- a/third_party/nixpkgs/pkgs/tools/text/bcat/Gemfile +++ /dev/null @@ -1,2 +0,0 @@ -source 'https://rubygems.org' -gem 'bcat' diff --git a/third_party/nixpkgs/pkgs/tools/text/bcat/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/text/bcat/Gemfile.lock deleted file mode 100644 index cbff494fe8..0000000000 --- a/third_party/nixpkgs/pkgs/tools/text/bcat/Gemfile.lock +++ /dev/null @@ -1,15 +0,0 @@ -GEM - remote: https://rubygems.org/ - specs: - bcat (0.6.2) - rack (~> 1.0) - rack (1.6.11) - -PLATFORMS - ruby - -DEPENDENCIES - bcat - -BUNDLED WITH - 2.1.4 diff --git a/third_party/nixpkgs/pkgs/tools/text/bcat/default.nix b/third_party/nixpkgs/pkgs/tools/text/bcat/default.nix deleted file mode 100644 index dffd58de44..0000000000 --- a/third_party/nixpkgs/pkgs/tools/text/bcat/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib, bundlerApp, bundlerUpdateScript }: - -bundlerApp { - pname = "bcat"; - gemdir = ./.; - exes = [ "bcat" "btee" "a2h" ]; - - passthru.updateScript = bundlerUpdateScript "bcat"; - - meta = with lib; { - description = "Pipe to browser utility"; - homepage = "http://rtomayko.github.com/bcat/"; - license = licenses.mit; - maintainers = with maintainers; [ jraygauthier nicknovitski ]; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/text/bcat/gemset.nix b/third_party/nixpkgs/pkgs/tools/text/bcat/gemset.nix deleted file mode 100644 index 9471ffae8d..0000000000 --- a/third_party/nixpkgs/pkgs/tools/text/bcat/gemset.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - bcat = { - dependencies = ["rack"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0w2wwlngcs7f4lmvifixrb89bjkw2lx8z0nn72w360hz394ic651"; - type = "gem"; - }; - version = "0.6.2"; - }; - rack = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1g9926ln2lw12lfxm4ylq1h6nl0rafl10za3xvjzc87qvnqic87f"; - type = "gem"; - }; - version = "1.6.11"; - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/text/poedit/default.nix b/third_party/nixpkgs/pkgs/tools/text/poedit/default.nix index 9a5226d98b..c53f521fdd 100644 --- a/third_party/nixpkgs/pkgs/tools/text/poedit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/poedit/default.nix @@ -1,22 +1,22 @@ -{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK30-gtk3, +{ lib, stdenv, fetchFromGitHub, autoconf, automake, libtool, gettext, pkg-config, wxGTK31-gtk3, boost, icu, lucenepp, asciidoc, libxslt, xmlto, gtk3, gtkspell3, pugixml, nlohmann_json, hicolor-icon-theme, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "poedit"; - version = "2.4.3"; + version = "3.0"; src = fetchFromGitHub { owner = "vslavik"; repo = "poedit"; rev = "v${version}-oss"; - sha256 = "02xf2w3d2lnr3vqmil9vvg9pir7d21x4zrj9xwpgb7dhs0gimj0x"; + sha256 = "0bxhyxsa641ip6wab9ms9g4w6mb1bv46y5h5b436spl5c70rcn4z"; }; nativeBuildInputs = [ autoconf automake asciidoc wrapGAppsHook libxslt xmlto boost libtool pkg-config ]; - buildInputs = [ lucenepp nlohmann_json wxGTK30-gtk3 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ]; + buildInputs = [ lucenepp nlohmann_json wxGTK31-gtk3 icu pugixml gtk3 gtkspell3 hicolor-icon-theme ]; propagatedBuildInputs = [ gettext ]; diff --git a/third_party/nixpkgs/pkgs/tools/text/vale/default.nix b/third_party/nixpkgs/pkgs/tools/text/vale/default.nix index 257b11933b..a665e35fdd 100644 --- a/third_party/nixpkgs/pkgs/tools/text/vale/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.10.4"; + version = "2.10.5"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,10 +11,10 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "0gw7b6gvzp2f7la1mb74bg92nd8zk5fiajsihcqpni2a79js1s6y"; + sha256 = "sha256-SxNM63MCtsBmjzFbO/leCQwWWew5nN8wTUdmzHkx7dQ="; }; - vendorSha256 = "15r97mpsailsa4ja6mh5wrjcjacppm0vwma9q6znsa2f1x2apc6y"; + vendorSha256 = "sha256-3rCrRA9OKG2/wUlVvkG9lynJZOYFVqMkUZpGpW89KZc="; postInstall = '' mkdir -p $data/share/vale diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix index 439cf47e55..dd30969ed8 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/cloud-init/default.nix @@ -104,6 +104,7 @@ buildPythonApplication rec { meta = with lib; { homepage = "https://cloudinit.readthedocs.org"; description = "Provides configuration and customization of cloud instance"; + license = with licenses; [ asl20 gpl3Plus ]; maintainers = with maintainers; [ madjar phile314 ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 50c2a23bb4..c6159dbb9f 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -69,6 +69,7 @@ mapAliases ({ batti = throw "batti has been removed from nixpkgs, as it was unmaintained"; # added 2019-12-10 bazaar = throw "bazaar has been deprecated by breezy."; # added 2020-04-19 bazaarTools = throw "bazaar has been deprecated by breezy."; # added 2020-04-19 + bcat = throw "bcat has been removed because upstream is dead"; # added 2021-08-22 beegfs = throw "beegfs has been removed."; # added 2019-11-24 bluezFull = bluez; # Added 2019-12-03 bpftool = bpftools; # Added 2021-05-03 @@ -78,6 +79,7 @@ mapAliases ({ bootchart = throw "bootchart has been removed from nixpkgs, as it is without a maintainer"; # added 2019-12-10 bomi = throw "bomi has been removed from nixpkgs since it was broken and abandoned upstream"; # added 2020-12-10 btrfsProgs = btrfs-progs; # added 2016-01-03 + bitsnbots = throw "bitsnbots has been removed because it was broken and upstream missing"; # added 2021-08-22 bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03 bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03 bittorrentSync20 = throw "bittorrentSync20 has been deprecated by resilio-sync."; # added 2019-06-03 @@ -482,6 +484,7 @@ mapAliases ({ lxappearance-gtk3 = throw "lxappearance-gtk3 has been removed. Use lxappearance instead, which now defaults to Gtk3"; # added 2020-06-03 lzma = xz; # moved from top-level 2021-03-14 m3d-linux = m33-linux; # added 2016-08-13 + mail-notification = throw "mail-notification has been removed from nixpkgs, as it's unmaintained and has dependencies on old gnome libraries we want to remove"; # added 2021-08-21 man_db = man-db; # added 2016-05 manpages = man-pages; # added 2015-12-06 marathon = throw "marathon has been removed from nixpkgs, as it's unmaintained"; # added 2020-08-15 diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 30db04579b..9c67e1e90a 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -258,6 +258,8 @@ with pkgs; comedilib = callPackage ../development/libraries/comedilib { }; + commitlint = nodePackages."@commitlint/cli"; + containerpilot = callPackage ../applications/networking/cluster/containerpilot { }; coordgenlibs = callPackage ../development/libraries/coordgenlibs { }; @@ -1920,8 +1922,6 @@ with pkgs; bdf2sfd = callPackage ../tools/misc/bdf2sfd { }; - bcat = callPackage ../tools/text/bcat {}; - bcache-tools = callPackage ../tools/filesystems/bcache-tools { }; bchunk = callPackage ../tools/cd-dvd/bchunk { }; @@ -6718,6 +6718,8 @@ with pkgs; np2kai = callPackage ../misc/emulators/np2kai { }; + openipmi = callPackage ../tools/system/openipmi { }; + ox = callPackage ../applications/editors/ox { }; file-rename = callPackage ../tools/filesystems/file-rename { }; @@ -8175,7 +8177,9 @@ with pkgs; pod2mdoc = callPackage ../tools/misc/pod2mdoc { }; - poedit = callPackage ../tools/text/poedit { }; + poedit = callPackage ../tools/text/poedit { + wxGTK31-gtk3 = wxGTK31-gtk3.override { withWebKit = true; }; + }; polipo = callPackage ../servers/polipo { }; @@ -9086,8 +9090,6 @@ with pkgs; socat = callPackage ../tools/networking/socat { }; - socat2pre = lowPrio (callPackage ../tools/networking/socat/2.x.nix { }); - sockperf = callPackage ../tools/networking/sockperf { }; solaar = callPackage ../applications/misc/solaar {}; @@ -11439,7 +11441,7 @@ with pkgs; # Please update doc/languages-frameworks/haskell.section.md, “Our # current default compiler is”, if you bump this: - haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8104; + haskellPackages = dontRecurseIntoAttrs haskell.packages.ghc8106; inherit (haskellPackages) ghc; @@ -15366,6 +15368,8 @@ with pkgs; filter-audio = callPackage ../development/libraries/filter-audio {}; + filtron = callPackage ../servers/filtron {}; + flann = callPackage ../development/libraries/flann { }; flatcc = callPackage ../development/libraries/flatcc { }; @@ -18918,13 +18922,9 @@ with pkgs; theft = callPackage ../development/libraries/theft { }; - thrift = callPackage ../development/libraries/thrift { - inherit (pythonPackages) twisted; - }; + thrift = callPackage ../development/libraries/thrift { }; - thrift-0_10 = callPackage ../development/libraries/thrift/0.10.nix { - inherit (pythonPackages) twisted; - }; + thrift-0_10 = callPackage ../development/libraries/thrift/0.10.nix { }; tidyp = callPackage ../development/libraries/tidyp { }; @@ -25832,8 +25832,6 @@ with pkgs; magic-wormhole = with python3Packages; toPythonApplication magic-wormhole; - mail-notification = callPackage ../desktops/gnome-2/desktop/mail-notification {}; - magnetophonDSP = lib.recurseIntoAttrs { CharacterCompressor = callPackage ../applications/audio/magnetophonDSP/CharacterCompressor { }; CompBus = callPackage ../applications/audio/magnetophonDSP/CompBus { }; @@ -26879,6 +26877,8 @@ with pkgs; qiv = callPackage ../applications/graphics/qiv { }; + premid = callPackage ../applications/misc/premid { }; + processing = callPackage ../applications/graphics/processing { jdk = oraclejdk8; }; @@ -29109,10 +29109,6 @@ with pkgs; beret = callPackage ../games/beret { }; - bitsnbots = callPackage ../games/bitsnbots { - lua = lua5; - }; - black-hole-solver = callPackage ../games/black-hole-solver { inherit (perlPackages) PathTiny; }; diff --git a/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix b/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix index a7f29d6726..2e031e2730 100644 --- a/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/darwin-packages.nix @@ -156,6 +156,8 @@ impure-cmds // appleSourcePackages // chooseLibs // { usr-include = callPackage ../os-specific/darwin/usr-include { }; + xattr = pkgs.python3Packages.callPackage ../os-specific/darwin/xattr { }; + inherit (pkgs.callPackages ../os-specific/darwin/xcode { }) xcode_8_1 xcode_8_2 xcode_9_1 xcode_9_2 xcode_9_4 xcode_9_4_1 diff --git a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix index 86a09b4a1f..d60c20f38e 100644 --- a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix @@ -68,7 +68,7 @@ in { buildLlvmPackages = buildPackages.llvmPackages_7; llvmPackages = pkgs.llvmPackages_7; }; - ghc8104 = callPackage ../development/compilers/ghc/8.10.4.nix { + ghc8106 = callPackage ../development/compilers/ghc/8.10.6.nix { # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar # Musl bindists do not exist for ghc 8.6.5, so we use 8.10.* for them bootPkgs = if stdenv.isAarch64 || stdenv.isAarch32 || stdenv.targetPlatform.isMusl then @@ -76,6 +76,10 @@ in { else packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx; + # Need to use apple's patched xattr until + # https://github.com/xattr/xattr/issues/44 and + # https://github.com/xattr/xattr/issues/55 are solved. + inherit (buildPackages.darwin) xattr; buildLlvmPackages = buildPackages.llvmPackages_9; llvmPackages = pkgs.llvmPackages_9; }; @@ -147,9 +151,9 @@ in { ghc = bh.compiler.ghc884; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.8.x.nix { }; }; - ghc8104 = callPackage ../development/haskell-modules { - buildHaskellPackages = bh.packages.ghc8104; - ghc = bh.compiler.ghc8104; + ghc8106 = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc8106; + ghc = bh.compiler.ghc8106; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; }; ghc901 = callPackage ../development/haskell-modules { diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index eed731fcae..13d48f0782 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -17122,10 +17122,6 @@ let description = "Indent and reformat perl scripts"; license = lib.licenses.gpl2Plus; }; - nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang; - postInstall = lib.optionalString stdenv.isDarwin '' - shortenPerlShebang $out/bin/perltidy - ''; }; PHPSerialization = buildPerlPackage { diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 431d4a9959..4289133332 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -1842,6 +1842,8 @@ in { datasette = callPackage ../development/python-modules/datasette { }; + datasette-template-sql = callPackage ../development/python-modules/datasette-template-sql { }; + datashader = callPackage ../development/python-modules/datashader { dask = self.dask.override { withExtraComplete = true; }; }; @@ -4469,6 +4471,8 @@ in { memcached = callPackage ../development/python-modules/memcached { }; + memory-allocator = callPackage ../development/python-modules/memory-allocator { }; + memory_profiler = callPackage ../development/python-modules/memory_profiler { }; mercantile = callPackage ../development/python-modules/mercantile { }; @@ -8920,6 +8924,8 @@ in { ttp = callPackage ../development/python-modules/ttp { }; + tubes = callPackage ../development/python-modules/tubes { }; + tunigo = callPackage ../development/python-modules/tunigo { }; tubeup = callPackage ../development/python-modules/tubeup { }; diff --git a/third_party/nixpkgs/pkgs/top-level/release-haskell.nix b/third_party/nixpkgs/pkgs/top-level/release-haskell.nix index 400635740e..a987dc579d 100644 --- a/third_party/nixpkgs/pkgs/top-level/release-haskell.nix +++ b/third_party/nixpkgs/pkgs/top-level/release-haskell.nix @@ -50,7 +50,7 @@ let # list of all compilers to test specific packages on all = with compilerNames; [ ghc884 - ghc8104 + ghc8106 ghc901 ]; @@ -278,14 +278,14 @@ let # Test some statically linked packages to catch regressions # and get some cache going for static compilation with GHC. # Use integer-simple to avoid GMP linking problems (LGPL) - pkgsStatic.haskell.packages.integer-simple.ghc8104 = + pkgsStatic.haskell.packages.integer-simple.ghc8106 = removePlatforms [ "aarch64-linux" # times out on Hydra "x86_64-darwin" # TODO: reenable when static libiconv works on darwin ] { - inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.integer-simple.ghc8104) + inherit (packagePlatforms pkgs.pkgsStatic.haskell.packages.integer-simple.ghc8106) hello lens random @@ -300,12 +300,12 @@ let # package sets (like Cabal, jailbreak-cabal) are # working as expected. cabal-install = all; - Cabal_3_6_0_0 = with compilerNames; [ ghc884 ghc8104 ]; + Cabal_3_6_0_0 = with compilerNames; [ ghc884 ghc8106 ]; cabal2nix-unstable = all; funcmp = all; # Doesn't currently work on ghc-9.0: # https://github.com/haskell/haskell-language-server/issues/297 - haskell-language-server = with compilerNames; [ ghc884 ghc8104 ]; + haskell-language-server = with compilerNames; [ ghc884 ghc8106 ]; hoogle = all; hsdns = all; jailbreak-cabal = all; @@ -379,7 +379,7 @@ let constituents = accumulateDerivations [ jobs.pkgsMusl.haskell.compiler.ghc8102Binary jobs.pkgsMusl.haskell.compiler.ghc884 - jobs.pkgsMusl.haskell.compiler.ghc8104 + jobs.pkgsMusl.haskell.compiler.ghc8106 jobs.pkgsMusl.haskell.compiler.ghc901 ]; }; @@ -394,9 +394,9 @@ let ]; }; constituents = accumulateDerivations [ - jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.hello - jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.lens - jobs.pkgsStatic.haskell.packages.integer-simple.ghc8104.random + jobs.pkgsStatic.haskell.packages.integer-simple.ghc8106.hello + jobs.pkgsStatic.haskell.packages.integer-simple.ghc8106.lens + jobs.pkgsStatic.haskell.packages.integer-simple.ghc8106.random ]; }; } diff --git a/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix b/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix index 39108721a0..3ced3d8e4c 100644 --- a/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ruby-packages.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wswkgwhmfk5j76ar76plhaxna12x0cyf2di57azahlcv88rrwra"; + sha256 = "0ilq5mniarm0zlvnkagqj9n9p73ljrhphciz02aymrpfxxxclz2x"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "101r0x4lhzp23hksch7z24ajvp549lskxn2cr7pbgr64jjy6v17y"; + sha256 = "16azdnjws215clb056b9mabglx4b8f61hr82hv7hm80dmn89zqq6"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "rails-dom-testing"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mxqpiwgqam5vfk8wsfyj4dpxq0xqqvfbcwx1i4p9n1ahrx7wv7f"; + sha256 = "00s07l2ac5igch1g2rpa0linmiq7mhgk6v6wxkckg8gbiqijb592"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pj4xz316b3z56vpb8pnrkwj4rlf3hgas5fhddk6yh7ifrl30sc9"; + sha256 = "0xgysqnibjsy6kdz10x2xb3kwa6lssiqhh0zggrbgs31ypwhlpia"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "nokogiri"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fn488la8dllfg5zhm74k8y23xl9czrzzs55b9v624j43wjhfxcl"; + sha256 = "0m4fy4qqh09vnzbhx383vjdfid6fzbs49bzzg415x05nmmjkx582"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jqybz7h11xkjpqdffb9gphwmd56lms9xqskza00wd2pswxcwkn4"; + sha256 = "1yf4ic5kl324rs0raralpwx24s6hvvdzxfhinafylf8f3x7jj23z"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0q00vrknnnhmg02nik06ivrmz7hnq5snpy653kdpskvp4c9ys55c"; + sha256 = "1q7c0i0kwarxgcbxk71wa9jnlg45grbxmhlrh7dk9bgcv7r7r7hn"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; activemodel = { dependencies = ["activesupport"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xjy8fg7n5wwv29ngvvdf5r6815s5f0knzyswxh8w6z8f8qj5wr7"; + sha256 = "16ixam4lni8b5lgx0whnax0imzh1dh10fy5r9pxs52n83yz5nbq3"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18897s9h9kha8vgky1yfq4x91m3p81k6rkrb1fgjlnqnvarh9vg0"; + sha256 = "1ccgvlj767ybps3pxlaa4iw77n7wbriw2sr8754id3ngjfap08ja"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03gb6jbvdzm0xlr2g393jvf980ybjf9zzgspl0p4ixh3lcxxr51w"; + sha256 = "17knzz9fvqg4x582vy0xmlgjkxfb13xyzl2rgw19qfma86hxsvvi"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo" "zeitwerk"]; @@ -115,10 +115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kqgywy4cj3h5142dh7pl0xx5nybp25jn0ykk0znziivzks68xdk"; + sha256 = "19gx1jcq46x9d1pi1w8xq0bgvvfw239y4lalr8asm291gj3q3ds4"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; addressable = { groups = ["default"]; @@ -332,10 +332,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ljsx1inbbzj8njpk4sb40kdis6pjwpgcpy3677dm45bxw21dmkv"; + sha256 = "1yi4dgl6w6fs35szsxb4z24d7svmqgxyr4ma4hsrcsb2pv4qk3xj"; type = "gem"; }; - version = "1.0.5"; + version = "1.1.0"; }; cocoapods-browser = { dependencies = ["cocoapods"]; @@ -395,10 +395,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bf524f1za92i6rlr4cr6jm3c4vfjszsdc9lsr6wk5125c76ipzn"; + sha256 = "18pnng0lv5z6kpp8hnki0agdxx979iq6hxkfkglsyqzmir22lz2i"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; cocoapods-dependencies = { dependencies = ["ruby-graphviz"]; @@ -519,10 +519,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "02wmy5rbjk29c65zn62bffxv30qs11slql23qx65snkm0vd93mn6"; + sha256 = "12amy0nknv09bvzix8bkmcjn996c50c4ms20v2dl7v8rcw73n4qv"; type = "gem"; }; - version = "1.0.0"; + version = "1.0.1"; }; cocoapods-stats = { groups = ["default"]; @@ -1559,10 +1559,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0pwik3x5fa92g6hbv4imz3n46nlkzgj69pkgql22ppmcr36knk6m"; + sha256 = "1nqcya57x2n58y1dify60i0dpla40n4yir928khp4nj5jrn9mgmw"; type = "gem"; }; - version = "2.11.0"; + version = "2.12.0"; }; mab = { groups = ["default"]; @@ -1876,10 +1876,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1iav4jrklvm8938bxhby0khs36mdndhvwia4hc85zxcb0yl1k8ll"; + sha256 = "1q71y7pdihz26m3n2fnm2hd7wllmnxgxk6vcbbh27rqa14q5x5yi"; type = "gem"; }; - version = "1.12.2"; + version = "1.12.3"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -2109,10 +2109,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k3d3acac2qn9fg185z3y79nvg4ghr4lyhqiz6mbwlsd7r2nd8mh"; + sha256 = "1y59m2x8rdc581bjgyyr9dabi3vk3frqhhpbb5ldpbj622kxfpbz"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; rails-dom-testing = { dependencies = ["activesupport" "nokogiri"]; @@ -2131,10 +2131,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1icpqmxbppl4ynzmn6dx7wdil5hhq6fz707m9ya6d86c7ys8sd4f"; + sha256 = "0whc4d4jqm8kd4x3jzbax54sscm1k4pfkr5d1gpapjbzqkfj77yy"; type = "gem"; }; - version = "1.3.0"; + version = "1.4.1"; }; railties = { dependencies = ["actionpack" "activesupport" "method_source" "rake" "thor"]; @@ -2142,10 +2142,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0hwp0qwkphp3fvbsq6ljp8s99v621si9bgqihysz5bv1d1z52mm4"; + sha256 = "1kwpm068cqys34p2g0j3l1g0cd5f3kxnsay5v7lmbd0sgarac0vy"; type = "gem"; }; - version = "6.1.4"; + version = "6.1.4.1"; }; rainbow = { groups = ["default"];