From 2cb17fa48711714e0faa20f317f80d5edc6189ef Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 29 Oct 2021 19:08:42 +0000 Subject: [PATCH 01/72] go-ethereum: 1.10.8 -> 1.10.11 --- pkgs/applications/blockchains/go-ethereum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/go-ethereum/default.nix b/pkgs/applications/blockchains/go-ethereum/default.nix index b9f31a3e7fa7..4353352ef098 100644 --- a/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,17 +9,17 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.10.8"; + version = "1.10.11"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-r4ifLa4CMZvp0MaCkxWo5rWLEnFdX//mYlC08hndXhQ="; + sha256 = "sha256-8kPaa2wRKUQBn4LFDnc7tEbLR62f99NS1HIVDeHHzto="; }; runVend = true; - vendorSha256 = "sha256-e8aKQMVEEf0BzpdljkOBxznj5P1Go/6EbY9mdhDLyrw="; + vendorSha256 = "sha256-i2FOAN1ng3WNOWaFowiSSuYR4LA1Bo3tjkvgcClBXSU="; doCheck = false; From 6c000f4835b8cc9f9f600d1f99ba4a1fa20e427d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 6 Dec 2021 07:03:08 +0000 Subject: [PATCH 02/72] calc: 2.13.0.1 -> 2.14.0.8 --- pkgs/applications/science/math/calc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/calc/default.nix b/pkgs/applications/science/math/calc/default.nix index f209e2de8c3e..6b3dba0340fb 100644 --- a/pkgs/applications/science/math/calc/default.nix +++ b/pkgs/applications/science/math/calc/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "calc"; - version = "2.13.0.1"; + version = "2.14.0.8"; src = fetchurl { urls = [ "https://github.com/lcn2/calc/releases/download/${version}/${pname}-${version}.tar.bz2" "http://www.isthe.com/chongo/src/calc/${pname}-${version}.tar.bz2" ]; - sha256 = "sha256-auU49XeFxXAacBEszwB6tVU6vTMq4t6q2vVk9AHHNK0="; + sha256 = "sha256-rWosRO7qfgbvylOE8Qf/rudWRAenR0181JKKU7Gig4Y="; }; postPatch = '' From b1675725b0085c6dcc5a52b1404774290938c8f3 Mon Sep 17 00:00:00 2001 From: Bryan Hyshka Date: Thu, 25 Nov 2021 08:12:03 -0700 Subject: [PATCH 03/72] psitransfer: init at 2.0.1 Add new package psitransfer, a nodejs file-sharing web app. Issue: #123383 --- pkgs/servers/psitransfer/default.nix | 42 + pkgs/servers/psitransfer/generate.sh | 10 + pkgs/servers/psitransfer/node-composition.nix | 17 + pkgs/servers/psitransfer/node-packages.json | 3 + pkgs/servers/psitransfer/node-packages.nix | 1713 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 6 files changed, 1787 insertions(+) create mode 100644 pkgs/servers/psitransfer/default.nix create mode 100755 pkgs/servers/psitransfer/generate.sh create mode 100644 pkgs/servers/psitransfer/node-composition.nix create mode 100644 pkgs/servers/psitransfer/node-packages.json create mode 100644 pkgs/servers/psitransfer/node-packages.nix diff --git a/pkgs/servers/psitransfer/default.nix b/pkgs/servers/psitransfer/default.nix new file mode 100644 index 000000000000..d1d1e13d1b83 --- /dev/null +++ b/pkgs/servers/psitransfer/default.nix @@ -0,0 +1,42 @@ +# To update package version: +# 1. Change version string in node-package.json and this file +# 2. Run `./generate.sh` to rebuild node dependencies with node2nix +# 3. Build this package `nix-build -A psitransfer` +# 4. Profit + +{ stdenv +, pkgs +, lib +, nodejs +, fetchzip +}: + +let + nodePackages = import ./node-composition.nix { + inherit pkgs nodejs; + inherit (stdenv.hostPlatform) system; + }; + + psitransfer = lib.head (lib.attrValues nodePackages); + + combined = psitransfer.override rec { + # version is not defined in source package.json + # version must also be maintained in node-packages.json for node2nix + version = "2.0.1"; + + # override node2nix package src to pull pre-built release of same version + src = fetchzip { + url = "https://github.com/psi-4ward/psitransfer/releases/download/v${version}/psitransfer-v${version}.tar.gz"; + sha256 = "mfldWTVmfcIRa+1g8YDnQqem5YmrFRfCxJoitWcXvns="; + stripRoot = false; + }; + + meta = with lib; { + homepage = "https://github.com/psi-4ward/psitransfer"; + description = "Simple open source self-hosted file sharing solution"; + license = licenses.bsd2; + maintainers = with maintainers; [ hyshka ]; + }; + }; +in + combined diff --git a/pkgs/servers/psitransfer/generate.sh b/pkgs/servers/psitransfer/generate.sh new file mode 100755 index 000000000000..9bf90a5f0096 --- /dev/null +++ b/pkgs/servers/psitransfer/generate.sh @@ -0,0 +1,10 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p nodePackages.node2nix +set -euo pipefail + +node2nix \ + --input node-packages.json \ + --output node-packages.nix \ + --composition node-composition.nix \ + --node-env ../../development/node-packages/node-env.nix \ + ; diff --git a/pkgs/servers/psitransfer/node-composition.nix b/pkgs/servers/psitransfer/node-composition.nix new file mode 100644 index 000000000000..749d685105d5 --- /dev/null +++ b/pkgs/servers/psitransfer/node-composition.nix @@ -0,0 +1,17 @@ +# This file has been generated by node2nix 1.9.0. Do not edit! + +{pkgs ? import { + inherit system; + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: + +let + nodeEnv = import ../../development/node-packages/node-env.nix { + inherit (pkgs) stdenv lib python2 runCommand writeTextFile writeShellScript; + inherit pkgs nodejs; + libtool = if pkgs.stdenv.isDarwin then pkgs.darwin.cctools else null; + }; +in +import ./node-packages.nix { + inherit (pkgs) fetchurl nix-gitignore stdenv lib fetchgit; + inherit nodeEnv; +} diff --git a/pkgs/servers/psitransfer/node-packages.json b/pkgs/servers/psitransfer/node-packages.json new file mode 100644 index 000000000000..eb5d92754750 --- /dev/null +++ b/pkgs/servers/psitransfer/node-packages.json @@ -0,0 +1,3 @@ +[ + { "psitransfer": "git+https://github.com/psi-4ward/psitransfer#v2.0.1" } +] diff --git a/pkgs/servers/psitransfer/node-packages.nix b/pkgs/servers/psitransfer/node-packages.nix new file mode 100644 index 000000000000..7453a4ff1b8a --- /dev/null +++ b/pkgs/servers/psitransfer/node-packages.nix @@ -0,0 +1,1713 @@ +# This file has been generated by node2nix 1.9.0. Do not edit! + +{nodeEnv, fetchurl, fetchgit, nix-gitignore, stdenv, lib, globalBuildInputs ? []}: + +let + sources = { + "@babel/helper-validator-identifier-7.15.7" = { + name = "_at_babel_slash_helper-validator-identifier"; + packageName = "@babel/helper-validator-identifier"; + version = "7.15.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz"; + sha512 = "K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w=="; + }; + }; + "@babel/parser-7.16.4" = { + name = "_at_babel_slash_parser"; + packageName = "@babel/parser"; + version = "7.16.4"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.4.tgz"; + sha512 = "6V0qdPUaiVHH3RtZeLIsc+6pDhbYzHR8ogA8w+f+Wc77DuXto19g2QUwveINoS34Uw+W8/hQDGJCx+i4n7xcng=="; + }; + }; + "@babel/types-7.16.0" = { + name = "_at_babel_slash_types"; + packageName = "@babel/types"; + version = "7.16.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/types/-/types-7.16.0.tgz"; + sha512 = "PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg=="; + }; + }; + "accepts-1.3.7" = { + name = "accepts"; + packageName = "accepts"; + version = "1.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/accepts/-/accepts-1.3.7.tgz"; + sha512 = "Il80Qs2WjYlJIBNzNkK6KYqlVMTbZLXgHx2oT0pU/fjRHyEp+PEfEPY0R3WCwAGVOtauxh1hOxNgIf5bv7dQpA=="; + }; + }; + "acorn-7.4.1" = { + name = "acorn"; + packageName = "acorn"; + version = "7.4.1"; + src = fetchurl { + url = "https://registry.npmjs.org/acorn/-/acorn-7.4.1.tgz"; + sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; + }; + }; + "any-promise-1.3.0" = { + name = "any-promise"; + packageName = "any-promise"; + version = "1.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz"; + sha1 = "abc6afeedcea52e809cdc0376aed3ce39635d17f"; + }; + }; + "archiver-4.0.2" = { + name = "archiver"; + packageName = "archiver"; + version = "4.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/archiver/-/archiver-4.0.2.tgz"; + sha512 = "B9IZjlGwaxF33UN4oPbfBkyA4V1SxNLeIhR1qY8sRXSsbdUkEHrrOvwlYFPx+8uQeCe9M+FG6KgO+imDmQ79CQ=="; + }; + }; + "archiver-utils-2.1.0" = { + name = "archiver-utils"; + packageName = "archiver-utils"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/archiver-utils/-/archiver-utils-2.1.0.tgz"; + sha512 = "bEL/yUb/fNNiNTuUz979Z0Yg5L+LzLxGJz8x79lYmR54fmTIb6ob/hNQgkQnIUDWIFjZVQwl9Xs356I6BAMHfw=="; + }; + }; + "array-flatten-1.1.1" = { + name = "array-flatten"; + packageName = "array-flatten"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz"; + sha1 = "9a5f699051b1e7073328f2a008968b64ea2955d2"; + }; + }; + "asap-2.0.6" = { + name = "asap"; + packageName = "asap"; + version = "2.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz"; + sha1 = "e50347611d7e690943208bbdafebcbc2fb866d46"; + }; + }; + "assert-never-1.2.1" = { + name = "assert-never"; + packageName = "assert-never"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/assert-never/-/assert-never-1.2.1.tgz"; + sha512 = "TaTivMB6pYI1kXwrFlEhLeGfOqoDNdTxjCdwRfFFkEA30Eu+k48W34nlok2EYWJfFFzqaEmichdNM7th6M5HNw=="; + }; + }; + "async-3.2.2" = { + name = "async"; + packageName = "async"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/async/-/async-3.2.2.tgz"; + sha512 = "H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g=="; + }; + }; + "axios-0.21.4" = { + name = "axios"; + packageName = "axios"; + version = "0.21.4"; + src = fetchurl { + url = "https://registry.npmjs.org/axios/-/axios-0.21.4.tgz"; + sha512 = "ut5vewkiu8jjGBdqpM44XxjuCjq9LAKeHVmoVfHVzy8eHgxxq8SbAVQNovDA8mVi05kP0Ea/n/UzcSHcTJQfNg=="; + }; + }; + "babel-walk-3.0.0-canary-5" = { + name = "babel-walk"; + packageName = "babel-walk"; + version = "3.0.0-canary-5"; + src = fetchurl { + url = "https://registry.npmjs.org/babel-walk/-/babel-walk-3.0.0-canary-5.tgz"; + sha512 = "GAwkz0AihzY5bkwIY5QDR+LvsRQgB/B+1foMPvi0FZPMl5fjD7ICiznUiBdLYMH1QYe6vqu4gWYytZOccLouFw=="; + }; + }; + "balanced-match-1.0.2" = { + name = "balanced-match"; + packageName = "balanced-match"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz"; + sha512 = "3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="; + }; + }; + "base64-js-1.5.1" = { + name = "base64-js"; + packageName = "base64-js"; + version = "1.5.1"; + src = fetchurl { + url = "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz"; + sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; + }; + }; + "basic-auth-2.0.1" = { + name = "basic-auth"; + packageName = "basic-auth"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz"; + sha512 = "NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg=="; + }; + }; + "bl-4.1.0" = { + name = "bl"; + packageName = "bl"; + version = "4.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bl/-/bl-4.1.0.tgz"; + sha512 = "1W07cM9gS6DcLperZfFSj+bWLtaPGSOHWhPiGzXmvVJbRLdG82sH/Kn8EtW1VqWVA54AKf2h5k5BbnIbwF3h6w=="; + }; + }; + "body-parser-1.19.0" = { + name = "body-parser"; + packageName = "body-parser"; + version = "1.19.0"; + src = fetchurl { + url = "https://registry.npmjs.org/body-parser/-/body-parser-1.19.0.tgz"; + sha512 = "dhEPs72UPbDnAQJ9ZKMNTP6ptJaionhP5cBb541nXPlW60Jepo9RV/a4fX4XWW9CuFNK22krhrj1+rgzifNCsw=="; + }; + }; + "brace-expansion-1.1.11" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "1.1.11"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz"; + sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; + }; + }; + "buffer-5.7.1" = { + name = "buffer"; + packageName = "buffer"; + version = "5.7.1"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer/-/buffer-5.7.1.tgz"; + sha512 = "EHcyIPBQ4BSGlvjB16k5KgAJ27CIsHY/2JBmCRReo48y9rQ3MaUzWX3KVlBa4U7MyX02HdVj0K7C3WaB3ju7FQ=="; + }; + }; + "buffer-crc32-0.2.13" = { + name = "buffer-crc32"; + packageName = "buffer-crc32"; + version = "0.2.13"; + src = fetchurl { + url = "https://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.13.tgz"; + sha1 = "0d333e3f00eac50aa1454abd30ef8c2a5d9a7242"; + }; + }; + "bytes-3.0.0" = { + name = "bytes"; + packageName = "bytes"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.0.0.tgz"; + sha1 = "d32815404d689699f85a4ea4fa8755dd13a96048"; + }; + }; + "bytes-3.1.0" = { + name = "bytes"; + packageName = "bytes"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bytes/-/bytes-3.1.0.tgz"; + sha512 = "zauLjrfCG+xvoyaqLoV8bLVXXNGC4JqlxFCutSDWA6fJrTo2ZuvLYTqZ7aHBLZSMOopbzwv8f+wZcVzfVTI2Dg=="; + }; + }; + "call-bind-1.0.2" = { + name = "call-bind"; + packageName = "call-bind"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.2.tgz"; + sha512 = "7O+FbCihrB5WGbFYesctwmTKae6rOiIzmz1icreWJ+0aA7LJfuqhEso2T9ncpcFtzMQtzXf2QGGueWJGTYsqrA=="; + }; + }; + "character-parser-2.2.0" = { + name = "character-parser"; + packageName = "character-parser"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/character-parser/-/character-parser-2.2.0.tgz"; + sha1 = "c7ce28f36d4bcd9744e5ffc2c5fcde1c73261fc0"; + }; + }; + "common-streams-1.4.0" = { + name = "common-streams"; + packageName = "common-streams"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/common-streams/-/common-streams-1.4.0.tgz"; + sha1 = "0043ca286768582e701589c7ef42a5a33ff8937a"; + }; + }; + "compress-commons-3.0.0" = { + name = "compress-commons"; + packageName = "compress-commons"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/compress-commons/-/compress-commons-3.0.0.tgz"; + sha512 = "FyDqr8TKX5/X0qo+aVfaZ+PVmNJHJeckFBlq8jZGSJOgnynhfifoyl24qaqdUdDIBe0EVTHByN6NAkqYvE/2Xg=="; + }; + }; + "compressible-2.0.18" = { + name = "compressible"; + packageName = "compressible"; + version = "2.0.18"; + src = fetchurl { + url = "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz"; + sha512 = "AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg=="; + }; + }; + "compression-1.7.4" = { + name = "compression"; + packageName = "compression"; + version = "1.7.4"; + src = fetchurl { + url = "https://registry.npmjs.org/compression/-/compression-1.7.4.tgz"; + sha512 = "jaSIDzP9pZVS4ZfQ+TzvtiWhdpFhE2RDHz8QJkpX9SIpLq88VueF5jJw6t+6CUQcAoA6t+x89MLrWAqpfDE8iQ=="; + }; + }; + "concat-map-0.0.1" = { + name = "concat-map"; + packageName = "concat-map"; + version = "0.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }; + }; + "constantinople-4.0.1" = { + name = "constantinople"; + packageName = "constantinople"; + version = "4.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/constantinople/-/constantinople-4.0.1.tgz"; + sha512 = "vCrqcSIq4//Gx74TXXCGnHpulY1dskqLTFGDmhrGxzeXL8lF8kvXv6mpNWlJj1uD4DW23D4ljAqbY4RRaaUZIw=="; + }; + }; + "content-disposition-0.5.3" = { + name = "content-disposition"; + packageName = "content-disposition"; + version = "0.5.3"; + src = fetchurl { + url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.3.tgz"; + sha512 = "ExO0774ikEObIAEV9kDo50o+79VCUdEB6n6lzKgGwupcVeRlhrj3qGAfwq8G6uBJjkqLrhT0qEYFcWng8z1z0g=="; + }; + }; + "content-type-1.0.4" = { + name = "content-type"; + packageName = "content-type"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/content-type/-/content-type-1.0.4.tgz"; + sha512 = "hIP3EEPs8tB9AT1L+NUqtwOAps4mk2Zob89MWXMHjHWg9milF/j4osnnQLXBCBFBk/tvIG/tUc9mOUJiPBhPXA=="; + }; + }; + "cookie-0.4.0" = { + name = "cookie"; + packageName = "cookie"; + version = "0.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz"; + sha512 = "+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="; + }; + }; + "cookie-signature-1.0.6" = { + name = "cookie-signature"; + packageName = "cookie-signature"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; + sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; + }; + }; + "core-util-is-1.0.3" = { + name = "core-util-is"; + packageName = "core-util-is"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz"; + sha512 = "ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="; + }; + }; + "cors-2.8.5" = { + name = "cors"; + packageName = "cors"; + version = "2.8.5"; + src = fetchurl { + url = "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz"; + sha512 = "KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g=="; + }; + }; + "crc-3.8.0" = { + name = "crc"; + packageName = "crc"; + version = "3.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/crc/-/crc-3.8.0.tgz"; + sha512 = "iX3mfgcTMIq3ZKLIsVFAbv7+Mc10kxabAGQb8HvjA1o3T1PIYprbakQ65d3I+2HGHt6nSKkM9PYjgoJO2KcFBQ=="; + }; + }; + "crc32-stream-3.0.1" = { + name = "crc32-stream"; + packageName = "crc32-stream"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/crc32-stream/-/crc32-stream-3.0.1.tgz"; + sha512 = "mctvpXlbzsvK+6z8kJwSJ5crm7yBwrQMTybJzMw1O4lLGJqjlDCXY2Zw7KheiA6XBEcBmfLx1D88mjRGVJtY9w=="; + }; + }; + "crypto-js-4.1.1" = { + name = "crypto-js"; + packageName = "crypto-js"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/crypto-js/-/crypto-js-4.1.1.tgz"; + sha512 = "o2JlM7ydqd3Qk9CA0L4NL6mTzU2sdx96a+oOfPu8Mkl/PK51vSyoi8/rQ8NknZtk44vq15lmhAj9CIAGwgeWKw=="; + }; + }; + "debug-2.6.9" = { + name = "debug"; + packageName = "debug"; + version = "2.6.9"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz"; + sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; + }; + }; + "debug-3.1.0" = { + name = "debug"; + packageName = "debug"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz"; + sha512 = "OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g=="; + }; + }; + "debug-4.3.3" = { + name = "debug"; + packageName = "debug"; + version = "4.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz"; + sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q=="; + }; + }; + "depd-1.1.2" = { + name = "depd"; + packageName = "depd"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; + sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + }; + }; + "depd-2.0.0" = { + name = "depd"; + packageName = "depd"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"; + sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; + }; + }; + "destroy-1.0.4" = { + name = "destroy"; + packageName = "destroy"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; + sha1 = "978857442c44749e4206613e37946205826abd80"; + }; + }; + "doctypes-1.1.0" = { + name = "doctypes"; + packageName = "doctypes"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/doctypes/-/doctypes-1.1.0.tgz"; + sha1 = "ea80b106a87538774e8a3a4a5afe293de489e0a9"; + }; + }; + "ee-first-1.1.1" = { + name = "ee-first"; + packageName = "ee-first"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; + sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + }; + }; + "encodeurl-1.0.2" = { + name = "encodeurl"; + packageName = "encodeurl"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; + sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + }; + }; + "end-of-stream-1.4.4" = { + name = "end-of-stream"; + packageName = "end-of-stream"; + version = "1.4.4"; + src = fetchurl { + url = "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz"; + sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; + }; + }; + "escape-html-1.0.3" = { + name = "escape-html"; + packageName = "escape-html"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; + sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + }; + }; + "etag-1.8.1" = { + name = "etag"; + packageName = "etag"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; + sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + }; + }; + "express-4.17.1" = { + name = "express"; + packageName = "express"; + version = "4.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/express/-/express-4.17.1.tgz"; + sha512 = "mHJ9O79RqluphRrcw2X/GTh3k9tVv8YcoyY4Kkh4WDMUYKRZUq0h1o0w2rrrxBqM7VoeUVqgb27xlEMXTnYt4g=="; + }; + }; + "finalhandler-1.1.2" = { + name = "finalhandler"; + packageName = "finalhandler"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"; + sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; + }; + }; + "follow-redirects-1.14.5" = { + name = "follow-redirects"; + packageName = "follow-redirects"; + version = "1.14.5"; + src = fetchurl { + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.5.tgz"; + sha512 = "wtphSXy7d4/OR+MvIFbCVBDzZ5520qV8XfPklSN5QtxuMUJZ+b0Wnst1e1lCDocfzuCkHqj8k0FpZqO+UIaKNA=="; + }; + }; + "forwarded-0.2.0" = { + name = "forwarded"; + packageName = "forwarded"; + version = "0.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz"; + sha512 = "buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow=="; + }; + }; + "fresh-0.5.2" = { + name = "fresh"; + packageName = "fresh"; + version = "0.5.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; + sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + }; + }; + "fs-constants-1.0.0" = { + name = "fs-constants"; + packageName = "fs-constants"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-constants/-/fs-constants-1.0.0.tgz"; + sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; + }; + }; + "fs-extra-2.1.2" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-2.1.2.tgz"; + sha1 = "046c70163cef9aad46b0e4a7fa467fb22d71de35"; + }; + }; + "fs-promise-2.0.3" = { + name = "fs-promise"; + packageName = "fs-promise"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-promise/-/fs-promise-2.0.3.tgz"; + sha1 = "f64e4f854bcf689aa8bddcba268916db3db46854"; + }; + }; + "fs.realpath-1.0.0" = { + name = "fs.realpath"; + packageName = "fs.realpath"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; + sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + }; + }; + "function-bind-1.1.1" = { + name = "function-bind"; + packageName = "function-bind"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz"; + sha512 = "yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="; + }; + }; + "get-intrinsic-1.1.1" = { + name = "get-intrinsic"; + packageName = "get-intrinsic"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; + sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; + }; + }; + "glob-7.2.0" = { + name = "glob"; + packageName = "glob"; + version = "7.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-7.2.0.tgz"; + sha512 = "lmLf6gtyrPq8tTjSmrO94wBeQbFR3HbLHbuyD69wuyQkImp2hWqMGB47OX65FBkPffO641IP9jWa1z4ivqG26Q=="; + }; + }; + "graceful-fs-4.2.8" = { + name = "graceful-fs"; + packageName = "graceful-fs"; + version = "4.2.8"; + src = fetchurl { + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"; + sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; + }; + }; + "has-1.0.3" = { + name = "has"; + packageName = "has"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has/-/has-1.0.3.tgz"; + sha512 = "f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw=="; + }; + }; + "has-symbols-1.0.2" = { + name = "has-symbols"; + packageName = "has-symbols"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"; + sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; + }; + }; + "has-tostringtag-1.0.0" = { + name = "has-tostringtag"; + packageName = "has-tostringtag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.0.tgz"; + sha512 = "kFjcSNhnlGV1kyoGk7OXKSawH5JOb/LzUc5w9B02hOTO0dfFRjbHQKvg1d6cf3HbeUmtU9VbbV3qzZ2Teh97WQ=="; + }; + }; + "http-errors-1.7.2" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.7.2"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.2.tgz"; + sha512 = "uUQBt3H/cSIVfch6i1EuPNy/YsRSOUBXTVfZ+yR7Zjez3qjBz6i9+i4zjNaoqcoFVI4lQJ5plg63TvGfRSDCRg=="; + }; + }; + "http-errors-1.7.3" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.7.3"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.7.3.tgz"; + sha512 = "ZTTX0MWrsQ2ZAhA1cejAwDLycFsd7I7nVtnkT3Ol0aqodaKW+0CTZDQ1uBv5whptCnc8e8HeRRJxRs0kmm/Qfw=="; + }; + }; + "http-errors-1.8.1" = { + name = "http-errors"; + packageName = "http-errors"; + version = "1.8.1"; + src = fetchurl { + url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz"; + sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; + }; + }; + "iconv-lite-0.4.24" = { + name = "iconv-lite"; + packageName = "iconv-lite"; + version = "0.4.24"; + src = fetchurl { + url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz"; + sha512 = "v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA=="; + }; + }; + "ieee754-1.2.1" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"; + sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; + }; + }; + "inflight-1.0.6" = { + name = "inflight"; + packageName = "inflight"; + version = "1.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; + sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + }; + }; + "inherits-2.0.3" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; + sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + }; + }; + "inherits-2.0.4" = { + name = "inherits"; + packageName = "inherits"; + version = "2.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz"; + sha512 = "k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="; + }; + }; + "ipaddr.js-1.9.1" = { + name = "ipaddr.js"; + packageName = "ipaddr.js"; + version = "1.9.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz"; + sha512 = "0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g=="; + }; + }; + "is-core-module-2.8.0" = { + name = "is-core-module"; + packageName = "is-core-module"; + version = "2.8.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz"; + sha512 = "vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw=="; + }; + }; + "is-expression-4.0.0" = { + name = "is-expression"; + packageName = "is-expression"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-expression/-/is-expression-4.0.0.tgz"; + sha512 = "zMIXX63sxzG3XrkHkrAPvm/OVZVSCPNkwMHU8oTX7/U3AL78I0QXCEICXUM13BIa8TYGZ68PiTKfQz3yaTNr4A=="; + }; + }; + "is-promise-2.2.2" = { + name = "is-promise"; + packageName = "is-promise"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/is-promise/-/is-promise-2.2.2.tgz"; + sha512 = "+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ=="; + }; + }; + "is-regex-1.1.4" = { + name = "is-regex"; + packageName = "is-regex"; + version = "1.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/is-regex/-/is-regex-1.1.4.tgz"; + sha512 = "kvRdxDsxZjhzUX07ZnLydzS1TU/TJlTUHHY4YLL87e37oUA49DfkLqgy+VjFocowy29cKvcSiu+kIv728jTTVg=="; + }; + }; + "isarray-1.0.0" = { + name = "isarray"; + packageName = "isarray"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; + sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + }; + }; + "js-stringify-1.0.2" = { + name = "js-stringify"; + packageName = "js-stringify"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/js-stringify/-/js-stringify-1.0.2.tgz"; + sha1 = "1736fddfd9724f28a3682adc6230ae7e4e9679db"; + }; + }; + "jsonfile-2.4.0" = { + name = "jsonfile"; + packageName = "jsonfile"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"; + sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; + }; + }; + "jstransformer-1.0.0" = { + name = "jstransformer"; + packageName = "jstransformer"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/jstransformer/-/jstransformer-1.0.0.tgz"; + sha1 = "ed8bf0921e2f3f1ed4d5c1a44f68709ed24722c3"; + }; + }; + "lazystream-1.0.1" = { + name = "lazystream"; + packageName = "lazystream"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/lazystream/-/lazystream-1.0.1.tgz"; + sha512 = "b94GiNHQNy6JNTrt5w6zNyffMrNkXZb3KTkCZJb2V1xaEGCk093vkZ2jk3tpaeP33/OiXC+WvK9AxUebnf5nbw=="; + }; + }; + "lodash.defaults-4.2.0" = { + name = "lodash.defaults"; + packageName = "lodash.defaults"; + version = "4.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.defaults/-/lodash.defaults-4.2.0.tgz"; + sha1 = "d09178716ffea4dde9e5fb7b37f6f0802274580c"; + }; + }; + "lodash.difference-4.5.0" = { + name = "lodash.difference"; + packageName = "lodash.difference"; + version = "4.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.difference/-/lodash.difference-4.5.0.tgz"; + sha1 = "9ccb4e505d486b91651345772885a2df27fd017c"; + }; + }; + "lodash.flatten-4.4.0" = { + name = "lodash.flatten"; + packageName = "lodash.flatten"; + version = "4.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.flatten/-/lodash.flatten-4.4.0.tgz"; + sha1 = "f31c22225a9632d2bbf8e4addbef240aa765a61f"; + }; + }; + "lodash.isplainobject-4.0.6" = { + name = "lodash.isplainobject"; + packageName = "lodash.isplainobject"; + version = "4.0.6"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; + sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; + }; + }; + "lodash.union-4.6.0" = { + name = "lodash.union"; + packageName = "lodash.union"; + version = "4.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/lodash.union/-/lodash.union-4.6.0.tgz"; + sha1 = "48bb5088409f16f1821666641c44dd1aaae3cd88"; + }; + }; + "media-typer-0.3.0" = { + name = "media-typer"; + packageName = "media-typer"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; + sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + }; + }; + "merge-descriptors-1.0.1" = { + name = "merge-descriptors"; + packageName = "merge-descriptors"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; + sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + }; + }; + "meterstream-1.0.1" = { + name = "meterstream"; + packageName = "meterstream"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/meterstream/-/meterstream-1.0.1.tgz"; + sha1 = "12496f4bd4c5251c280545bb7303b07be0db8609"; + }; + }; + "method-override-3.0.0" = { + name = "method-override"; + packageName = "method-override"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/method-override/-/method-override-3.0.0.tgz"; + sha512 = "IJ2NNN/mSl9w3kzWB92rcdHpz+HjkxhDJWNDBqSlas+zQdP8wBiJzITPg08M/k2uVvMow7Sk41atndNtt/PHSA=="; + }; + }; + "methods-1.1.2" = { + name = "methods"; + packageName = "methods"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; + sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + }; + }; + "mime-1.6.0" = { + name = "mime"; + packageName = "mime"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz"; + sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; + }; + }; + "mime-db-1.51.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.51.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz"; + sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; + }; + }; + "mime-types-2.1.34" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.34"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz"; + sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; + }; + }; + "minimatch-3.0.4" = { + name = "minimatch"; + packageName = "minimatch"; + version = "3.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; + sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; + }; + }; + "morgan-1.10.0" = { + name = "morgan"; + packageName = "morgan"; + version = "1.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/morgan/-/morgan-1.10.0.tgz"; + sha512 = "AbegBVI4sh6El+1gNwvD5YIck7nSA36weD7xvIxG4in80j/UoK8AEGaWnnz8v1GxonMCltmlNs5ZKbGvl9b1XQ=="; + }; + }; + "ms-2.0.0" = { + name = "ms"; + packageName = "ms"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; + sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + }; + }; + "ms-2.1.1" = { + name = "ms"; + packageName = "ms"; + version = "2.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz"; + sha512 = "tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg=="; + }; + }; + "ms-2.1.2" = { + name = "ms"; + packageName = "ms"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz"; + sha512 = "sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="; + }; + }; + "mz-2.7.0" = { + name = "mz"; + packageName = "mz"; + version = "2.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz"; + sha512 = "z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q=="; + }; + }; + "negotiator-0.6.2" = { + name = "negotiator"; + packageName = "negotiator"; + version = "0.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.2.tgz"; + sha512 = "hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw=="; + }; + }; + "normalize-path-3.0.0" = { + name = "normalize-path"; + packageName = "normalize-path"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz"; + sha512 = "6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA=="; + }; + }; + "object-assign-4.1.1" = { + name = "object-assign"; + packageName = "object-assign"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; + sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + }; + }; + "on-finished-2.3.0" = { + name = "on-finished"; + packageName = "on-finished"; + version = "2.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; + sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + }; + }; + "on-headers-1.0.2" = { + name = "on-headers"; + packageName = "on-headers"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz"; + sha512 = "pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA=="; + }; + }; + "once-1.4.0" = { + name = "once"; + packageName = "once"; + version = "1.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; + sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + }; + }; + "parseurl-1.3.3" = { + name = "parseurl"; + packageName = "parseurl"; + version = "1.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz"; + sha512 = "CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ=="; + }; + }; + "path-is-absolute-1.0.1" = { + name = "path-is-absolute"; + packageName = "path-is-absolute"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; + sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + }; + }; + "path-parse-1.0.7" = { + name = "path-parse"; + packageName = "path-parse"; + version = "1.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz"; + sha512 = "LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="; + }; + }; + "path-to-regexp-0.1.7" = { + name = "path-to-regexp"; + packageName = "path-to-regexp"; + version = "0.1.7"; + src = fetchurl { + url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; + sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + }; + }; + "process-nextick-args-2.0.1" = { + name = "process-nextick-args"; + packageName = "process-nextick-args"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz"; + sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; + }; + }; + "promise-7.3.1" = { + name = "promise"; + packageName = "promise"; + version = "7.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz"; + sha512 = "nolQXZ/4L+bP/UGlkfaIujX9BKxGwmQ9OT4mOt5yvy8iK1h3wqTEJCijzGANTCCl9nWjY41juyAn2K3Q1hLLTg=="; + }; + }; + "proxy-addr-2.0.7" = { + name = "proxy-addr"; + packageName = "proxy-addr"; + version = "2.0.7"; + src = fetchurl { + url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz"; + sha512 = "llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg=="; + }; + }; + "pug-3.0.2" = { + name = "pug"; + packageName = "pug"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pug/-/pug-3.0.2.tgz"; + sha512 = "bp0I/hiK1D1vChHh6EfDxtndHji55XP/ZJKwsRqrz6lRia6ZC2OZbdAymlxdVFwd1L70ebrVJw4/eZ79skrIaw=="; + }; + }; + "pug-attrs-3.0.0" = { + name = "pug-attrs"; + packageName = "pug-attrs"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-attrs/-/pug-attrs-3.0.0.tgz"; + sha512 = "azINV9dUtzPMFQktvTXciNAfAuVh/L/JCl0vtPCwvOA21uZrC08K/UnmrL+SXGEVc1FwzjW62+xw5S/uaLj6cA=="; + }; + }; + "pug-code-gen-3.0.2" = { + name = "pug-code-gen"; + packageName = "pug-code-gen"; + version = "3.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-code-gen/-/pug-code-gen-3.0.2.tgz"; + sha512 = "nJMhW16MbiGRiyR4miDTQMRWDgKplnHyeLvioEJYbk1RsPI3FuA3saEP8uwnTb2nTJEKBU90NFVWJBk4OU5qyg=="; + }; + }; + "pug-error-2.0.0" = { + name = "pug-error"; + packageName = "pug-error"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-error/-/pug-error-2.0.0.tgz"; + sha512 = "sjiUsi9M4RAGHktC1drQfCr5C5eriu24Lfbt4s+7SykztEOwVZtbFk1RRq0tzLxcMxMYTBR+zMQaG07J/btayQ=="; + }; + }; + "pug-filters-4.0.0" = { + name = "pug-filters"; + packageName = "pug-filters"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-filters/-/pug-filters-4.0.0.tgz"; + sha512 = "yeNFtq5Yxmfz0f9z2rMXGw/8/4i1cCFecw/Q7+D0V2DdtII5UvqE12VaZ2AY7ri6o5RNXiweGH79OCq+2RQU4A=="; + }; + }; + "pug-lexer-5.0.1" = { + name = "pug-lexer"; + packageName = "pug-lexer"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-lexer/-/pug-lexer-5.0.1.tgz"; + sha512 = "0I6C62+keXlZPZkOJeVam9aBLVP2EnbeDw3An+k0/QlqdwH6rv8284nko14Na7c0TtqtogfWXcRoFE4O4Ff20w=="; + }; + }; + "pug-linker-4.0.0" = { + name = "pug-linker"; + packageName = "pug-linker"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-linker/-/pug-linker-4.0.0.tgz"; + sha512 = "gjD1yzp0yxbQqnzBAdlhbgoJL5qIFJw78juN1NpTLt/mfPJ5VgC4BvkoD3G23qKzJtIIXBbcCt6FioLSFLOHdw=="; + }; + }; + "pug-load-3.0.0" = { + name = "pug-load"; + packageName = "pug-load"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-load/-/pug-load-3.0.0.tgz"; + sha512 = "OCjTEnhLWZBvS4zni/WUMjH2YSUosnsmjGBB1An7CsKQarYSWQ0GCVyd4eQPMFJqZ8w9xgs01QdiZXKVjk92EQ=="; + }; + }; + "pug-parser-6.0.0" = { + name = "pug-parser"; + packageName = "pug-parser"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-parser/-/pug-parser-6.0.0.tgz"; + sha512 = "ukiYM/9cH6Cml+AOl5kETtM9NR3WulyVP2y4HOU45DyMim1IeP/OOiyEWRr6qk5I5klpsBnbuHpwKmTx6WURnw=="; + }; + }; + "pug-runtime-3.0.1" = { + name = "pug-runtime"; + packageName = "pug-runtime"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-runtime/-/pug-runtime-3.0.1.tgz"; + sha512 = "L50zbvrQ35TkpHwv0G6aLSuueDRwc/97XdY8kL3tOT0FmhgG7UypU3VztfV/LATAvmUfYi4wNxSajhSAeNN+Kg=="; + }; + }; + "pug-strip-comments-2.0.0" = { + name = "pug-strip-comments"; + packageName = "pug-strip-comments"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-strip-comments/-/pug-strip-comments-2.0.0.tgz"; + sha512 = "zo8DsDpH7eTkPHCXFeAk1xZXJbyoTfdPlNR0bK7rpOMuhBYb0f5qUVCO1xlsitYd3w5FQTK7zpNVKb3rZoUrrQ=="; + }; + }; + "pug-walk-2.0.0" = { + name = "pug-walk"; + packageName = "pug-walk"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pug-walk/-/pug-walk-2.0.0.tgz"; + sha512 = "yYELe9Q5q9IQhuvqsZNwA5hfPkMJ8u92bQLIMcsMxf/VADjNtEYptU+inlufAFYcWdHlwNfZOEnOOQrZrcyJCQ=="; + }; + }; + "qs-6.7.0" = { + name = "qs"; + packageName = "qs"; + version = "6.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qs/-/qs-6.7.0.tgz"; + sha512 = "VCdBRNFTX1fyE7Nb6FYoURo/SPe62QCaAyzJvUjwRaIsc+NePBEniHlvxFmmX56+HZphIGtV0XeCirBtpDrTyQ=="; + }; + }; + "range-parser-1.2.1" = { + name = "range-parser"; + packageName = "range-parser"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz"; + sha512 = "Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg=="; + }; + }; + "raw-body-2.4.0" = { + name = "raw-body"; + packageName = "raw-body"; + version = "2.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/raw-body/-/raw-body-2.4.0.tgz"; + sha512 = "4Oz8DUIwdvoa5qMJelxipzi/iJIi40O5cGV1wNYp5hvZP8ZN0T+jiNkL0QepXs+EsQ9XJ8ipEDoiH70ySUJP3Q=="; + }; + }; + "readable-stream-2.3.7" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "2.3.7"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz"; + sha512 = "Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw=="; + }; + }; + "readable-stream-3.6.0" = { + name = "readable-stream"; + packageName = "readable-stream"; + version = "3.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.0.tgz"; + sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; + }; + }; + "resolve-1.20.0" = { + name = "resolve"; + packageName = "resolve"; + version = "1.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz"; + sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A=="; + }; + }; + "safe-buffer-5.1.2" = { + name = "safe-buffer"; + packageName = "safe-buffer"; + version = "5.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + }; + "safer-buffer-2.1.2" = { + name = "safer-buffer"; + packageName = "safer-buffer"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz"; + sha512 = "YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="; + }; + }; + "send-0.17.1" = { + name = "send"; + packageName = "send"; + version = "0.17.1"; + src = fetchurl { + url = "https://registry.npmjs.org/send/-/send-0.17.1.tgz"; + sha512 = "BsVKsiGcQMFwT8UxypobUKyv7irCNRHk1T0G680vk88yf6LBByGcZJOTJCrTP2xVN6yI+XjPJcNuE3V4fT9sAg=="; + }; + }; + "serve-static-1.14.1" = { + name = "serve-static"; + packageName = "serve-static"; + version = "1.14.1"; + src = fetchurl { + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.1.tgz"; + sha512 = "JMrvUwE54emCYWlTI+hGrGv5I8dEwmco/00EvkzIIsR7MqrHonbD9pO2MOfFnpFntl7ecpZs+3mW+XbQZu9QCg=="; + }; + }; + "setprototypeof-1.1.1" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.1.tgz"; + sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; + }; + }; + "setprototypeof-1.2.0" = { + name = "setprototypeof"; + packageName = "setprototypeof"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz"; + sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; + }; + }; + "statuses-1.5.0" = { + name = "statuses"; + packageName = "statuses"; + version = "1.5.0"; + src = fetchurl { + url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; + sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + }; + }; + "string_decoder-1.1.1" = { + name = "string_decoder"; + packageName = "string_decoder"; + version = "1.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz"; + sha512 = "n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg=="; + }; + }; + "tar-stream-2.2.0" = { + name = "tar-stream"; + packageName = "tar-stream"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tar-stream/-/tar-stream-2.2.0.tgz"; + sha512 = "ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ=="; + }; + }; + "thenify-3.3.1" = { + name = "thenify"; + packageName = "thenify"; + version = "3.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz"; + sha512 = "RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw=="; + }; + }; + "thenify-all-1.6.0" = { + name = "thenify-all"; + packageName = "thenify-all"; + version = "1.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz"; + sha1 = "1a1918d402d8fc3f98fbf234db0bcc8cc10e9726"; + }; + }; + "to-fast-properties-2.0.0" = { + name = "to-fast-properties"; + packageName = "to-fast-properties"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; + sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + }; + }; + "to-object-reducer-1.0.1" = { + name = "to-object-reducer"; + packageName = "to-object-reducer"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/to-object-reducer/-/to-object-reducer-1.0.1.tgz"; + sha1 = "82445234ff5edc4c00ad4211aa59f96f12354f84"; + }; + }; + "toidentifier-1.0.0" = { + name = "toidentifier"; + packageName = "toidentifier"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.0.tgz"; + sha512 = "yaOH/Pk/VEhBWWTlhI+qXxDFXlejDGcQipMlyxda9nthulaxLZUNcUqFxokp0vcYnvteJln5FNQDRrxj3YcbVw=="; + }; + }; + "toidentifier-1.0.1" = { + name = "toidentifier"; + packageName = "toidentifier"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz"; + sha512 = "o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA=="; + }; + }; + "token-stream-1.0.0" = { + name = "token-stream"; + packageName = "token-stream"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/token-stream/-/token-stream-1.0.0.tgz"; + sha1 = "cc200eab2613f4166d27ff9afc7ca56d49df6eb4"; + }; + }; + "type-is-1.6.18" = { + name = "type-is"; + packageName = "type-is"; + version = "1.6.18"; + src = fetchurl { + url = "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz"; + sha512 = "TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g=="; + }; + }; + "unpipe-1.0.0" = { + name = "unpipe"; + packageName = "unpipe"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; + sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + }; + }; + "util-deprecate-1.0.2" = { + name = "util-deprecate"; + packageName = "util-deprecate"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; + sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + }; + }; + "utils-merge-1.0.1" = { + name = "utils-merge"; + packageName = "utils-merge"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; + sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + }; + }; + "uuid-8.3.2" = { + name = "uuid"; + packageName = "uuid"; + version = "8.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz"; + sha512 = "+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg=="; + }; + }; + "vary-1.1.2" = { + name = "vary"; + packageName = "vary"; + version = "1.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; + sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + }; + }; + "void-elements-3.1.0" = { + name = "void-elements"; + packageName = "void-elements"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/void-elements/-/void-elements-3.1.0.tgz"; + sha1 = "614f7fbf8d801f0bb5f0661f5b2f5785750e4f09"; + }; + }; + "with-7.0.2" = { + name = "with"; + packageName = "with"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/with/-/with-7.0.2.tgz"; + sha512 = "RNGKj82nUPg3g5ygxkQl0R937xLyho1J24ItRCBTr/m1YnZkzJy1hUiHUJrc/VlsDQzsCnInEGSg3bci0Lmd4w=="; + }; + }; + "wrappy-1.0.2" = { + name = "wrappy"; + packageName = "wrappy"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; + sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + }; + }; + "zip-stream-3.0.1" = { + name = "zip-stream"; + packageName = "zip-stream"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/zip-stream/-/zip-stream-3.0.1.tgz"; + sha512 = "r+JdDipt93ttDjsOVPU5zaq5bAyY+3H19bDrThkvuVxC0xMQzU1PJcS6D+KrP3u96gH9XLomcHPb+2skoDjulQ=="; + }; + }; + }; +in +{ + "psitransfer-git+https://github.com/psi-4ward/psitransfer#v2.0.1" = nodeEnv.buildNodePackage { + name = "psitransfer"; + packageName = "psitransfer"; + version = "0.0.0"; + src = fetchgit { + url = "https://github.com/psi-4ward/psitransfer"; + rev = "5647f041302af9f4c7e5fca48b4c663eac72712d"; + sha256 = "2421deb23c075381476ff3bd3216ac26610a2b403b02e82d47ac214cb4f8dbe2"; + }; + dependencies = [ + sources."@babel/helper-validator-identifier-7.15.7" + sources."@babel/parser-7.16.4" + sources."@babel/types-7.16.0" + sources."accepts-1.3.7" + sources."acorn-7.4.1" + sources."any-promise-1.3.0" + sources."archiver-4.0.2" + (sources."archiver-utils-2.1.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + ]; + }) + sources."array-flatten-1.1.1" + sources."asap-2.0.6" + sources."assert-never-1.2.1" + sources."async-3.2.2" + sources."axios-0.21.4" + sources."babel-walk-3.0.0-canary-5" + sources."balanced-match-1.0.2" + sources."base64-js-1.5.1" + sources."basic-auth-2.0.1" + sources."bl-4.1.0" + (sources."body-parser-1.19.0" // { + dependencies = [ + sources."bytes-3.1.0" + sources."debug-2.6.9" + sources."http-errors-1.7.2" + sources."inherits-2.0.3" + ]; + }) + sources."brace-expansion-1.1.11" + sources."buffer-5.7.1" + sources."buffer-crc32-0.2.13" + sources."bytes-3.0.0" + sources."call-bind-1.0.2" + sources."character-parser-2.2.0" + sources."common-streams-1.4.0" + (sources."compress-commons-3.0.0" // { + dependencies = [ + sources."readable-stream-2.3.7" + ]; + }) + sources."compressible-2.0.18" + (sources."compression-1.7.4" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."concat-map-0.0.1" + sources."constantinople-4.0.1" + sources."content-disposition-0.5.3" + sources."content-type-1.0.4" + sources."cookie-0.4.0" + sources."cookie-signature-1.0.6" + sources."core-util-is-1.0.3" + sources."cors-2.8.5" + sources."crc-3.8.0" + sources."crc32-stream-3.0.1" + sources."crypto-js-4.1.1" + (sources."debug-4.3.3" // { + dependencies = [ + sources."ms-2.1.2" + ]; + }) + sources."depd-1.1.2" + sources."destroy-1.0.4" + sources."doctypes-1.1.0" + sources."ee-first-1.1.1" + sources."encodeurl-1.0.2" + sources."end-of-stream-1.4.4" + sources."escape-html-1.0.3" + sources."etag-1.8.1" + (sources."express-4.17.1" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + (sources."finalhandler-1.1.2" // { + dependencies = [ + sources."debug-2.6.9" + ]; + }) + sources."follow-redirects-1.14.5" + sources."forwarded-0.2.0" + sources."fresh-0.5.2" + sources."fs-constants-1.0.0" + sources."fs-extra-2.1.2" + sources."fs-promise-2.0.3" + sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" + sources."get-intrinsic-1.1.1" + sources."glob-7.2.0" + sources."graceful-fs-4.2.8" + sources."has-1.0.3" + sources."has-symbols-1.0.2" + sources."has-tostringtag-1.0.0" + (sources."http-errors-1.8.1" // { + dependencies = [ + sources."setprototypeof-1.2.0" + sources."toidentifier-1.0.1" + ]; + }) + sources."iconv-lite-0.4.24" + sources."ieee754-1.2.1" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ipaddr.js-1.9.1" + sources."is-core-module-2.8.0" + sources."is-expression-4.0.0" + sources."is-promise-2.2.2" + sources."is-regex-1.1.4" + sources."isarray-1.0.0" + sources."js-stringify-1.0.2" + sources."jsonfile-2.4.0" + sources."jstransformer-1.0.0" + (sources."lazystream-1.0.1" // { + dependencies = [ + sources."readable-stream-2.3.7" + ]; + }) + sources."lodash.defaults-4.2.0" + sources."lodash.difference-4.5.0" + sources."lodash.flatten-4.4.0" + sources."lodash.isplainobject-4.0.6" + sources."lodash.union-4.6.0" + sources."media-typer-0.3.0" + sources."merge-descriptors-1.0.1" + sources."meterstream-1.0.1" + (sources."method-override-3.0.0" // { + dependencies = [ + sources."debug-3.1.0" + ]; + }) + sources."methods-1.1.2" + sources."mime-1.6.0" + sources."mime-db-1.51.0" + sources."mime-types-2.1.34" + sources."minimatch-3.0.4" + (sources."morgan-1.10.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."depd-2.0.0" + ]; + }) + sources."ms-2.0.0" + sources."mz-2.7.0" + sources."negotiator-0.6.2" + sources."normalize-path-3.0.0" + sources."object-assign-4.1.1" + sources."on-finished-2.3.0" + sources."on-headers-1.0.2" + sources."once-1.4.0" + sources."parseurl-1.3.3" + sources."path-is-absolute-1.0.1" + sources."path-parse-1.0.7" + sources."path-to-regexp-0.1.7" + sources."process-nextick-args-2.0.1" + sources."promise-7.3.1" + sources."proxy-addr-2.0.7" + sources."pug-3.0.2" + sources."pug-attrs-3.0.0" + sources."pug-code-gen-3.0.2" + sources."pug-error-2.0.0" + sources."pug-filters-4.0.0" + sources."pug-lexer-5.0.1" + sources."pug-linker-4.0.0" + sources."pug-load-3.0.0" + sources."pug-parser-6.0.0" + sources."pug-runtime-3.0.1" + sources."pug-strip-comments-2.0.0" + sources."pug-walk-2.0.0" + sources."qs-6.7.0" + sources."range-parser-1.2.1" + (sources."raw-body-2.4.0" // { + dependencies = [ + sources."bytes-3.1.0" + sources."http-errors-1.7.2" + sources."inherits-2.0.3" + ]; + }) + sources."readable-stream-3.6.0" + sources."resolve-1.20.0" + sources."safe-buffer-5.1.2" + sources."safer-buffer-2.1.2" + (sources."send-0.17.1" // { + dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) + sources."http-errors-1.7.3" + sources."ms-2.1.1" + ]; + }) + sources."serve-static-1.14.1" + sources."setprototypeof-1.1.1" + sources."statuses-1.5.0" + sources."string_decoder-1.1.1" + sources."tar-stream-2.2.0" + sources."thenify-3.3.1" + sources."thenify-all-1.6.0" + sources."to-fast-properties-2.0.0" + sources."to-object-reducer-1.0.1" + sources."toidentifier-1.0.0" + sources."token-stream-1.0.0" + sources."type-is-1.6.18" + sources."unpipe-1.0.0" + sources."util-deprecate-1.0.2" + sources."utils-merge-1.0.1" + sources."uuid-8.3.2" + sources."vary-1.1.2" + sources."void-elements-3.1.0" + sources."with-7.0.2" + sources."wrappy-1.0.2" + sources."zip-stream-3.0.1" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Simple open source self-hosted file sharing solution"; + license = "BSD-2-Clause"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7655339b5813..25770cebd14c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8681,6 +8681,8 @@ with pkgs; plex = callPackage ../servers/plex { }; plexRaw = callPackage ../servers/plex/raw.nix { }; + psitransfer = callPackage ../servers/psitransfer { }; + tab = callPackage ../tools/text/tab { }; tabview = with python3Packages; toPythonApplication tabview; From 4251a340e0c4ba0b1126a15bd3dfd62d228c9fec Mon Sep 17 00:00:00 2001 From: rewine Date: Fri, 3 Dec 2021 01:38:14 +0800 Subject: [PATCH 04/72] cpeditor: init at 6.10.1 --- .../applications/editors/cpeditor/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/applications/editors/cpeditor/default.nix diff --git a/pkgs/applications/editors/cpeditor/default.nix b/pkgs/applications/editors/cpeditor/default.nix new file mode 100644 index 000000000000..74394418fd53 --- /dev/null +++ b/pkgs/applications/editors/cpeditor/default.nix @@ -0,0 +1,40 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, qtbase +, qttools +, wrapQtAppsHook +, cmake +, ninja +, python3 +, runtimeShell +}: + +stdenv.mkDerivation rec { + pname = "cpeditor"; + version = "6.10.1"; + + src = fetchFromGitHub { + owner = "cpeditor"; + repo = "cpeditor"; + rev = version; + sha256 = "sha256-SIREoOapaZTLtqi0Z07lKmNqF9a9qIpgGxuhqaY3yfU="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ cmake ninja pkg-config wrapQtAppsHook python3 ]; + buildInputs = [ qtbase qttools ]; + + postPatch = '' + substituteInPlace src/Core/Runner.cpp --replace "/bin/bash" "${runtimeShell}" + ''; + + meta = with lib; { + description = "An IDE specially designed for competitive programming"; + homepage = "https://cpeditor.org"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ rewine ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b264c9b828fd..3496695afe2c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -24505,6 +24505,8 @@ with pkgs; ffmpeg = ffmpeg-full; }; + cpeditor = libsForQt515.callPackage ../applications/editors/cpeditor { }; + csa = callPackage ../applications/audio/csa { }; csound = callPackage ../applications/audio/csound { }; From fd5bbfd0b7977fb9a6aaf2bacae6a69082a48de2 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 30 Oct 2021 19:25:29 +0200 Subject: [PATCH 05/72] ocamlPackages.lwt: switch to fetchFromGitHub --- pkgs/development/ocaml-modules/lwt/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index be15d2b72a54..76e973a813e4 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchzip, pkg-config, ncurses, libev, buildDunePackage, ocaml +{ lib, fetchFromGitHub, pkg-config, ncurses, libev, buildDunePackage, ocaml , cppo, dune-configurator, ocplib-endian, result , mmap, seq , ocaml-syntax-shims @@ -12,9 +12,11 @@ buildDunePackage rec { useDune2 = true; - src = fetchzip { - url = "https://github.com/ocsigen/${pname}/archive/${version}.tar.gz"; - sha256 = "0cq2qy23sa1a5zk6nja3c652mp29i84yfrkcwks6i8sdqwli36jy"; + src = fetchFromGitHub { + owner = "ocsigen"; + repo = "lwt"; + rev = version; + sha256 = "sha256-XpoRKcdNo2j05Gxm5wmKSdwqimFDSWvmLyooPYTHAjM="; }; nativeBuildInputs = [ pkg-config cppo dune-configurator ]; From 708fff241a4c1ee897130fdfdced786c199f6b4a Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 30 Oct 2021 22:50:11 +0200 Subject: [PATCH 06/72] ocamlPackages.javalib: switch to fetchFromGitHub --- .../ocaml-modules/javalib/default.nix | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix index 15678f89da3c..78b61de8d9c1 100644 --- a/pkgs/development/ocaml-modules/javalib/default.nix +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -1,5 +1,11 @@ -{ lib, stdenv, fetchzip, which, ocaml, findlib -, camlzip, extlib +{ lib +, stdenv +, fetchFromGitHub +, which +, ocaml +, findlib +, camlzip +, extlib }: if !lib.versionAtLeast ocaml.version "4.04" @@ -7,12 +13,14 @@ then throw "javalib is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-javalib-${version}"; + pname = "ocaml${ocaml.version}-javalib"; version = "3.2.1"; - src = fetchzip { - url = "https://github.com/javalib-team/javalib/archive/v${version}.tar.gz"; - sha256 = "1fkdaiiza145yv0r1cm0n2hsrr0rbn6b27vs66njgv405zwn3vbn"; + src = fetchFromGitHub { + owner = "javalib-team"; + repo = "javalib"; + rev = "v${version}"; + sha256 = "sha256-du1h+S+A7CetMXofsYxdGeSsobCgspDB9oUE9WNUbbo="; }; buildInputs = [ which ocaml findlib ]; @@ -26,7 +34,7 @@ stdenv.mkDerivation rec { configureScript = "./configure.sh"; dontAddPrefix = "true"; dontAddStaticConfigureFlags = true; - configurePlatforms = []; + configurePlatforms = [ ]; propagatedBuildInputs = [ camlzip extlib ]; From 646b67028906b4cd1aa67d6c419cfdc755d6eec9 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 30 Oct 2021 22:50:23 +0200 Subject: [PATCH 07/72] ocamlPackages.iso8601: switch to fetchFromGitHub --- .../ocaml-modules/iso8601/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/iso8601/default.nix b/pkgs/development/ocaml-modules/iso8601/default.nix index d1b55609bc4a..add18281008c 100644 --- a/pkgs/development/ocaml-modules/iso8601/default.nix +++ b/pkgs/development/ocaml-modules/iso8601/default.nix @@ -1,13 +1,14 @@ -{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }: -let version = "0.2.4"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ocaml-iso8601"; - inherit version; - src = fetchzip { - url = "https://github.com/sagotch/ISO8601.ml/archive/${version}.tar.gz"; - sha256 = "0ypdd1p04xdjxxx3b61wp7abswfrq3vcvwwaxvywxwqljw0dhydi"; + version = "0.2.4"; + + src = fetchFromGitHub { + owner = "sagotch"; + repo = "ISO8601.ml"; + rev = version; + sha256 = "sha256-sXnYAJcU88797orzzfbA2XG91Lk8mDV677J1Am5o7Xo="; }; buildInputs = [ ocaml findlib ocamlbuild ]; @@ -17,7 +18,7 @@ stdenv.mkDerivation { homepage = "https://ocaml-community.github.io/ISO8601.ml/"; description = "ISO 8601 and RFC 3999 date parsing for OCaml"; license = lib.licenses.mit; - platforms = ocaml.meta.platforms or []; + platforms = ocaml.meta.platforms or [ ]; maintainers = with lib.maintainers; [ vbgl ]; }; } From 2745aefdf06ae8b0ab17dc83766ed5eaac3d4d06 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 30 Oct 2021 22:50:38 +0200 Subject: [PATCH 08/72] ocamlPackages.herelib: switch to fetchFromGitHub --- pkgs/development/ocaml-modules/herelib/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/herelib/default.nix b/pkgs/development/ocaml-modules/herelib/default.nix index b6f05fc46af3..14c775d25fcd 100644 --- a/pkgs/development/ocaml-modules/herelib/default.nix +++ b/pkgs/development/ocaml-modules/herelib/default.nix @@ -1,4 +1,4 @@ -{lib, buildOcaml, fetchurl}: +{ lib, buildOcaml, fetchFromGitHub }: buildOcaml rec { version = "112.35.00"; @@ -6,9 +6,11 @@ buildOcaml rec { minimumSupportedOcamlVersion = "4.00"; - src = fetchurl { - url = "https://github.com/janestreet/herelib/archive/${version}.tar.gz"; - sha256 = "03rrlpjmnd8d1rzzmd112355m7a5bwn3vf90xkbc6gkxlad9cxbs"; + src = fetchFromGitHub { + owner = "janestreet"; + repo = "herelib"; + rev = version; + sha256 = "sha256-EuMhHu2na3lcpsJ1wMVOgBr6VKndlonq8jgAW01eelI="; }; meta = with lib; { From 4598e3116f4339945db29d1a4e08eaff55fb3dcf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 20:28:49 +0000 Subject: [PATCH 09/72] python38Packages.wasabi: 0.8.2 -> 0.9.0 --- pkgs/development/python-modules/wasabi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wasabi/default.nix b/pkgs/development/python-modules/wasabi/default.nix index f58574014ed2..fca3f5480dcf 100644 --- a/pkgs/development/python-modules/wasabi/default.nix +++ b/pkgs/development/python-modules/wasabi/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "wasabi"; - version = "0.8.2"; + version = "0.9.0"; src = fetchPypi { inherit pname version; - sha256 = "b4a36aaa9ca3a151f0c558f269d442afbb3526f0160fd541acd8a0d5e5712054"; + sha256 = "152245d892030a3a7b511038e9472acff6d0e237cfe4123fef0d147f2d3274fc"; }; checkInputs = [ pytestCheckHook ]; From 2bc0ad0a1f7115b720158095ebcc2d2bca27f82a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 09:11:59 +0000 Subject: [PATCH 10/72] python38Packages.google-cloud-dlp: 3.3.1 -> 3.4.0 --- pkgs/development/python-modules/google-cloud-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix index 18e6179df4e2..8773b09e59a9 100644 --- a/pkgs/development/python-modules/google-cloud-dlp/default.nix +++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-dlp"; - version = "3.3.1"; + version = "3.4.0"; src = fetchPypi { inherit pname version; - sha256 = "c6cf11b2d5ddbb931ba11060d0d0daa9188994be3ec9122f9bf24fccae8c907a"; + sha256 = "0b249fa87deb57f5c7107a7d5d303673590a6524a7f113fc95f87493f3328606"; }; propagatedBuildInputs = [ google-api-core libcst proto-plus pytz ]; From e02ae572b58ca2fe0b5c75ec5314cf5553fa41cb Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 30 Oct 2021 22:51:02 +0200 Subject: [PATCH 11/72] ocamlPackages.erm_xml: switch to fetchFromGitHub --- .../ocaml-modules/erm_xml/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/erm_xml/default.nix b/pkgs/development/ocaml-modules/erm_xml/default.nix index 56b5c9295708..fa072f8bd1c1 100644 --- a/pkgs/development/ocaml-modules/erm_xml/default.nix +++ b/pkgs/development/ocaml-modules/erm_xml/default.nix @@ -1,17 +1,18 @@ -{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }: if !lib.versionAtLeast ocaml.version "4.02" then throw "erm_xml is not available for OCaml ${ocaml.version}" else -let version = "0.3+20180112"; in +stdenv.mkDerivation rec { + pname = "ocaml${ocaml.version}-erm_xml"; + version = "0.3+20180112"; -stdenv.mkDerivation { - name = "ocaml${ocaml.version}-erm_xml-${version}"; - - src = fetchzip { - url = "https://github.com/hannesm/xml/archive/bbabdade807d8281fc48806da054b70dfe482479.tar.gz"; - sha256 = "1gawpmg8plip0wia0xq60m024dn7l3ykwbjpbqx9f9bdmx74n1rr"; + src = fetchFromGitHub { + owner = "hannesm"; + repo = "xml"; + rev = "bbabdade807d8281fc48806da054b70dfe482479"; + sha256 = "sha256-OQdLTq9tJZc6XlcuPv2gxzYiQAUGd6AiBzfSi169XL0="; }; buildInputs = [ ocaml findlib ocamlbuild ]; @@ -21,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/hannesm/xml"; description = "XML Parser for discrete data"; - platforms = ocaml.meta.platforms or []; + platforms = ocaml.meta.platforms or [ ]; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ vbgl ]; }; From 0affb60221f2389ea53a3bc2b9c59d88ad67c229 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 30 Oct 2021 22:51:13 +0200 Subject: [PATCH 12/72] ocamlPackages.eliom: switch to fetchFromGitHub --- .../ocaml-modules/eliom/default.nix | 39 +++++++++++++------ 1 file changed, 27 insertions(+), 12 deletions(-) diff --git a/pkgs/development/ocaml-modules/eliom/default.nix b/pkgs/development/ocaml-modules/eliom/default.nix index 4e2714fedd26..69ac628d2014 100644 --- a/pkgs/development/ocaml-modules/eliom/default.nix +++ b/pkgs/development/ocaml-modules/eliom/default.nix @@ -1,25 +1,40 @@ -{ stdenv, lib, fetchzip, which, ocsigen_server, ocaml, - lwt_react, - opaline, ppx_deriving, findlib -, js_of_ocaml-ocamlbuild, js_of_ocaml-ppx, js_of_ocaml-ppx_deriving_json +{ stdenv +, lib +, fetchFromGitHub +, which +, ocsigen_server +, ocaml +, lwt_react +, opaline +, ppx_deriving +, findlib +, js_of_ocaml-ocamlbuild +, js_of_ocaml-ppx +, js_of_ocaml-ppx_deriving_json , js_of_ocaml-lwt , js_of_ocaml-tyxml , lwt_ppx , ocamlnet }: -stdenv.mkDerivation rec -{ +stdenv.mkDerivation rec { pname = "eliom"; version = "8.9.0"; - src = fetchzip { - url = "https://github.com/ocsigen/eliom/archive/${version}.tar.gz"; - sha256 = "sha256:1b1vb3ilb54ffzb98mqa6zggqchsnjspbni8qxi6j42pbajp7p2l"; + src = fetchFromGitHub { + owner = "ocsigen"; + repo = "eliom"; + rev = version; + sha256 = "sha256-VNxzpVpXEGlixyjadbW0GjL83jcKV5TWd46UReNYO6w="; }; - buildInputs = [ ocaml which findlib js_of_ocaml-ocamlbuild - js_of_ocaml-ppx_deriving_json opaline + buildInputs = [ + ocaml + which + findlib + js_of_ocaml-ocamlbuild + js_of_ocaml-ppx_deriving_json + opaline ocamlnet ]; @@ -41,7 +56,7 @@ stdenv.mkDerivation rec homepage = "http://ocsigen.org/eliom/"; description = "OCaml Framework for programming Web sites and client/server Web applications"; - longDescription =''Eliom is a framework for programming Web sites + longDescription = ''Eliom is a framework for programming Web sites and client/server Web applications. It introduces new concepts to simplify programming common behaviours and uses advanced static typing features of OCaml to check many properties of the Web site From 65055e3c8425590fa048b49c4fd939a4fb9c2c61 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 30 Oct 2021 22:51:25 +0200 Subject: [PATCH 13/72] ocamlPackages.easy-format: switch to fetchFromGitHub --- .../ocaml-modules/easy-format/default.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/ocaml-modules/easy-format/default.nix b/pkgs/development/ocaml-modules/easy-format/default.nix index 161e263e129b..a6e78977846c 100644 --- a/pkgs/development/ocaml-modules/easy-format/default.nix +++ b/pkgs/development/ocaml-modules/easy-format/default.nix @@ -1,15 +1,15 @@ -{ lib, stdenv, fetchzip, ocaml, findlib }: -let +{ lib, stdenv, fetchFromGitHub, ocaml, findlib }: + +stdenv.mkDerivation rec { + pname = "easy-format"; version = "1.2.0"; -in -stdenv.mkDerivation { - name = "${pname}-${version}"; - - src = fetchzip { - url = "https://github.com/mjambon/${pname}/archive/v${version}.tar.gz"; - sha256 = "00ga7mrlycjc99gzp3bgx6iwhf7i6j8856f8xzrf1yas7zwzgzm9"; + src = fetchFromGitHub { + owner = "mjambon"; + repo = "easy-format"; + rev = "v${version}"; + sha256 = "sha256-qf73+T9a+eDy78iZgpA08TjIo+lvjftfSkwyT3M96gE="; }; nativeBuildInputs = [ ocaml findlib ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = with lib; { description = "A high-level and functional interface to the Format module of the OCaml standard library"; - homepage = "https://github.com/ocaml-community/${pname}"; + homepage = "https://github.com/ocaml-community/easy-format"; license = licenses.bsd3; maintainers = [ maintainers.vbgl ]; }; From b5bb0514ea8f99a20100fc5bfd0b1054463edad4 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 30 Oct 2021 22:51:37 +0200 Subject: [PATCH 14/72] ocamlPackages.dolog: switch to fetchFromGitHub --- .../ocaml-modules/dolog/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/dolog/default.nix b/pkgs/development/ocaml-modules/dolog/default.nix index 690823c5358a..64fb2b2c5a59 100644 --- a/pkgs/development/ocaml-modules/dolog/default.nix +++ b/pkgs/development/ocaml-modules/dolog/default.nix @@ -1,13 +1,14 @@ -{ stdenv, lib, fetchzip, ocaml, findlib, ocamlbuild }: +{ stdenv, lib, fetchFromGitHub, ocaml, findlib, ocamlbuild }: -let version = "3.0"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ocaml-dolog"; - inherit version; - src = fetchzip { - url = "https://github.com/UnixJunkie/dolog/archive/v${version}.tar.gz"; - sha256 = "0gx2s4509vkkkaikl2yp7k5x7bqv45s1y1vsy408d8rakd7yl1zb"; + version = "3.0"; + + src = fetchFromGitHub { + owner = "UnixJunkie"; + repo = "dolog"; + rev = "v${version}"; + sha256 = "sha256-6wfqT5sqo4YA8XoHH3QhG6/TyzzXCzqjmnPuBArRoj8="; }; buildInputs = [ ocaml findlib ocamlbuild ]; @@ -20,7 +21,7 @@ stdenv.mkDerivation { meta = { homepage = "https://github.com/UnixJunkie/dolog"; description = "Minimalistic lazy logger in OCaml"; - platforms = ocaml.meta.platforms or []; + platforms = ocaml.meta.platforms or [ ]; license = lib.licenses.bsd3; maintainers = with lib.maintainers; [ vbgl ]; }; From 2c8b542e2c5f913daace604f03e1ff8eeffa09d5 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 30 Oct 2021 22:51:50 +0200 Subject: [PATCH 15/72] ocamlPackages.ctypes: switch to fetchFromGitHub --- .../ocaml-modules/ctypes/default.nix | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/ctypes/default.nix b/pkgs/development/ocaml-modules/ctypes/default.nix index f8ccffcf217f..8c20a68c2746 100644 --- a/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/pkgs/development/ocaml-modules/ctypes/default.nix @@ -1,28 +1,30 @@ -{ lib, stdenv, fetchzip, ocaml, findlib, libffi, pkg-config, ncurses, integers, bigarray-compat }: +{ lib, stdenv, fetchFromGitHub, ocaml, findlib, libffi, pkg-config, ncurses, integers, bigarray-compat }: if !lib.versionAtLeast ocaml.version "4.02" then throw "ctypes is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-ctypes-${version}"; + pname = "ocaml${ocaml.version}-ctypes"; version = "0.18.0"; - src = fetchzip { - url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz"; - sha256 = "03zrbnl16m67ls0yfhq7a4k4238x6x6b3m456g4dw2yqwc153vks"; + src = fetchFromGitHub { + owner = "ocamllabs"; + repo = "ocaml-ctypes"; + rev = version; + sha256 = "sha256-eu5RAuPYC97IM4XUsUw3HQ1BJlEHQ+eBpsdUE6hd+Q8="; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ocaml findlib ncurses ]; propagatedBuildInputs = [ integers libffi bigarray-compat ]; - buildPhase = '' - make XEN=false libffi.config ctypes-base ctypes-stubs - make XEN=false ctypes-foreign + buildPhase = '' + make XEN=false libffi.config ctypes-base ctypes-stubs + make XEN=false ctypes-foreign ''; - installPhase = '' + installPhase = '' mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs make install XEN=false ''; From 630f83451b660e1230e0ca2f28be6bf55b1ccf69 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 30 Oct 2021 22:52:02 +0200 Subject: [PATCH 16/72] ocamlPackages.cryptokit: switch to fetchFromGitHub --- pkgs/development/ocaml-modules/cryptokit/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/cryptokit/default.nix b/pkgs/development/ocaml-modules/cryptokit/default.nix index 6a50c73103b7..1b5a50b13b97 100644 --- a/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -1,14 +1,16 @@ -{ lib, buildDunePackage, fetchurl, zlib, dune-configurator, zarith, ncurses }: +{ lib, buildDunePackage, fetchFromGitHub, zlib, dune-configurator, zarith, ncurses }: -buildDunePackage { +buildDunePackage rec { pname = "cryptokit"; version = "1.16.1"; useDune2 = true; - src = fetchurl { - url = "https://github.com/xavierleroy/cryptokit/archive/release1161.tar.gz"; - sha256 = "0kzqkk451m69nqi5qiwak0rd0rp5vzi613gcngsiig7dyxwka61c"; + src = fetchFromGitHub { + owner = "xavierleroy"; + repo = "cryptokit"; + rev = "release${lib.replaceStrings ["."] [""] version}"; + sha256 = "sha256-eDIzi16Al/mXCNos/lVqjZWCtdP9SllXnRfm4GBWMfA="; }; # dont do autotools configuration, but do trigger findlib's preConfigure hook From efc2291b39aa418fc323a96a72357e267bee264c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 30 Oct 2021 22:52:18 +0200 Subject: [PATCH 17/72] ocamlPackages.comparelib: switch to fetchFromGitHub --- pkgs/development/ocaml-modules/comparelib/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/comparelib/default.nix b/pkgs/development/ocaml-modules/comparelib/default.nix index a1371e4f4d5e..1d7c314f005c 100644 --- a/pkgs/development/ocaml-modules/comparelib/default.nix +++ b/pkgs/development/ocaml-modules/comparelib/default.nix @@ -1,4 +1,4 @@ -{lib, buildOcaml, fetchurl, type_conv}: +{ lib, buildOcaml, fetchFromGitHub, type_conv }: buildOcaml rec { pname = "comparelib"; @@ -6,9 +6,11 @@ buildOcaml rec { minimumSupportedOcamlVersion = "4.00"; - src = fetchurl { - url = "https://github.com/janestreet/comparelib/archive/${version}.tar.gz"; - sha256 = "02l343drgi4200flfx73nzdk61zajwidsqjk9n80b2d37lvhazlf"; + src = fetchFromGitHub { + owner = "janestreet"; + repo = "comparelib"; + rev = version; + sha256 = "sha256-gtJvXAUxiIt/L9bCzS+8wHcCQ+QpBubwcjDcyN0K2MA="; }; propagatedBuildInputs = [ type_conv ]; From 4cc77649c68347eda9e98963efce97dee96141d9 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sat, 30 Oct 2021 22:52:29 +0200 Subject: [PATCH 18/72] ocamlPackages.bitv: switch to fetchFromGitHub --- pkgs/development/ocaml-modules/bitv/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/bitv/default.nix b/pkgs/development/ocaml-modules/bitv/default.nix index 23e8d145a308..2ac3a0ba3e76 100644 --- a/pkgs/development/ocaml-modules/bitv/default.nix +++ b/pkgs/development/ocaml-modules/bitv/default.nix @@ -1,16 +1,18 @@ -{ stdenv, lib, fetchzip, autoreconfHook, which, ocaml, findlib }: +{ stdenv, lib, fetchFromGitHub, autoreconfHook, which, ocaml, findlib }: if !lib.versionAtLeast ocaml.version "4.02" then throw "bitv is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-bitv-${version}"; + pname = "ocaml${ocaml.version}-bitv"; version = "1.3"; - src = fetchzip { - url = "https://github.com/backtracking/bitv/archive/${version}.tar.gz"; - sha256 = "0vkh1w9fpi5m1sgiqg6r38j3fqglhdajmbyiyr91113lrpljm75i"; + src = fetchFromGitHub { + owner = "backtracking"; + repo = "bitv"; + rev = version; + sha256 = "sha256-sZwq6c10hBBS9tGvKlWD9GE3JBrZPByfDrXE6xIPcG4="; }; buildInputs = [ autoreconfHook which ocaml findlib ]; From 816d311bd0710d046ee9ebc41610e664519712e9 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 8 Dec 2021 20:34:41 +0100 Subject: [PATCH 19/72] pgpdump: 0.33 -> 0.34 --- pkgs/tools/security/pgpdump/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pgpdump/default.nix b/pkgs/tools/security/pgpdump/default.nix index c0f496438a4e..f6fade16b868 100644 --- a/pkgs/tools/security/pgpdump/default.nix +++ b/pkgs/tools/security/pgpdump/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "pgpdump"; - version = "0.33"; + version = "0.34"; src = fetchFromGitHub { owner = "kazu-yamamoto"; repo = "pgpdump"; rev = "v${version}"; - sha256 = "0pi9qdbmcmi58gmljin51ylbi3zkknl8fm26jm67cpl55hvfsn23"; + sha256 = "1vvxhbz8nqzw9gf7cdmas2shzziznsqj84w6w74h8zzgb4m3byzz"; }; buildInputs = lib.optionals supportCompressedPackets [ zlib bzip2 ]; From e829d9f36909e01387beafc9bc72d002740073a5 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 21:49:19 +0000 Subject: [PATCH 20/72] nvme-cli: 1.15 -> 1.16 --- pkgs/os-specific/linux/nvme-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/nvme-cli/default.nix b/pkgs/os-specific/linux/nvme-cli/default.nix index 57d59c27b6e6..c7819afe3ef4 100644 --- a/pkgs/os-specific/linux/nvme-cli/default.nix +++ b/pkgs/os-specific/linux/nvme-cli/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "nvme-cli"; - version = "1.15"; + version = "1.16"; src = fetchFromGitHub { owner = "linux-nvme"; repo = "nvme-cli"; rev = "v${version}"; - sha256 = "0qr1wa163cb7z6g083nl3zcc28mmlbxh1m97pd54bp3gyrhmdhhr"; + sha256 = "sha256-/wDQxsN1sji56zfcvqx02iciYnyxjIbL85bNaRwrHYw="; }; nativeBuildInputs = [ pkg-config ]; From 0a16289964177e37bd104a3b2ea51d36347a201a Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Wed, 24 Nov 2021 16:29:06 +0100 Subject: [PATCH 21/72] openjdk11: add zulu `javaFX` java package on darwin --- .../compilers/openjdk/darwin/11.nix | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/openjdk/darwin/11.nix b/pkgs/development/compilers/openjdk/darwin/11.nix index 0b158a169321..bd83ea82113a 100644 --- a/pkgs/development/compilers/openjdk/darwin/11.nix +++ b/pkgs/development/compilers/openjdk/darwin/11.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchurl, unzip, setJavaClassPath }: +{ lib +, stdenv +, fetchurl +, unzip +, setJavaClassPath +, enableJavaFX ? false +}: let # Details from https://www.azul.com/downloads/?version=java-11-lts&os=macos&package=jdk # Note that the latest build may differ by platform @@ -7,29 +13,35 @@ let arch = "x64"; zuluVersion = "11.48.21"; jdkVersion = "11.0.11"; - sha256 = "0v0n7h7i04pvna41wpdq2k9qiy70sbbqzqzvazfdvgm3gb22asw6"; + sha256 = + if enableJavaFX then "18bd9cd66d6abc6f8c627bc70278dc8fd4860e138e1dc9e170eddb89727ccc7b" + else "0v0n7h7i04pvna41wpdq2k9qiy70sbbqzqzvazfdvgm3gb22asw6"; }; aarch64-darwin = { arch = "aarch64"; zuluVersion = "11.48.21"; jdkVersion = "11.0.11"; - sha256 = "066whglrxx81c95grv2kxdbvyh32728ixhml2v44ildh549n4lhc"; + sha256 = + if enableJavaFX then "ef0de2705c6c2d586812f7f3736b70e22b069545b38034816016f9f264ad43f9" + else "066whglrxx81c95grv2kxdbvyh32728ixhml2v44ildh549n4lhc"; }; }."${stdenv.hostPlatform.system}"; jce-policies = fetchurl { # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! - url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; + url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; }; + javaPackage = if enableJavaFX then "ca-fx-jdk" else "ca-jdk"; + jdk = stdenv.mkDerivation rec { - pname = "zulu${dist.zuluVersion}-ca-jdk"; + pname = "zulu${dist.zuluVersion}-${javaPackage}"; version = dist.jdkVersion; src = fetchurl { - url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; + url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-${javaPackage}${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; inherit (dist) sha256; curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; }; @@ -77,4 +89,5 @@ let meta = import ./meta.nix lib; }; -in jdk +in +jdk From 5e4685f943b73434766aa2802726c8f50e2eead3 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Wed, 24 Nov 2021 16:57:07 +0100 Subject: [PATCH 22/72] openjdk8: add zulu `javaFX` java package on darwin --- .../compilers/openjdk/darwin/8.nix | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix index c7367a5d642c..2a73fb336c87 100644 --- a/pkgs/development/compilers/openjdk/darwin/8.nix +++ b/pkgs/development/compilers/openjdk/darwin/8.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchurl, unzip, setJavaClassPath }: +{ lib +, stdenv +, fetchurl +, unzip +, setJavaClassPath +, enableJavaFX ? false +}: let # Details from https://www.azul.com/downloads/?version=java-8-lts&os=macos&package=jdk # Note that the latest build may differ by platform @@ -7,32 +13,38 @@ let arch = "x64"; zuluVersion = "8.54.0.21"; jdkVersion = "8.0.292"; - sha256 = "1pgl0bir4r5v349gkxk54k6v62w241q7vw4gjxhv2g6pfq6hv7in"; + sha256 = + if enableJavaFX then "e671f8990229b1ca2a76faabb21ba2f1a9e1f7211392e0f657225559be9b05c8" + else "1pgl0bir4r5v349gkxk54k6v62w241q7vw4gjxhv2g6pfq6hv7in"; }; aarch64-darwin = { arch = "aarch64"; zuluVersion = "8.54.0.21"; jdkVersion = "8.0.292"; - sha256 = "05w89wfjlfbpqfjnv6wisxmaf13qb28b2223f9264jyx30qszw1c"; + sha256 = + if enableJavaFX then "1b05b2e40f707a151b063ebba821270fa930ebfc05712bc1f5a8a112395731a6" + else "05w89wfjlfbpqfjnv6wisxmaf13qb28b2223f9264jyx30qszw1c"; }; }."${stdenv.hostPlatform.system}"; jce-policies = fetchurl { # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! - url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; + url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; }; + javaPackage = if enableJavaFX then "ca-fx-jdk" else "ca-jdk"; + jdk = stdenv.mkDerivation rec { # @hlolli: Later version than 1.8.0_202 throws error when building jvmci. # dyld: lazy symbol binding failed: Symbol not found: _JVM_BeforeHalt # Referenced from: ../libjava.dylib Expected in: .../libjvm.dylib - pname = "zulu${dist.zuluVersion}-ca-jdk"; + pname = "zulu${dist.zuluVersion}-${javaPackage}"; version = dist.jdkVersion; src = fetchurl { - url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; + url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-${javaPackage}${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; inherit (dist) sha256; curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; }; @@ -75,4 +87,5 @@ let meta = import ./meta.nix lib; }; -in jdk +in +jdk From 2c62693ebaf485ac5503b5af70d7ebf1f736f01c Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Wed, 24 Nov 2021 17:45:06 +0100 Subject: [PATCH 23/72] openjdk: add zulu `javaFX` java package on darwin --- .../compilers/openjdk/darwin/16.nix | 27 ++++++++++++++----- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/openjdk/darwin/16.nix b/pkgs/development/compilers/openjdk/darwin/16.nix index 1d6776303bf0..56333bd48183 100644 --- a/pkgs/development/compilers/openjdk/darwin/16.nix +++ b/pkgs/development/compilers/openjdk/darwin/16.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchurl, unzip, setJavaClassPath }: +{ lib +, stdenv +, fetchurl +, unzip +, setJavaClassPath +, enableJavaFX ? false +}: let # Details from https://www.azul.com/downloads/?version=java-16-sts&os=macos&package=jdk # Note that the latest build may differ by platform @@ -7,29 +13,35 @@ let arch = "x64"; zuluVersion = "16.30.15"; jdkVersion = "16.0.1"; - sha256 = "1jihn125dmxr9y5h9jq89zywm3z6rbwv5q7msfzsf2wzrr13jh0z"; + sha256 = + if enableJavaFX then "cbb3b96d80a0675893f21dc51ba3f532049c501bd7dc4c8d1ee930e63032c745" + else "1jihn125dmxr9y5h9jq89zywm3z6rbwv5q7msfzsf2wzrr13jh0z"; }; aarch64-darwin = { arch = "aarch64"; zuluVersion = "16.30.19"; jdkVersion = "16.0.1"; - sha256 = "1i0bcjx3acb5dhslf6cabdcnd6mrz9728vxw9hb4al5y3f5fll4w"; + sha256 = + if enableJavaFX then "a49b23abfd83784d2ac935fc24e25ab7cb09b8ffc8e47c32ed446e05b8a21396" + else "1i0bcjx3acb5dhslf6cabdcnd6mrz9728vxw9hb4al5y3f5fll4w"; }; }."${stdenv.hostPlatform.system}"; jce-policies = fetchurl { # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! - url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; + url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; }; + javaPackage = if enableJavaFX then "ca-fx-jdk" else "ca-jdk"; + jdk = stdenv.mkDerivation rec { - pname = "zulu${dist.zuluVersion}-ca-jdk"; + pname = "zulu${dist.zuluVersion}-${javaPackage}"; version = dist.jdkVersion; src = fetchurl { - url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-ca-jdk${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; + url = "https://cdn.azul.com/zulu/bin/zulu${dist.zuluVersion}-${javaPackage}${dist.jdkVersion}-macosx_${dist.arch}.tar.gz"; inherit (dist) sha256; curlOpts = "-H Referer:https://www.azul.com/downloads/zulu/"; }; @@ -77,4 +89,5 @@ let meta = import ./meta.nix lib; }; -in jdk +in +jdk From 6893810bd85fe947d33589060c6d678bafab1c44 Mon Sep 17 00:00:00 2001 From: Thibault Gagnaux Date: Wed, 1 Dec 2021 09:30:01 +0100 Subject: [PATCH 24/72] openjdk: pin jce-policies to a version using wayback machine Co-authored-by: SuperSandro2000 --- pkgs/development/compilers/openjdk/darwin/11.nix | 7 +++---- pkgs/development/compilers/openjdk/darwin/16.nix | 3 +-- pkgs/development/compilers/openjdk/darwin/8.nix | 3 +-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/development/compilers/openjdk/darwin/11.nix b/pkgs/development/compilers/openjdk/darwin/11.nix index bd83ea82113a..d8c1bb6bf254 100644 --- a/pkgs/development/compilers/openjdk/darwin/11.nix +++ b/pkgs/development/compilers/openjdk/darwin/11.nix @@ -23,14 +23,13 @@ let zuluVersion = "11.48.21"; jdkVersion = "11.0.11"; sha256 = - if enableJavaFX then "ef0de2705c6c2d586812f7f3736b70e22b069545b38034816016f9f264ad43f9" - else "066whglrxx81c95grv2kxdbvyh32728ixhml2v44ildh549n4lhc"; + if enableJavaFX then "ef0de2705c6c2d586812f7f3736b70e22b069545b38034816016f9f264ad43f9" + else "066whglrxx81c95grv2kxdbvyh32728ixhml2v44ildh549n4lhc"; }; }."${stdenv.hostPlatform.system}"; jce-policies = fetchurl { - # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! - url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; + url = "https://web.archive.org/web/20211126120343/http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; }; diff --git a/pkgs/development/compilers/openjdk/darwin/16.nix b/pkgs/development/compilers/openjdk/darwin/16.nix index 56333bd48183..d491d75322f4 100644 --- a/pkgs/development/compilers/openjdk/darwin/16.nix +++ b/pkgs/development/compilers/openjdk/darwin/16.nix @@ -29,8 +29,7 @@ let }."${stdenv.hostPlatform.system}"; jce-policies = fetchurl { - # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! - url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; + url = "https://web.archive.org/web/20211126120343/http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; }; diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix index 2a73fb336c87..1d829450a1ed 100644 --- a/pkgs/development/compilers/openjdk/darwin/8.nix +++ b/pkgs/development/compilers/openjdk/darwin/8.nix @@ -29,8 +29,7 @@ let }."${stdenv.hostPlatform.system}"; jce-policies = fetchurl { - # Ugh, unversioned URLs... I hope this doesn't change often enough to cause pain before we move to a Darwin source build of OpenJDK! - url = "http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; + url = "https://web.archive.org/web/20211126120343/http://cdn.azul.com/zcek/bin/ZuluJCEPolicies.zip"; sha256 = "0nk7m0lgcbsvldq2wbfni2pzq8h818523z912i7v8hdcij5s48c0"; }; From 60b93d500e1006d00d3c57645c47fa7b877fd126 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Dec 2021 09:30:38 +0000 Subject: [PATCH 25/72] metamath: 0.196 -> 0.198 --- pkgs/development/interpreters/metamath/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/metamath/default.nix b/pkgs/development/interpreters/metamath/default.nix index d5c021a815f9..9c6c64f73913 100644 --- a/pkgs/development/interpreters/metamath/default.nix +++ b/pkgs/development/interpreters/metamath/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "metamath"; - version = "0.196"; + version = "0.198"; nativeBuildInputs = [ autoreconfHook ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "metamath"; repo = "metamath-exe"; rev = "v${version}"; - sha256 = "sha256-/ofH5fq7lUxbbRBAczsLNG3UPsOMbCdcxkB3el5OPcU="; + sha256 = "sha256-Cg1dgz+uphDlGhKH3mTywtAccWinC5+pwNv4TB3YAnI="; }; meta = with lib; { From e32470a3aa078ca11f88483cf60a8b40dd3d6e3e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Dec 2021 19:34:15 +0000 Subject: [PATCH 26/72] libthreadar: 1.3.2 -> 1.3.5 --- pkgs/development/libraries/libthreadar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libthreadar/default.nix b/pkgs/development/libraries/libthreadar/default.nix index 953800cdd576..bff42af3acaa 100644 --- a/pkgs/development/libraries/libthreadar/default.nix +++ b/pkgs/development/libraries/libthreadar/default.nix @@ -3,12 +3,12 @@ with lib; stdenv.mkDerivation rec { - version = "1.3.2"; + version = "1.3.5"; pname = "libthreadar"; src = fetchurl { url = "mirror://sourceforge/libthreadar/${pname}-${version}.tar.gz"; - sha256 = "sha256-q5FiBlncbhdXDgRm7wgxcd4rkxqje/1ls9kPGqmomP0="; + sha256 = "sha256-T5W83Ry3e1hHrnpmSLkfJDYHrVP6YDpXTqmf0WGCjB8="; }; outputs = [ "out" "dev" ]; From 39c5525cb157b09dc5eae482bcff82a1c477ad2f Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 10 Dec 2021 01:04:33 +0200 Subject: [PATCH 27/72] nixos/qemu-vm: add -device virtio-keyboard to opts by default a ps/2 keyboard input is used which seems to cause issues on aarch64-linux when the machine is used high load, causing the keymap qwertz test to always fail and azerty to sometimes fail See https://github.com/NixOS/nixpkgs/issues/147294 --- nixos/modules/virtualisation/qemu-vm.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index c7c3d7474645..fa3e25afb03e 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -835,6 +835,7 @@ in # FIXME: Consolidate this one day. virtualisation.qemu.options = mkMerge [ + [ "-device virtio-keyboard" ] (mkIf pkgs.stdenv.hostPlatform.isx86 [ "-usb" "-device usb-tablet,bus=usb-bus.0" ]) From 4f6066e5abf0c1a1e73556b33c31c65354ee8fdf Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Thu, 2 Dec 2021 17:51:24 -0500 Subject: [PATCH 28/72] python3Packages.pre-commit: fix hook-tmpl --- .../python-modules/pre-commit/default.nix | 1 + .../python-modules/pre-commit/hook-tmpl.patch | 15 +++++++++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/python-modules/pre-commit/hook-tmpl.patch diff --git a/pkgs/development/python-modules/pre-commit/default.nix b/pkgs/development/python-modules/pre-commit/default.nix index 384544f82866..919f9725ae1b 100644 --- a/pkgs/development/python-modules/pre-commit/default.nix +++ b/pkgs/development/python-modules/pre-commit/default.nix @@ -28,6 +28,7 @@ buildPythonPackage rec { patches = [ ./languages-use-the-hardcoded-path-to-python-binaries.patch + ./hook-tmpl.patch ]; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/pre-commit/hook-tmpl.patch b/pkgs/development/python-modules/pre-commit/hook-tmpl.patch new file mode 100644 index 000000000000..1d5fd17274ba --- /dev/null +++ b/pkgs/development/python-modules/pre-commit/hook-tmpl.patch @@ -0,0 +1,15 @@ +diff --git a/pre_commit/resources/hook-tmpl b/pre_commit/resources/hook-tmpl +index 53d29f9..66a8ad3 100755 +--- a/pre_commit/resources/hook-tmpl ++++ b/pre_commit/resources/hook-tmpl +@@ -10,9 +10,7 @@ ARGS=(hook-impl) + HERE="$(cd "$(dirname "$0")" && pwd)" + ARGS+=(--hook-dir "$HERE" -- "$@") + +-if [ -x "$INSTALL_PYTHON" ]; then +- exec "$INSTALL_PYTHON" -mpre_commit "${ARGS[@]}" +-elif command -v pre-commit > /dev/null; then ++if command -v pre-commit > /dev/null; then + exec pre-commit "${ARGS[@]}" + else + echo '`pre-commit` not found. Did you forget to activate your virtualenv?' 1>&2 From 5c22c16c24056bcb060baa0b40aaed3120b517f0 Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sat, 4 Dec 2021 09:21:29 -0500 Subject: [PATCH 29/72] pre-commit: move out of python3packages --- .../misc}/pre-commit/default.nix | 16 ++-------------- .../misc}/pre-commit/hook-tmpl.patch | 0 ...e-the-hardcoded-path-to-python-binaries.patch | 0 pkgs/tools/misc/wlc/default.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 -- 6 files changed, 4 insertions(+), 17 deletions(-) rename pkgs/{development/python-modules => tools/misc}/pre-commit/default.nix (89%) rename pkgs/{development/python-modules => tools/misc}/pre-commit/hook-tmpl.patch (100%) rename pkgs/{development/python-modules => tools/misc}/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch (100%) diff --git a/pkgs/development/python-modules/pre-commit/default.nix b/pkgs/tools/misc/pre-commit/default.nix similarity index 89% rename from pkgs/development/python-modules/pre-commit/default.nix rename to pkgs/tools/misc/pre-commit/default.nix index 919f9725ae1b..41d3ecf17872 100644 --- a/pkgs/development/python-modules/pre-commit/default.nix +++ b/pkgs/tools/misc/pre-commit/default.nix @@ -1,18 +1,6 @@ -{ lib -, buildPythonPackage -, cfgv -, fetchPypi -, identify -, importlib-metadata -, importlib-resources -, nodeenv -, python -, pythonOlder -, pyyaml -, toml -, virtualenv -}: +{ lib, python3Packages }: +with python3Packages; buildPythonPackage rec { pname = "pre-commit"; version = "2.16.0"; diff --git a/pkgs/development/python-modules/pre-commit/hook-tmpl.patch b/pkgs/tools/misc/pre-commit/hook-tmpl.patch similarity index 100% rename from pkgs/development/python-modules/pre-commit/hook-tmpl.patch rename to pkgs/tools/misc/pre-commit/hook-tmpl.patch diff --git a/pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch b/pkgs/tools/misc/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch similarity index 100% rename from pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch rename to pkgs/tools/misc/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch diff --git a/pkgs/tools/misc/wlc/default.nix b/pkgs/tools/misc/wlc/default.nix index dd7c5f7942f8..979004e2fcad 100644 --- a/pkgs/tools/misc/wlc/default.nix +++ b/pkgs/tools/misc/wlc/default.nix @@ -1,4 +1,5 @@ { lib +, pre-commit , python3 }: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92ab74ab2889..bc569bd9320b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8796,7 +8796,7 @@ with pkgs; pptpd = callPackage ../tools/networking/pptpd {}; - pre-commit = with python3Packages; toPythonApplication pre-commit; + pre-commit = callPackage ../tools/misc/pre-commit { }; pretty-simple = callPackage ../development/tools/pretty-simple { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 40e0c5b44ff8..471d4edcfa9e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6074,8 +6074,6 @@ in { prefixed = callPackage ../development/python-modules/prefixed { }; - pre-commit = callPackage ../development/python-modules/pre-commit { }; - pre-commit-hooks = callPackage ../development/python-modules/pre-commit-hooks { }; preggy = callPackage ../development/python-modules/preggy { }; From 082a8ba0e0f866c047458627c31be0c358de078d Mon Sep 17 00:00:00 2001 From: Phillip Cloud <417981+cpcloud@users.noreply.github.com> Date: Sun, 5 Dec 2021 09:10:37 -0500 Subject: [PATCH 30/72] wlc: remove pre-commit dependency --- pkgs/tools/misc/wlc/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/tools/misc/wlc/default.nix b/pkgs/tools/misc/wlc/default.nix index 979004e2fcad..2bac81fd3ca0 100644 --- a/pkgs/tools/misc/wlc/default.nix +++ b/pkgs/tools/misc/wlc/default.nix @@ -1,5 +1,4 @@ { lib -, pre-commit , python3 }: @@ -19,7 +18,6 @@ buildPythonPackage rec { python-dateutil requests pyxdg - pre-commit responses twine ]; From 545a0831fa918b6a1c065c03fce907c05646416d Mon Sep 17 00:00:00 2001 From: Tim Zook Date: Thu, 9 Dec 2021 18:39:27 -0600 Subject: [PATCH 31/72] =?UTF-8?q?sublime-merge:=20update=202033=20?= =?UTF-8?q?=E2=86=92=202063=20and=20add=20libcurl=20to=20application=20lib?= =?UTF-8?q?rary=20path=20(#146934)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../version-management/sublime-merge/common.nix | 2 +- .../version-management/sublime-merge/default.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/version-management/sublime-merge/common.nix b/pkgs/applications/version-management/sublime-merge/common.nix index cb78411527d3..deb79cfdf9c5 100644 --- a/pkgs/applications/version-management/sublime-merge/common.nix +++ b/pkgs/applications/version-management/sublime-merge/common.nix @@ -17,7 +17,7 @@ let archSha256 = sha256; arch = "x64"; - libPath = lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango ]; + libPath = lib.makeLibraryPath [ xorg.libX11 glib gtk3 cairo pango curl.out ]; redirects = [ "/usr/bin/pkexec=${pkexecPath}" "/bin/true=${coreutils}/bin/true" ]; in let binaryPackage = stdenv.mkDerivation { diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index dd9b07f7faf8..926fefb89d8a 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -5,12 +5,12 @@ let in { sublime-merge = common { buildVersion = "2063"; - sha256 = "l6vxcOIQ3kQqNzLkf3PbuU3DpDfLh0tXCl/LnJsCt2k="; + sha256 = "0sdp0adrrjsz19blp1yb6yjc6kdrvdrpzr1j6wm49phhw9qg3awp"; } {}; sublime-merge-dev = common { - buildVersion = "2055"; - sha256 = "0f5qmxs5cqgdp7gav223ibjwbcrh8bszk1yg1a6hpz8s8j3icvdi"; + buildVersion = "2062"; + sha256 = "035f4gxbg9mb8p8yynpc6a1id9b8krfnr0gl98ib09bdh96ddan3"; dev = true; } {}; } From e2ff3faf031ba817f3f16ac667afd3e3a4a906d2 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Fri, 10 Dec 2021 08:45:46 +0800 Subject: [PATCH 32/72] pantheon.elementary-files: 6.1.0 -> 6.1.1 --- .../apps/elementary-files/default.nix | 20 +++++++++---------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 747f9662680d..21e25bad9451 100644 --- a/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -32,23 +32,15 @@ stdenv.mkDerivation rec { pname = "elementary-files"; - version = "6.1.0"; - - repoName = "files"; + version = "6.1.1"; outputs = [ "out" "dev" ]; src = fetchFromGitHub { owner = "elementary"; - repo = repoName; + repo = "files"; rev = version; - sha256 = "sha256-aGiFEeSvDV5rPD2Ll/BuDoWclEPhR1UuoCxUSS9CGmw="; - }; - - passthru = { - updateScript = nix-update-script { - attrPath = "pantheon.${pname}"; - }; + sha256 = "sha256-5TSzV8MQG81aCCR8yiCPhKJaLrp/fwf4mjP32KkcbbY="; }; nativeBuildInputs = [ @@ -88,6 +80,12 @@ stdenv.mkDerivation rec { patchShebangs meson/post_install.py ''; + passthru = { + updateScript = nix-update-script { + attrPath = "pantheon.${pname}"; + }; + }; + meta = with lib; { description = "File browser designed for elementary OS"; homepage = "https://github.com/elementary/files"; From e4feefd79644fffc2260295db3b3daec5dac752d Mon Sep 17 00:00:00 2001 From: Jichao Ouyang Date: Fri, 10 Dec 2021 12:06:30 +1100 Subject: [PATCH 33/72] mdbook-plantuml: init at 0.7.0 (#144594) Co-authored-by: Sandro --- pkgs/tools/text/mdbook-plantuml/default.nix | 28 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/tools/text/mdbook-plantuml/default.nix diff --git a/pkgs/tools/text/mdbook-plantuml/default.nix b/pkgs/tools/text/mdbook-plantuml/default.nix new file mode 100644 index 000000000000..0b26bee09538 --- /dev/null +++ b/pkgs/tools/text/mdbook-plantuml/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchFromGitHub, stdenv, rustPlatform, darwin, pkg-config, openssl +, libiconv, CoreServices }: + +rustPlatform.buildRustPackage rec { + pname = "mdbook-plantuml"; + version = "0.7.0"; + + src = fetchFromGitHub { + owner = "sytsereitsma"; + repo = pname; + rev = "v${version}"; + sha256 = "1m53sp3k387injn6mwk2c6rkzw16b12m4j7q0p69fdb3fiqbkign"; + }; + + cargoSha256 = "0xi14k86ym3rfz6901lmj444y814m7vp90bwsyjmcph3hdv6mjp0"; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ] + ++ lib.optionals stdenv.isDarwin [ CoreServices ]; + + meta = with lib; { + description = "mdBook preprocessor to render PlantUML diagrams to png images in the book output directory"; + homepage = "https://github.com/sytsereitsma/mdbook-plantuml"; + license = [ licenses.mit ]; + maintainers = with maintainers; [ jcouyang ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4443145d4259..1bb389b299f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7096,6 +7096,10 @@ with pkgs; inherit (darwin.apple_sdk.frameworks) CoreServices; }; + mdbook-plantuml = callPackage ../tools/text/mdbook-plantuml { + inherit (darwin.apple_sdk.frameworks) CoreServices; + }; + mdcat = callPackage ../tools/text/mdcat { inherit (darwin.apple_sdk.frameworks) Security; inherit (python3Packages) ansi2html; From 315374ecc111742f92c6039d74826bd4f5d85394 Mon Sep 17 00:00:00 2001 From: Paul Baecher Date: Fri, 10 Dec 2021 02:22:28 +0100 Subject: [PATCH 34/72] gotypist: init at 0.8.2 (#147295) Co-authored-by: Sandro --- pkgs/games/gotypist/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/games/gotypist/default.nix diff --git a/pkgs/games/gotypist/default.nix b/pkgs/games/gotypist/default.nix new file mode 100644 index 000000000000..00fc30718182 --- /dev/null +++ b/pkgs/games/gotypist/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "gotypist"; + version = "0.8.2"; + + src = fetchFromGitHub { + owner = "pb-"; + repo = "gotypist"; + rev = "${version}"; + sha256 = "0khl2f6bl121slw9mlf4qzsdarpk1v3vry11f3dvz7pb1q6zjj11"; + }; + + vendorSha256 = null; + + meta = with lib; { + description = "A touch-typing tutor"; + longDescription = '' + A simple touch-typing tutor that follows Steve Yegge's methodology of + going in fast, slow, and medium cycles. + ''; + homepage = "https://github.com/pb-/gotypist"; + license = licenses.mit; + maintainers = [ "Paul Baecher" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0b8fc8ec3bb9..da8d8168f500 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3140,6 +3140,8 @@ with pkgs; gotify-desktop = callPackage ../tools/misc/gotify-desktop { }; + gotypist = callPackage ../games/gotypist { }; + gping = callPackage ../tools/networking/gping { }; gpu-burn = callPackage ../applications/misc/gpu-burn { }; From c0201620c625d120000c57de71c7e91c9a713518 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Dec 2021 01:24:51 +0000 Subject: [PATCH 35/72] links2: 2.23 -> 2.25 --- pkgs/applications/networking/browsers/links2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index 81555fa63411..3a5b31e98e99 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.23"; + version = "2.25"; pname = "links2"; src = fetchurl { url = "${meta.homepage}/download/links-${version}.tar.bz2"; - sha256 = "sha256-ZmDSAvUh/Ri/UYTD8XMtH6dCahAzdCd60c245XzmrEU="; + sha256 = "sha256-LdeFCGmOgnnvTwmjoqIelZUEARNALabFU5dEFPtJ3Sw="; }; buildInputs = with lib; From 9de828928a3869cfab9e9f5f3ba12c01730480a2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Dec 2021 17:30:41 +0000 Subject: [PATCH 36/72] python38Packages.colorclass: 2.2.0 -> 2.2.2 --- pkgs/development/python-modules/colorclass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/colorclass/default.nix b/pkgs/development/python-modules/colorclass/default.nix index 50a052ec1f94..f1a153ee1bc9 100644 --- a/pkgs/development/python-modules/colorclass/default.nix +++ b/pkgs/development/python-modules/colorclass/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "colorclass"; - version = "2.2.0"; + version = "2.2.2"; src = fetchPypi { inherit pname version; - sha256 = "b05c2a348dfc1aff2d502527d78a5b7b7e2f85da94a96c5081210d8e9ee8e18b"; + sha256 = "6d4fe287766166a98ca7bc6f6312daf04a0481b1eda43e7173484051c0ab4366"; }; # No tests in archive From 07a9648c8ad875b80b6dcc232710f537a316d960 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Dec 2021 21:37:09 +0000 Subject: [PATCH 37/72] python38Packages.baron: 0.9 -> 0.10.1 --- pkgs/development/python-modules/baron/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/baron/default.nix b/pkgs/development/python-modules/baron/default.nix index 8a04befc6d16..e5a752dd5dbb 100644 --- a/pkgs/development/python-modules/baron/default.nix +++ b/pkgs/development/python-modules/baron/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "baron"; - version = "0.9"; + version = "0.10.1"; src = fetchPypi { inherit pname version; - sha256 = "0fib74nkqnl1i2zzlhbbfpw3whwc4951p9x61r2xrxhwp4r9yn5h"; + sha256 = "af822ad44d4eb425c8516df4239ac4fdba9fdb398ef77e4924cd7c9b4045bc2f"; }; propagatedBuildInputs = [ rply ]; From ebbaef02876fee479fd0a16031acc58489bd43d0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Dec 2021 19:36:54 +0000 Subject: [PATCH 38/72] python38Packages.xmlschema: 1.9.0 -> 1.9.1 --- pkgs/development/python-modules/xmlschema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xmlschema/default.nix b/pkgs/development/python-modules/xmlschema/default.nix index c8e9b259d794..ba10a335ac93 100644 --- a/pkgs/development/python-modules/xmlschema/default.nix +++ b/pkgs/development/python-modules/xmlschema/default.nix @@ -8,7 +8,7 @@ }: buildPythonPackage rec { - version = "1.9.0"; + version = "1.9.1"; pname = "xmlschema"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "xmlschema"; rev = "v${version}"; - sha256 = "0sfpylajab0xjpaqrlqmbwnby6w848y1y9fsv9xlqazxiyzwil46"; + sha256 = "0z1mqjilnmbsdr8hw787irdk7419df2x8k765l9n5pb6ykdgz131"; }; propagatedBuildInputs = [ From 82c8934867e17c303feb00890ebabb0c8743af19 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Dec 2021 10:34:48 +0100 Subject: [PATCH 39/72] python3Packages.elmax-api: init at 0.0.2 --- .../python-modules/elmax-api/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/elmax-api/default.nix diff --git a/pkgs/development/python-modules/elmax-api/default.nix b/pkgs/development/python-modules/elmax-api/default.nix new file mode 100644 index 000000000000..34d848d9a195 --- /dev/null +++ b/pkgs/development/python-modules/elmax-api/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, httpx +, pyjwt +, pythonOlder +, yarl +}: + +buildPythonPackage rec { + pname = "elmax-api"; + version = "0.0.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "albertogeniola"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-YUnLi8+ibUgWoMFMgZPSPbpr286bnWBefxjOV7JfCuY="; + }; + + propagatedBuildInputs = [ + httpx + pyjwt + yarl + ]; + + # Test require network access + doCheck = false; + + pythonImportsCheck = [ + "elmax_api" + ]; + + meta = with lib; { + description = "Python library for interacting with the Elmax cloud"; + homepage = "https://github.com/albertogeniola/elmax-api"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 471d4edcfa9e..a82203e0a84c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2464,6 +2464,8 @@ in { elmax = callPackage ../development/python-modules/elmax { }; + elmax-api = callPackage ../development/python-modules/elmax-api { }; + emailthreads = callPackage ../development/python-modules/emailthreads { }; email_validator = callPackage ../development/python-modules/email-validator { }; From 68c4b01f72fc1c473ee8b5b926d54bddcb7d84c3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Dec 2021 21:31:23 +0100 Subject: [PATCH 40/72] python3Packages.nmapthon2: init at 0.1.2 --- .../python-modules/nmapthon2/default.nix | 34 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/python-modules/nmapthon2/default.nix diff --git a/pkgs/development/python-modules/nmapthon2/default.nix b/pkgs/development/python-modules/nmapthon2/default.nix new file mode 100644 index 000000000000..2567e70b0d67 --- /dev/null +++ b/pkgs/development/python-modules/nmapthon2/default.nix @@ -0,0 +1,34 @@ +{ lib +, appdirs +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "nmapthon2"; + version = "0.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-6mGMB8nW6CqTPxgc1fveh6fJo/t+jpUS6rJ2VR2gU/g="; + }; + + # Tests are not part of the PyPI source and source is not tagged + # https://github.com/cblopez/nmapthon2/issues/3 + doCheck = false; + + pythonImportsCheck = [ + "nmapthon2" + ]; + + meta = with lib; { + description = "Python library to automate nmap"; + homepage = "https://github.com/cblopez/nmapthon2"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a82203e0a84c..3d6fd0ce5685 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5222,6 +5222,8 @@ in { nltk = callPackage ../development/python-modules/nltk { }; + nmapthon2 = callPackage ../development/python-modules/nmapthon2 { }; + nmigen-boards = callPackage ../development/python-modules/nmigen-boards { }; nmigen = callPackage ../development/python-modules/nmigen { }; From b12ed5c4df7110f29cec10b691bb8a8805c33a73 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Dec 2021 21:00:35 +0100 Subject: [PATCH 41/72] python3Packages.tesla-wall-connector: 1.0.0 -> 1.0.1 --- .../tesla-wall-connector/default.nix | 27 ++++++++++++------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/tesla-wall-connector/default.nix b/pkgs/development/python-modules/tesla-wall-connector/default.nix index 8aaaa2cb0fad..e814f01320e4 100644 --- a/pkgs/development/python-modules/tesla-wall-connector/default.nix +++ b/pkgs/development/python-modules/tesla-wall-connector/default.nix @@ -1,25 +1,28 @@ { lib , aiohttp -, backoff , aioresponses +, aresponses +, backoff , buildPythonPackage -, fetchPypi -, pytest-aiohttp -, pytestCheckHook +, fetchFromGitHub , poetry-core +, pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "tesla-wall-connector"; - version = "1.0.0"; + version = "1.0.1"; format = "pyproject"; disabled = pythonOlder "3.8"; - src = fetchPypi { - inherit pname version; - sha256 = "PVgM6tC8jy/tXytkAVC0Y4Oatap5YFA3vpkUgAdyTxM="; + src = fetchFromGitHub { + owner = "einarhauks"; + repo = pname; + rev = version; + sha256 = "sha256-JBtlGd9aHY8ikhpJ5v7ZcNu3BfLdBmOBZCMa6C0s6gE="; }; nativeBuildInputs = [ @@ -31,8 +34,12 @@ buildPythonPackage rec { backoff ]; - # https://github.com/einarhauks/tesla-wall-connector/issues/1 - doCheck = false; + checkInputs = [ + aresponses + pytest-asyncio + pytestCheckHook + ]; + pythonImportsCheck = [ "tesla_wall_connector" From c9c22c593acfb818aa8ba9a227d64c212290e1e5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Dec 2021 17:51:45 +0100 Subject: [PATCH 42/72] python3Packages.ascii-magic: init at 1.6 --- .../python-modules/ascii-magic/default.nix | 36 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/python-modules/ascii-magic/default.nix diff --git a/pkgs/development/python-modules/ascii-magic/default.nix b/pkgs/development/python-modules/ascii-magic/default.nix new file mode 100644 index 000000000000..6a1b617c03ed --- /dev/null +++ b/pkgs/development/python-modules/ascii-magic/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, colorama +, fetchPypi +, pillow +}: + +buildPythonPackage rec { + pname = "ascii-magic"; + version = "1.6"; + + src = fetchPypi { + pname = "ascii_magic"; + inherit version; + sha256 = "sha256-faVRj3No5z8R4hUaDAYIBKoUniZ7Npt+52U/vXsEalE="; + }; + + propagatedBuildInputs = [ + colorama + pillow + ]; + + # Project is not tagging releases and tests are not shipped with PyPI source + doCheck = false; + + pythonImportsCheck = [ + "ascii_magic" + ]; + + meta = with lib; { + description = "Python module to converts pictures into ASCII art"; + homepage = "https://github.com/LeandroBarone/python-ascii_magic"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3d6fd0ce5685..dedb2446ba6a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -603,6 +603,8 @@ in { asana = callPackage ../development/python-modules/asana { }; + ascii-magic = callPackage ../development/python-modules/ascii-magic { }; + asciimatics = callPackage ../development/python-modules/asciimatics { }; asciitree = callPackage ../development/python-modules/asciitree { }; From 3a75d8fe4dfc6cb3af31583aafadd7c7c5f4d6f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Dec 2021 19:09:11 +0100 Subject: [PATCH 43/72] python3Packages.weconnect: init at 0.26.0 --- .../python-modules/weconnect/default.nix | 58 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/weconnect/default.nix diff --git a/pkgs/development/python-modules/weconnect/default.nix b/pkgs/development/python-modules/weconnect/default.nix new file mode 100644 index 000000000000..4c560695ca58 --- /dev/null +++ b/pkgs/development/python-modules/weconnect/default.nix @@ -0,0 +1,58 @@ +{ lib +, ascii-magic +, buildPythonPackage +, fetchFromGitHub +, pillow +, pytest-httpserver +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "weconnect"; + version = "0.26.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "tillsteinbach"; + repo = "WeConnect-python"; + rev = "v${version}"; + sha256 = "sha256-30guJudGOY8WAYupX89hx6mFwfAPASnKMSa+0kDbtfQ="; + }; + + propagatedBuildInputs = [ + ascii-magic + pillow + requests + ]; + + checkInputs = [ + pytest-httpserver + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace weconnect/__version.py \ + --replace "develop" "${version}" + substituteInPlace setup.py \ + --replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \ + --replace "tests_require=TEST_REQUIRED," "tests_require=[]," + substituteInPlace pytest.ini \ + --replace "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \ + --replace "pytest-cov" "" + ''; + + pythonImportsCheck = [ + "weconnect" + ]; + + meta = with lib; { + description = "Python client for the Volkswagen WeConnect Services"; + homepage = "https://github.com/tillsteinbach/WeConnect-python"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dedb2446ba6a..fb088309b814 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10074,6 +10074,8 @@ in { webthing = callPackage ../development/python-modules/webthing { }; + weconnect = callPackage ../development/python-modules/weconnect { }; + werkzeug = callPackage ../development/python-modules/werkzeug { }; werkzeug1 = callPackage ../development/python-modules/werkzeug/1.nix { }; From 24428bb3eabb497ed550bfe3ebf051ac201d7ef3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Dec 2021 19:10:17 +0100 Subject: [PATCH 44/72] python3Packages.weconnect-mqtt: init at 0.20.0 --- .../python-modules/weconnect-mqtt/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/weconnect-mqtt/default.nix diff --git a/pkgs/development/python-modules/weconnect-mqtt/default.nix b/pkgs/development/python-modules/weconnect-mqtt/default.nix new file mode 100644 index 000000000000..cda023f1b47c --- /dev/null +++ b/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, paho-mqtt +, weconnect +}: + +buildPythonPackage rec { + pname = "weconnect-mqtt"; + version = "0.20.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "tillsteinbach"; + repo = "WeConnect-mqtt"; + rev = "v${version}"; + sha256 = "sha256-RUOOHVX9IY24ZpDE7nQr//JxtQZgowcT5PrTgzaTK6Q="; + }; + + propagatedBuildInputs = [ + paho-mqtt + weconnect + ]; + + postPatch = '' + substituteInPlace weconnect_mqtt/__version.py \ + --replace "develop" "${version}" + substituteInPlace pytest.ini \ + --replace "--cov=weconnect_mqtt --cov-config=.coveragerc --cov-report html" "" \ + --replace "pytest-cov" "" + ''; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "weconnect_mqtt" + ]; + + meta = with lib; { + description = "Python client that publishes data from Volkswagen WeConnect"; + homepage = "https://github.com/tillsteinbach/WeConnect-mqtt"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fb088309b814..6a654ba00757 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10076,6 +10076,8 @@ in { weconnect = callPackage ../development/python-modules/weconnect { }; + weconnect-mqtt = callPackage ../development/python-modules/weconnect-mqtt { }; + werkzeug = callPackage ../development/python-modules/werkzeug { }; werkzeug1 = callPackage ../development/python-modules/werkzeug/1.nix { }; From 082e6642662d199782e60c1566103fec212dd286 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Dec 2021 14:34:04 +0000 Subject: [PATCH 45/72] python38Packages.xml2rfc: 3.11.1 -> 3.12.0 --- pkgs/development/python-modules/xml2rfc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index a46c0b1b4ef5..26b51d1a4ac3 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.11.1"; + version = "3.12.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-V1Epv5TJ4+Gnh096jeQIN0HOCj+GoCdQW/Pol5iBrFw="; + sha256 = "25deadb9ee95f0dc71376a60e9c1e34636b5016c1952ad5597a6246495e34464"; }; propagatedBuildInputs = [ From 8435df241cb7005e92d6e6f0e1139f68d0f54ac3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 13:37:57 +0000 Subject: [PATCH 46/72] python38Packages.karton-autoit-ripper: 1.0.1 -> 1.1.0 --- .../python-modules/karton-autoit-ripper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/karton-autoit-ripper/default.nix b/pkgs/development/python-modules/karton-autoit-ripper/default.nix index e675c055d786..2e7d561cf6e0 100644 --- a/pkgs/development/python-modules/karton-autoit-ripper/default.nix +++ b/pkgs/development/python-modules/karton-autoit-ripper/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "karton-autoit-ripper"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "CERT-Polska"; repo = pname; rev = "v${version}"; - sha256 = "1bsqpf9w6d9fjysmnafaglg2w41gsafs2xz4dzcgc7n92shpcs8w"; + sha256 = "1gclrrc0n72bfj4m55kk8d69zrfvnlwm9692ni9w7d2231mvv7bw"; }; propagatedBuildInputs = [ From 59ab20919d9bfc6c35b22caacbcb882aca54361e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 23:26:54 +0000 Subject: [PATCH 47/72] python38Packages.z3c-checkversions: 1.1 -> 1.2 --- pkgs/development/python-modules/z3c-checkversions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/z3c-checkversions/default.nix b/pkgs/development/python-modules/z3c-checkversions/default.nix index b8c684295a6f..26898ff2cd2c 100644 --- a/pkgs/development/python-modules/z3c-checkversions/default.nix +++ b/pkgs/development/python-modules/z3c-checkversions/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "z3c-checkversions"; - version = "1.1"; + version = "1.2"; src = fetchPypi { inherit version; pname = "z3c.checkversions"; - sha256 = "b45bd22ae01ed60933694fb5abede1ff71fe8ffa79b37082b2fcf38a2f0dec9d"; + sha256 = "94c7ab0810ee6fdb66a4689b48e537b57e2dbee277cb1de2ece7a7f4d8c83001"; }; propagatedBuildInputs = [ zc-buildout ]; From 7d159e084b5c1736f6979579e29868afe813de33 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 23:01:27 +0000 Subject: [PATCH 48/72] python38Packages.wtf-peewee: 3.0.2 -> 3.0.3 --- pkgs/development/python-modules/wtf-peewee/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wtf-peewee/default.nix b/pkgs/development/python-modules/wtf-peewee/default.nix index 69db4e50f675..6fd356e69ed6 100644 --- a/pkgs/development/python-modules/wtf-peewee/default.nix +++ b/pkgs/development/python-modules/wtf-peewee/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "wtf-peewee"; - version = "3.0.2"; + version = "3.0.3"; src = fetchPypi { inherit pname version; - sha256 = "03qs6np5s9r0nmsryfzll29ajcqk27b18kcbgd9plf80ys3nb6kd"; + sha256 = "faa953fe3f705d4f2b48f3c1a81c5c5a6a38f9ed1378c9a830e6efc1b0fccb15"; }; propagatedBuildInputs = [ From 6cb0cfacf68eb403cc79ea0266d9dcf462f6ee1a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Dec 2021 07:36:47 +0000 Subject: [PATCH 49/72] python38Packages.spglib: 1.16.1 -> 1.16.3 --- pkgs/development/python-modules/spglib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/spglib/default.nix b/pkgs/development/python-modules/spglib/default.nix index e1d87bba03e3..a54fa65d08b7 100644 --- a/pkgs/development/python-modules/spglib/default.nix +++ b/pkgs/development/python-modules/spglib/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "spglib"; - version = "1.16.1"; + version = "1.16.3"; src = fetchPypi { inherit pname version; - sha256 = "9fd2fefbd83993b135877a69c498d8ddcf20a9980562b65b800cfb4cdadad003"; + sha256 = "ff1420967d64c2d4f0d747886116a6836d9b473454cdd73d560dbfe973a8a038"; }; propagatedBuildInputs = [ numpy ]; From edbe8f43993c70c26bc4ab2fc9764756685f6c9e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 9 Dec 2021 09:25:33 +0000 Subject: [PATCH 50/72] python38Packages.trimesh: 3.9.35 -> 3.9.36 --- pkgs/development/python-modules/trimesh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/trimesh/default.nix b/pkgs/development/python-modules/trimesh/default.nix index c96ab4cd55e9..e2ccb99da682 100644 --- a/pkgs/development/python-modules/trimesh/default.nix +++ b/pkgs/development/python-modules/trimesh/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "trimesh"; - version = "3.9.35"; + version = "3.9.36"; src = fetchPypi { inherit pname version; - sha256 = "1632a09c7b3c152170dbad05b796033540feba4746a8e9c4a437eaa563c47bc9"; + sha256 = "f01e8edab14d1999700c980c21a1546f37417216ad915a53be649d263130181e"; }; propagatedBuildInputs = [ numpy ]; From 7de4ded03b7dae65f4898dc35dbfc1d4633558da Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 9 Dec 2021 18:47:28 -0800 Subject: [PATCH 51/72] python3Packages.pyjwt1: move to privacyidea overlay --- .../applications/misc/privacyidea/default.nix | 12 +++++- pkgs/development/python-modules/pyjwt/1.nix | 38 ------------------- pkgs/top-level/python-packages.nix | 2 - pkgs/top-level/python2-packages.nix | 2 - 4 files changed, 11 insertions(+), 43 deletions(-) delete mode 100644 pkgs/development/python-modules/pyjwt/1.nix diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index 6757cd3f7fa0..912cb9b94b1b 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -25,6 +25,16 @@ let sqlsoup = super.sqlsoup.overrideAttrs ({ meta ? {}, ... }: { meta = meta // { broken = false; }; }); + pyjwt = super.pyjwt.overridePythonAttrs (oldAttrs: rec { + version = "1.7.1"; + src = python3.pkgs.fetchPypi { + pname = "PyJWT"; + inherit version; + sha256 = "sha256-jVmpdvt3Pz5qOchWNjV8Tw4kJwc5TK2t2YFPXLqiDpY="; + }; + # requires different testing dependencies, and privacyIDEA will test this as well + doCheck = false; + }); }; }; in @@ -42,7 +52,7 @@ python3'.pkgs.buildPythonPackage rec { propagatedBuildInputs = with python3'.pkgs; [ cryptography pyrad pymysql python-dateutil flask-versioned flask_script - defusedxml croniter flask_migrate pyjwt1 configobj sqlsoup pillow + defusedxml croniter flask_migrate pyjwt configobj sqlsoup pillow python-gnupg passlib pyopenssl beautifulsoup4 smpplib flask-babel ldap3 huey pyyaml qrcode oauth2client requests lxml cbor2 psycopg2 pydash ecdsa google-auth importlib-metadata diff --git a/pkgs/development/python-modules/pyjwt/1.nix b/pkgs/development/python-modules/pyjwt/1.nix deleted file mode 100644 index 285e5e2e7600..000000000000 --- a/pkgs/development/python-modules/pyjwt/1.nix +++ /dev/null @@ -1,38 +0,0 @@ -{ lib -, buildPythonPackage -, fetchPypi -, cryptography -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "PyJWT"; - version = "1.7.1"; - - src = fetchPypi { - inherit pname version; - sha256 = "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd"; - }; - - postPatch = '' - substituteInPlace setup.py --replace "pytest>=4.0.1,<5.0.0" "pytest" - - # drop coverage - sed -i '/pytest-cov/d' setup.py - sed -i '/--cov/d' setup.cfg - ''; - - propagatedBuildInputs = [ - cryptography - ]; - - checkInputs = [ - pytestCheckHook - ]; - - meta = with lib; { - description = "JSON Web Token implementation in Python"; - homepage = "https://github.com/jpadilla/pyjwt"; - license = licenses.mit; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a654ba00757..29655c95ce4c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6100,8 +6100,6 @@ in { privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea-ldap-proxy { }; - pyjwt1 = callPackage ../development/python-modules/pyjwt/1.nix { }; - proboscis = callPackage ../development/python-modules/proboscis { }; process-tests = callPackage ../development/python-modules/process-tests { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 59afe1064168..7e485bdf3bfb 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -457,8 +457,6 @@ with self; with super; { pyhamcrest = callPackage ../development/python-modules/pyhamcrest/1.nix { }; - pyjwt = callPackage ../development/python-modules/pyjwt/1.nix { }; - pykickstart = callPackage ../development/python-modules/pykickstart { }; pylibacl = callPackage ../development/python-modules/pylibacl/0.5.nix { }; From deaec9f2890f900c74b6fe3fa698092c16fde320 Mon Sep 17 00:00:00 2001 From: Tom Prince Date: Thu, 2 Dec 2021 12:57:55 -0700 Subject: [PATCH 52/72] Fix some places where python2 packages fail to evaluate. I unfortunately still depend on some python2 packages. It appears that these two packages fail to evaluate, in a way that `tryEval` doesn't catch. This changes them to be explicitly disabled there. --- pkgs/top-level/python-packages.nix | 2 ++ pkgs/top-level/python2-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 29655c95ce4c..79b2044f69b5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -545,6 +545,8 @@ in { appdirs = callPackage ../development/python-modules/appdirs { }; + appleseed = toPythonModule (pkgs.appleseed.override { python3 = self.python; }); + applicationinsights = callPackage ../development/python-modules/applicationinsights { }; appnope = callPackage ../development/python-modules/appnope { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index 7e485bdf3bfb..a8899a18198c 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -12,7 +12,7 @@ with self; with super; { inherit (pkgs) antlr4; }; - appleseed = toPythonModule (pkgs.appleseed.override { inherit (self) python; }); + appleseed = disabled super.appleseed; application = callPackage ../development/python-modules/application { }; @@ -616,6 +616,8 @@ with self; with super; { tarman = callPackage ../development/python-modules/tarman { }; + tensorflow-bin = disabled super.tensorflow-bin; + thumbor = callPackage ../development/python-modules/thumbor { }; tmdb3 = callPackage ../development/python-modules/tmdb3 { }; From 427912ea93fc9f4025b2565171389b89588a0c1e Mon Sep 17 00:00:00 2001 From: Tom Prince Date: Thu, 2 Dec 2021 14:44:01 -0700 Subject: [PATCH 53/72] Move where a couple of existing packages are disabled on python2. This moves where the package are disabled to `pkgs/top-level/python2-packages.nix`. --- pkgs/top-level/python-packages.nix | 8 ++++---- pkgs/top-level/python2-packages.nix | 4 ++++ 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 79b2044f69b5..bac0ccbcbd96 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5447,10 +5447,10 @@ in { opentracing = callPackage ../development/python-modules/opentracing { }; - openvino = disabledIf isPy27 (toPythonModule (pkgs.openvino.override { + openvino = toPythonModule (pkgs.openvino.override { inherit (self) python; enablePython = true; - })); + }); openwebifpy = callPackage ../development/python-modules/openwebifpy { }; @@ -8206,9 +8206,9 @@ in { recaptcha_client = callPackage ../development/python-modules/recaptcha_client { }; - recoll = disabledIf (!isPy3k) (toPythonModule (pkgs.recoll.override { + recoll = toPythonModule (pkgs.recoll.override { python3Packages = self; - })); + }); recommonmark = callPackage ../development/python-modules/recommonmark { }; diff --git a/pkgs/top-level/python2-packages.nix b/pkgs/top-level/python2-packages.nix index a8899a18198c..df66908d5135 100644 --- a/pkgs/top-level/python2-packages.nix +++ b/pkgs/top-level/python2-packages.nix @@ -373,6 +373,8 @@ with self; with super; { openpyxl = callPackage ../development/python-modules/openpyxl/2.nix { }; + openvino = disabled super.openvino; + openwrt-luci-rpc = disabled super.openwrt-luci-rpc; opt-einsum = callPackage ../development/python-modules/opt-einsum/2.nix { }; @@ -520,6 +522,8 @@ with self; with super; { remotecv = callPackage ../development/python-modules/remotecv { }; + recoll = disabled super.recoll; + rhpl = callPackage ../development/python-modules/rhpl { }; rivet = disabled super.rivet; From 3f01341c8a9250c771a3b76eb458ba3ae346b3f9 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Sun, 5 Dec 2021 22:06:32 -0800 Subject: [PATCH 54/72] azure-cli: python -> python3 renaming, remove optional py2 deps To avoid python2 false positives --- pkgs/tools/admin/azure-cli/default.nix | 3 +-- pkgs/tools/admin/azure-cli/python-packages.nix | 9 ++++----- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/admin/azure-cli/default.nix b/pkgs/tools/admin/azure-cli/default.nix index 4034ac315642..728fcf6eec5b 100644 --- a/pkgs/tools/admin/azure-cli/default.nix +++ b/pkgs/tools/admin/azure-cli/default.nix @@ -14,8 +14,7 @@ let # put packages that needs to be overriden in the py package scope py = import ./python-packages.nix { - inherit stdenv lib src version; - python = python3; + inherit stdenv lib src version python3; }; in py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 2b820aa95699..1541e796272d 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -1,4 +1,4 @@ -{ stdenv, python, lib, src, version }: +{ stdenv, python3, lib, src, version }: let buildAzureCliPackage = with py.pkgs; attrs: buildPythonPackage attrs; @@ -25,7 +25,7 @@ let pythonNamespaces = [ "azure.mgmt" ]; }); - py = python.override { + py = python3.override { packageOverrides = self: super: { inherit buildAzureCliPackage; @@ -38,6 +38,7 @@ let propagatedBuildInputs = with self; [ adal + antlr4-python3-runtime argcomplete azure-common azure-cli-telemetry @@ -63,9 +64,7 @@ let requests six tabulate - ] - ++ lib.optionals isPy3k [ antlr4-python3-runtime ] - ++ lib.optionals (!isPy3k) [ enum34 futures antlr4-python2-runtime ndg-httpsclient ]; + ]; postPatch = '' substituteInPlace setup.py \ From f6506072b598a0d2dcea77cdc5aa4011fd58163c Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Tue, 7 Dec 2021 07:20:30 -0600 Subject: [PATCH 55/72] python38Packages.deep-translator: init at 1.5.5 --- .../deep-translator/default.nix | 33 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/development/python-modules/deep-translator/default.nix diff --git a/pkgs/development/python-modules/deep-translator/default.nix b/pkgs/development/python-modules/deep-translator/default.nix new file mode 100644 index 000000000000..a91c02a2bf3e --- /dev/null +++ b/pkgs/development/python-modules/deep-translator/default.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonPackage, fetchPypi, beautifulsoup4, requests, click }: + +buildPythonPackage rec { + pname = "deep-translator"; + version = "1.5.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-XARhzRsquvKcdhPcooGIEmhGN7QJOCubcvOrZB0nhxU="; + }; + + propagatedBuildInputs = [ + beautifulsoup4 + requests + click + ]; + + # Initializing it during build won't work as it needs connection with + # APIs and the build environment is isolated (#148572 for details). + # After built, it works as intended. + #pythonImportsCheck = [ "deep_translator" ]; + + # Again, initializing an instance needs network connection. + # Tests will fail. + doCheck = false; + + meta = with lib; { + description = "Flexible, free and unlimited Python tool to translate between different languages in a simple way using multiple translators"; + homepage = "https://deep-translator.readthedocs.io"; + license = licenses.mit; + maintainers = with maintainers; [ wolfangaukang ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da8d8168f500..db1a0f681f6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31241,6 +31241,8 @@ with pkgs; deeptools = callPackage ../applications/science/biology/deeptools { python = python3; }; + deep-translator = with python3Packages; toPythonApplication deep-translator; + delly = callPackage ../applications/science/biology/delly { }; diamond = callPackage ../applications/science/biology/diamond { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bac0ccbcbd96..c1941da85a5f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2014,6 +2014,8 @@ in { deeptoolsintervals = callPackage ../development/python-modules/deeptoolsintervals { }; + deep-translator = callPackage ../development/python-modules/deep-translator { }; + deezer-py = callPackage ../development/python-modules/deezer-py { }; deezer-python = callPackage ../development/python-modules/deezer-python { }; From f603ffb7f5ca950ade3911dce6d53698e6c80e71 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 00:37:22 +0000 Subject: [PATCH 56/72] python39Packages.aioesphomeapi: 10.2.0 -> 10.6.0 --- pkgs/development/python-modules/aioesphomeapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aioesphomeapi/default.nix b/pkgs/development/python-modules/aioesphomeapi/default.nix index 58b664b2cb1d..5023b0325233 100644 --- a/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "10.2.0"; + version = "10.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SUM9P7qmP3LWANw8LiwMsT5sN1kZJvqeaBT/ZDmTtwE="; + sha256 = "1z9pybis8yi938i3cgzma4w452ik9vggyyhs3y542zpk4183d7xw"; }; propagatedBuildInputs = [ From 2c85c77a8a4c2580e7b116f0c62e4fa233b7238d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 13:18:24 +0000 Subject: [PATCH 57/72] python38Packages.pysatochip: 0.12.3 -> 0.14.1 --- pkgs/development/python-modules/pysatochip/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysatochip/default.nix b/pkgs/development/python-modules/pysatochip/default.nix index a2e726903554..81c0d8bda204 100644 --- a/pkgs/development/python-modules/pysatochip/default.nix +++ b/pkgs/development/python-modules/pysatochip/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "pysatochip"; - version = "0.12.3"; + version = "0.14.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "24db358a65c0402c299c0c62efcfbbfc98e494181cd30d3996949ac667d5b4d4"; + sha256 = "eba800c82ea45e2524c0773a71c36e525d7c18148e6066e336950cef484555f5"; }; postPatch = '' From 588b5dfe7dc5df48c06247912e54a7fcd58305a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 10:07:22 +0000 Subject: [PATCH 58/72] python39Packages.pysnooper: 0.4.1 -> 1.0.0 --- pkgs/development/python-modules/pysnooper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysnooper/default.nix b/pkgs/development/python-modules/pysnooper/default.nix index 61e1de20acf9..b92ba38c9d09 100644 --- a/pkgs/development/python-modules/pysnooper/default.nix +++ b/pkgs/development/python-modules/pysnooper/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "0.4.1"; + version = "1.0.0"; pname = "pysnooper"; src = fetchPypi { inherit version; pname = "PySnooper"; - sha256 = "1xngly13x3ylwwcdml2ns8skpxip2myzavp3b9ff2dpqaalf0hdl"; + sha256 = "4804aed962f36db85fefdc33edbd109b96a13153e6ffed82d1e6023b4f483b64"; }; # test dependency python-toolbox fails with py27 From ed4b6b63f7ae53d75f32b4f2586963fc6b027dea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 7 Dec 2021 08:07:59 +0000 Subject: [PATCH 59/72] python38Packages.nunavut: 1.5.1 -> 1.5.2 --- pkgs/development/python-modules/nunavut/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/nunavut/default.nix b/pkgs/development/python-modules/nunavut/default.nix index 75eb114ac581..8c4c8e1fbc5f 100644 --- a/pkgs/development/python-modules/nunavut/default.nix +++ b/pkgs/development/python-modules/nunavut/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "nunavut"; - version = "1.5.1"; + version = "1.5.2"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "2c57a9ffe6d462b0ad1ea49ac3ce9ebb3e8d43b2adf653dbe47eaf1b13be3c3b"; + sha256 = "12703306872404be556648ab2282dc1566f4e77bfb9f14747fb13294c9235081"; }; propagatedBuildInputs = [ From 29ebba5ee911d9978177337d7f784d57c139fa17 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 10 Dec 2021 03:32:14 +0000 Subject: [PATCH 60/72] python38Packages.moonraker-api: 2.0.2 -> 2.0.4 --- pkgs/development/python-modules/moonraker-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/moonraker-api/default.nix b/pkgs/development/python-modules/moonraker-api/default.nix index ac991e25f41d..2888ff1e06d1 100644 --- a/pkgs/development/python-modules/moonraker-api/default.nix +++ b/pkgs/development/python-modules/moonraker-api/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "moonraker-api"; - version = "2.0.2"; + version = "2.0.4"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "cmroche"; repo = pname; rev = "v${version}"; - sha256 = "1ODfwuO8XeleOnpp/dD+8jfEAIesXT1BuImtXTn289U="; + sha256 = "1hhm3jnl9qm44y4k927fzw1n32c3551kgsk7i57qw25nca9x3k61"; }; propagatedBuildInputs = [ From 3a2b13faf9282aa5920e90b0701859f3ac3c64f4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 9 Dec 2021 15:54:09 +0100 Subject: [PATCH 61/72] python3Packages.types-pytz: 2021.3.1 -> 2021.3.2 --- pkgs/development/python-modules/types-pytz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index 62f3d36208e7..b4c07bbaedbc 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2021.3.1"; + version = "2021.3.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-3/138+/s07FVXxh6m/OmONVfrClnALgpxBvVHscqbrc="; + sha256 = "sha256-xO42Rm+u2a8zTRUJPQXOpBYyPS0EMVi7WCu5TAQav1E="; }; # Modules doesn't have tests From 344c76dc415714305f4c2995120f0d0208624fb2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 14:14:57 +0000 Subject: [PATCH 62/72] pam_u2f: 1.1.1 -> 1.2.0 --- pkgs/os-specific/linux/pam_u2f/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pam_u2f/default.nix b/pkgs/os-specific/linux/pam_u2f/default.nix index 30a55f2b9c00..5e4b190c7a32 100644 --- a/pkgs/os-specific/linux/pam_u2f/default.nix +++ b/pkgs/os-specific/linux/pam_u2f/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pam_u2f"; - version = "1.1.1"; + version = "1.2.0"; src = fetchurl { url = "https://developers.yubico.com/pam-u2f/Releases/${pname}-${version}.tar.gz"; - sha256 = "12p3pkrp32vzpg7707cgx8zgvgj8iqwhy39sm761k7plqi027mmp"; + sha256 = "sha256-IwPm+Zsf3o7jw6sopN4tpt3SJclTaT6EXWstg4giH7M="; }; nativeBuildInputs = [ pkg-config ]; From 1e6472c8182d2e8fa2cc5bb63e6cd9bfdeb276ee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 13:40:24 +0000 Subject: [PATCH 63/72] OSCAR: 1.2.0 -> 1.3.0 --- pkgs/applications/misc/OSCAR/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/OSCAR/default.nix b/pkgs/applications/misc/OSCAR/default.nix index 7115801d00bb..92eeeb142cc0 100644 --- a/pkgs/applications/misc/OSCAR/default.nix +++ b/pkgs/applications/misc/OSCAR/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, mkDerivation, fetchFromGitLab, qmake, qtbase, qttools, qtserialport, libGLU }: mkDerivation rec { pname = "OSCAR"; - version = "1.2.0"; + version = "1.3.0"; src = fetchFromGitLab { owner = "pholy"; repo = "OSCAR-code"; rev = "v${version}"; - sha256 = "10r37d8c2avr167n2s9lhld1c9hmckm444fq163z1jsy9jpid6mg"; + sha256 = "sha256-oKKwX5HiT8RACiqzZegOxH6IHQn/u0N4ih/ubH6YYjg="; }; buildInputs = [ qtbase qttools qtserialport libGLU ]; From d75301ea79456236fdc641dd39ee0f05edd267f0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 09:24:32 +0000 Subject: [PATCH 64/72] pulseaudio-ctl: 1.69 -> 1.70 --- pkgs/applications/audio/pulseaudio-ctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/pulseaudio-ctl/default.nix b/pkgs/applications/audio/pulseaudio-ctl/default.nix index 9d1d6df1da50..1b21aa9d4163 100644 --- a/pkgs/applications/audio/pulseaudio-ctl/default.nix +++ b/pkgs/applications/audio/pulseaudio-ctl/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "1.69"; + version = "1.70"; src = fetchFromGitHub { owner = "graysky2"; repo = pname; rev = "v${version}"; - sha256 = "sha256-5WRhVIQlSwWuyvkzrnNW0rdVet9ZzM47gISJpznM8mU="; + sha256 = "sha256-ZB1jrr31PF7+vNB+Xo5CATJmYbuDAPwewpDxCVnAowY="; }; postPatch = '' From 344495688086b37b626294b38b0e11ab152f34ab Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 14:07:28 +0000 Subject: [PATCH 65/72] pcsctools: 1.5.7 -> 1.5.8 --- pkgs/tools/security/pcsctools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pcsctools/default.nix b/pkgs/tools/security/pcsctools/default.nix index 51813526de15..cf8ecf180b3a 100644 --- a/pkgs/tools/security/pcsctools/default.nix +++ b/pkgs/tools/security/pcsctools/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "pcsc-tools"; - version = "1.5.7"; + version = "1.5.8"; src = fetchurl { url = "http://ludovic.rousseau.free.fr/softwares/pcsc-tools/${pname}-${version}.tar.bz2"; - sha256 = "17b9jxvcxmn007lavan20l25v4jvm6dqc4x9dlqzbg6mjs28zsp0"; + sha256 = "sha256-h8HtvbjJc1Bj9oiqPgXjiTqI54syLcaa+AdX7ZAoIhI="; }; postPatch = '' From 388f0db0afb7ee0760caa70e4601f3fb7c3a21ac Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 10 Dec 2021 01:20:34 +1000 Subject: [PATCH 66/72] go_1_17: 1.17.4 -> 1.17.5 --- pkgs/development/compilers/go/1.17.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/go/1.17.nix b/pkgs/development/compilers/go/1.17.nix index 69322ce6e194..1b46ba1aad62 100644 --- a/pkgs/development/compilers/go/1.17.nix +++ b/pkgs/development/compilers/go/1.17.nix @@ -50,11 +50,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.17.4"; + version = "1.17.5"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-S+82mTge8J4HVihQQYdBZWXXEGYP7GWwV+3xzrGH/Es="; + sha256 = "sha256-Pe+5oJvtBCQDGV6HLcvIxvrhSFljMyJ5Zo7FLoCpWi0="; }; # perl is used for testing go vet From 65ca4000229195eada02cb5e72ce1167800a38a7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 01:47:28 +0000 Subject: [PATCH 67/72] scudcloud: 1.63 -> 1.65 --- .../networking/instant-messengers/scudcloud/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix index 76e6dc0f3d06..06eb5384abd2 100644 --- a/pkgs/applications/networking/instant-messengers/scudcloud/default.nix +++ b/pkgs/applications/networking/instant-messengers/scudcloud/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonPackage rec { pname = "scudcloud"; - version = "1.63"; + version = "1.65"; src = fetchFromGitHub { owner = "raelgc"; repo = "scudcloud"; rev = "v${version}"; - sha256 = "sha256-b8+MVjYKbSpnfM2ow2MNVY6MiT+urpNYDkFR/yUC7ik="; + sha256 = "1ffdy74igll74fwpmnn3brvcxbk4iianqscdzz18sx1pfqpw16cl"; }; propagatedBuildInputs = with python3Packages; [ pyqt5_with_qtwebkit dbus-python jsmin ]; From 172c9eaf2df3bf1dd50799f97b5b9f3e735ccfc3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 00:41:01 +0000 Subject: [PATCH 68/72] rocm-smi: 4.3.1 -> 4.5.0 --- pkgs/tools/system/rocm-smi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/rocm-smi/default.nix b/pkgs/tools/system/rocm-smi/default.nix index 52b75b7a4e9e..d3da169c01ae 100644 --- a/pkgs/tools/system/rocm-smi/default.nix +++ b/pkgs/tools/system/rocm-smi/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-smi"; - version = "4.3.1"; + version = "4.5.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm_smi_lib"; rev = "rocm-${version}"; - hash = "sha256-Ckno73Otkc9rHEUkSgNoOui+6ZHGUF+B9iAoe0NQH0c="; + hash = "sha256-zfsNGDAwBD91w0loWxd8AwuZ3kZSPCXMxxQnX6ktOiE="; }; nativeBuildInputs = [ cmake wrapPython ]; From 9012eac785ff137118a10a058f1977f1462fbd31 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 04:27:35 +0000 Subject: [PATCH 69/72] portfolio: 0.55.0 -> 0.56.2 --- pkgs/applications/office/portfolio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/portfolio/default.nix b/pkgs/applications/office/portfolio/default.nix index f5418f372983..fc1b329c4322 100644 --- a/pkgs/applications/office/portfolio/default.nix +++ b/pkgs/applications/office/portfolio/default.nix @@ -25,11 +25,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.55.0"; + version = "0.56.2"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "0s7qb7z2wiypiahw1y1lz9pbhxcacj5myzy0qcqjrpnaq7ymvs05"; + sha256 = "sha256-4iMLn0KTrH7MOlNduSl7BMOZKPakHhhQdR3NQXV2ZZU="; }; nativeBuildInputs = [ From 601a2ad0b2eb3f8718ca4e78f752f0381f6cd4a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 04:50:05 +0000 Subject: [PATCH 70/72] postman: 9.1.4 -> 9.3.1 --- pkgs/development/web/postman/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index 77f2bddbf1e1..cdfd2f9b3543 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "9.1.4"; + version = "9.3.1"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "bUhJ1vbesTibXF8rZuVWd5EY8uBbGaYGEbPKSXAVAsE="; + sha256 = "sha256-zHJOmvbg/z8tsor7y7vM0ECZjPaOqjNuBgcqtCCvqiE="; name = "${pname}.tar.gz"; }; From 0d86787a334fe3c417d5eef524eb9b73a4b29081 Mon Sep 17 00:00:00 2001 From: Evils Date: Fri, 10 Dec 2021 05:09:54 +0100 Subject: [PATCH 71/72] maintainers: add matrix id to evils --- maintainers/maintainer-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index c547274ee9de..bf786373f7e9 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -3695,6 +3695,7 @@ }; evils = { email = "evils.devils@protonmail.com"; + matrix = "@evils:nixos.dev"; github = "evils"; githubId = 30512529; name = "Evils"; From 12bdf48e7b6f500cd1b8049c442569415489dab9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 8 Dec 2021 08:23:48 +0000 Subject: [PATCH 72/72] pstoedit: 3.75 -> 3.78 --- pkgs/tools/graphics/pstoedit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix index dd5b51041b1f..df3d1c6a6938 100644 --- a/pkgs/tools/graphics/pstoedit/default.nix +++ b/pkgs/tools/graphics/pstoedit/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pstoedit"; - version = "3.75"; + version = "3.78"; src = fetchurl { url = "mirror://sourceforge/pstoedit/pstoedit-${version}.tar.gz"; - sha256 = "1kv46g2wsvsvcngkavxl5gnw3l6g5xqnh4kmyx4b39a01d8xiddp"; + sha256 = "sha256-jMKONLx/iNkTeA+AdOgT3VqqCsIFams21L8ASg6Q2AE="; }; #