mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-16 23:03:40 +01:00
Merge branch 'staging-next' into staging
This commit is contained in:
Vladimír Čunát
commit
0b32140b34
86 changed files with 633 additions and 780 deletions
|
|
@ -63,7 +63,7 @@ let
|
|||
script = with builtins; concatStringsSep "\n" (mapAttrsToList (cert: data: ''
|
||||
for fixpath in /var/lib/acme/${escapeShellArg cert} /var/lib/acme/.lego/${escapeShellArg cert}; do
|
||||
if [ -d "$fixpath" ]; then
|
||||
chmod -R 750 "$fixpath"
|
||||
chmod -R u=rwX,g=rX,o= "$fixpath"
|
||||
chown -R acme:${data.group} "$fixpath"
|
||||
fi
|
||||
done
|
||||
|
|
@ -271,7 +271,7 @@ let
|
|||
|
||||
mv domainhash.txt certificates/
|
||||
chmod 640 certificates/*
|
||||
chmod -R 700 accounts/*
|
||||
chmod -R u=rwX,g=,o= accounts/*
|
||||
|
||||
# Group might change between runs, re-apply it
|
||||
chown 'acme:${data.group}' certificates/*
|
||||
|
|
|
|||
21
nixos/tests/common/acme/server/README.md
Normal file
21
nixos/tests/common/acme/server/README.md
Normal file
|
|
@ -0,0 +1,21 @@
|
|||
# Fake Certificate Authority for ACME testing
|
||||
|
||||
This will set up a test node running [pebble](https://github.com/letsencrypt/pebble)
|
||||
to serve ACME certificate requests.
|
||||
|
||||
## "Snake oil" certs
|
||||
|
||||
The snake oil certs are hard coded into the repo for reasons explained [here](https://github.com/NixOS/nixpkgs/pull/91121#discussion_r505410235).
|
||||
The root of the issue is that Nix will hash the derivation based on the arguments
|
||||
to mkDerivation, not the output. [Minica](https://github.com/jsha/minica) will
|
||||
always generate a random certificate even if the arguments are unchanged. As a
|
||||
result, it's possible to end up in a situation where the cached and local
|
||||
generated certs mismatch and cause issues with testing.
|
||||
|
||||
To generate new certificates, run the following commands:
|
||||
|
||||
```bash
|
||||
nix-build generate-certs.nix
|
||||
cp result/* .
|
||||
rm result
|
||||
```
|
||||
19
nixos/tests/common/acme/server/acme.test.cert.pem
Normal file
19
nixos/tests/common/acme/server/acme.test.cert.pem
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
-----BEGIN CERTIFICATE-----
|
||||
MIIDLDCCAhSgAwIBAgIIRDAN3FHH//IwDQYJKoZIhvcNAQELBQAwIDEeMBwGA1UE
|
||||
AxMVbWluaWNhIHJvb3QgY2EgNzg3NDZmMB4XDTIwMTAyMTEzMjgzNloXDTIyMTEy
|
||||
MDEzMjgzNlowFDESMBAGA1UEAxMJYWNtZS50ZXN0MIIBIjANBgkqhkiG9w0BAQEF
|
||||
AAOCAQ8AMIIBCgKCAQEAo8XjMVUaljcaqQ5MFhfPuQgSwdyXEUbpSHz+5yPkE0h9
|
||||
Z4Xu5BJF1Oq7h5ggCtadVsIspiY6Jm6aWDOjlh4myzW5UNBNUG3OPEk50vmmHFeH
|
||||
pImHO/d8yb33QoF9VRcTZs4tuJYg7l9bSs4jNG72vYvv2YiGAcmjJcsmAZIfniCN
|
||||
Xf/LjIm+Cxykn+Vo3UuzO1w5/iuofdgWO/aZxMezmXUivlL3ih4cNzCJei8WlB/l
|
||||
EnHrkcy3ogRmmynP5zcz7vmGIJX2ji6dhCa4Got5B7eZK76o2QglhQXqPatG0AOY
|
||||
H+RfQfzKemqPG5om9MgJtwFtTOU1LoaiBw//jXKESQIDAQABo3YwdDAOBgNVHQ8B
|
||||
Af8EBAMCBaAwHQYDVR0lBBYwFAYIKwYBBQUHAwEGCCsGAQUFBwMCMAwGA1UdEwEB
|
||||
/wQCMAAwHwYDVR0jBBgwFoAU+8IZlLV/Qp5CXqpXMLvtxWlxcJwwFAYDVR0RBA0w
|
||||
C4IJYWNtZS50ZXN0MA0GCSqGSIb3DQEBCwUAA4IBAQB0pe8I5/VDkB5VMgQB2GJV
|
||||
GKzyigfWbVez9uLmqMj9PPP/zzYKSYeq+91aMuOZrnH7NqBxSTwanULkmqAmhbJJ
|
||||
YkXw+FlFekf9FyxcuArzwzzNZDSGcjcdXpN8S2K1qkBd00iSJF9kU7pdZYCIKR20
|
||||
QirdBrELEfsJ3GU62a6N3a2YsrisZUvq5TbjGJDcytAtt+WG3gmV7RInLdFfPwbw
|
||||
bEHPCnx0uiV0nxLjd/aVT+RceVrFQVt4hR99jLoMlBitSKluZ1ljsrpIyroBhQT0
|
||||
pp/pVi6HJdijG0fsPrC325NEGAwcpotLUhczoeM/rffKJd54wLhDkfYxOyRZXivs
|
||||
-----END CERTIFICATE-----
|
||||
27
nixos/tests/common/acme/server/acme.test.key.pem
Normal file
27
nixos/tests/common/acme/server/acme.test.key.pem
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
-----BEGIN RSA PRIVATE KEY-----
|
||||
MIIEowIBAAKCAQEAo8XjMVUaljcaqQ5MFhfPuQgSwdyXEUbpSHz+5yPkE0h9Z4Xu
|
||||
5BJF1Oq7h5ggCtadVsIspiY6Jm6aWDOjlh4myzW5UNBNUG3OPEk50vmmHFeHpImH
|
||||
O/d8yb33QoF9VRcTZs4tuJYg7l9bSs4jNG72vYvv2YiGAcmjJcsmAZIfniCNXf/L
|
||||
jIm+Cxykn+Vo3UuzO1w5/iuofdgWO/aZxMezmXUivlL3ih4cNzCJei8WlB/lEnHr
|
||||
kcy3ogRmmynP5zcz7vmGIJX2ji6dhCa4Got5B7eZK76o2QglhQXqPatG0AOYH+Rf
|
||||
QfzKemqPG5om9MgJtwFtTOU1LoaiBw//jXKESQIDAQABAoIBADox/2FwVFo8ioS4
|
||||
R+Ex5OZjMAcjU6sX/516jTmlT05q2+UFerYgqB/YqXqtW/V9/brulN8VhmRRuRbO
|
||||
grq9TBu5o3hMDK0f18EkZB/MBnLbx594H033y6gEkPBZAyhRYtuNOEH3VwxdZhtW
|
||||
1Lu1EoiYSUqLcNMBy6+KWJ8GRaXyacMYBlj2lMHmyzkA/t1+2mwTGC3lT6zN0F5Y
|
||||
E5umXOxsn6Tb6q3KM9O5IvtmMMKpgj4HIHZLZ6j40nNgHwGRaAv4Sha/vx0DeBw3
|
||||
6VlNiTTPdShEkhESlM5/ocqTfI92VHJpM5gkqTYOWBi2aKIPfAopXoqoJdWl4pQ/
|
||||
NCFIu2ECgYEAzntNKIcQtf0ewe0/POo07SIFirvz6jVtYNMTzeQfL6CoEjYArJeu
|
||||
Vzc4wEQfA4ZFVerBb1/O6M449gI3zex1PH4AX0h8q8DSjrppK1Jt2TnpVh97k7Gg
|
||||
Tnat/M/yW3lWYkcMVJJ3AYurXLFTT1dYP0HvBwZN04yInrEcPNXKfmcCgYEAywyJ
|
||||
51d4AE94PrANathKqSI/gk8sP+L1gzylZCcUEAiGk/1r45iYB4HN2gvWbS+CvSdp
|
||||
F7ShlDWrTaNh2Bm1dgTjc4pWb4J+CPy/KN2sgLwIuM4+ZWIZmEDcio6khrM/gNqK
|
||||
aR7xUsvWsqU26O84woY/xR8IHjSNF7cFWE1H2c8CgYEAt6SSi2kVQ8dMg84uYE8t
|
||||
o3qO00U3OycpkOQqyQQLeKC62veMwfRl6swCfX4Y11mkcTXJtPTRYd2Ia8StPUkB
|
||||
PDwUuKoPt/JXUvoYb59wc7M+BIsbrdBdc2u6cw+/zfutCNuH6/AYSBeg4WAVaIuW
|
||||
wSwzG1xP+8cR+5IqOzEqWCECgYATweeVTCyQEyuHJghYMi2poXx+iIesu7/aAkex
|
||||
pB/Oo5W8xrb90XZRnK7UHbzCqRHWqAQQ23Gxgztk9ZXqui2vCzC6qGZauV7cLwPG
|
||||
zTMg36sVmHP314DYEM+k59ZYiQ6P0jQPoIQo407D2VGrfsOOIhQIcUmP7tsfyJ5L
|
||||
hlGMfwKBgGq4VNnnuX8I5kl03NpaKfG+M8jEHmVwtI9RkPTCCX9bMjeG0cDxqPTF
|
||||
TRkf3r8UWQTZ5QfAfAXYAOlZvmGhHjSembRbXMrMdi3rGsYRSrQL6n5NHnORUaMy
|
||||
FCWo4gyAnniry7tx9dVNgmHmbjEHuQnf8AC1r3dibRCjvJWUiQ8H
|
||||
-----END RSA PRIVATE KEY-----
|
||||
20
nixos/tests/common/acme/server/ca.cert.pem
Normal file
20
nixos/tests/common/acme/server/ca.cert.pem
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
-----BEGIN CERTIFICATE-----
|
||||
MIIDSzCCAjOgAwIBAgIIeHRvRrNvbGQwDQYJKoZIhvcNAQELBQAwIDEeMBwGA1UE
|
||||
AxMVbWluaWNhIHJvb3QgY2EgNzg3NDZmMCAXDTIwMTAyMTEzMjgzNloYDzIxMjAx
|
||||
MDIxMTMyODM2WjAgMR4wHAYDVQQDExVtaW5pY2Egcm9vdCBjYSA3ODc0NmYwggEi
|
||||
MA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCrNTzVLDJOKtGYGLU98EEcLKps
|
||||
tXHCLC6G54LKbEcU80fn+ArX8qsPSHyhdXQkcYjq6Vh/EDJ1TctyRSnvAjwyG4Aa
|
||||
1Zy1QFc/JnjMjvzimCkUc9lQ+wkLwHSM/KGwR1cGjmtQ/EMClZTA0NwulJsXMKVz
|
||||
bd5asXbq/yJTQ5Ww25HtdNjwRQXTvB7r3IKcY+DsED9CvFvC9oG/ZhtZqZuyyRdC
|
||||
kFUrrv8WNUDkWSN+lMR6xMx8v0583IN6f11IhX0b+svK98G81B2eswBdkzvVyv9M
|
||||
unZBO0JuJG8sdM502KhWLmzBC1ZbvgUBF9BumDRpMFH4DCj7+qQ2taWeGyc7AgMB
|
||||
AAGjgYYwgYMwDgYDVR0PAQH/BAQDAgKEMB0GA1UdJQQWMBQGCCsGAQUFBwMBBggr
|
||||
BgEFBQcDAjASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQWBBT7whmUtX9CnkJe
|
||||
qlcwu+3FaXFwnDAfBgNVHSMEGDAWgBT7whmUtX9CnkJeqlcwu+3FaXFwnDANBgkq
|
||||
hkiG9w0BAQsFAAOCAQEARMe1wKmF33GjEoLLw0oDDS4EdAv26BzCwtrlljsEtwQN
|
||||
95oSzUNd6o4Js7WCG2o543OX6cxzM+yju8TES3+vJKDgsbNMU0bWCv//tdrb0/G8
|
||||
OkU3Kfi5q4fOauZ1pqGv/pXdfYhZ5ieB/zwis3ykANe5JfB0XqwCb1Vd0C3UCIS2
|
||||
NPKngRwNSzphIsbzfvxGDkdM1enuGl5CVyDhrwTMqGaJGDSOv6U5jKFxKRvigqTN
|
||||
Ls9lPmT5NXYETduWLBR3yUIdH6kZXrcozZ02B9vjOB2Cv4RMDc+9eM30CLIWpf1I
|
||||
097e7JkhzxFhfC/bMMt3P1FeQc+fwH91wdBmNi7tQw==
|
||||
-----END CERTIFICATE-----
|
||||
27
nixos/tests/common/acme/server/ca.key.pem
Normal file
27
nixos/tests/common/acme/server/ca.key.pem
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
-----BEGIN RSA PRIVATE KEY-----
|
||||
MIIEowIBAAKCAQEAqzU81SwyTirRmBi1PfBBHCyqbLVxwiwuhueCymxHFPNH5/gK
|
||||
1/KrD0h8oXV0JHGI6ulYfxAydU3LckUp7wI8MhuAGtWctUBXPyZ4zI784pgpFHPZ
|
||||
UPsJC8B0jPyhsEdXBo5rUPxDApWUwNDcLpSbFzClc23eWrF26v8iU0OVsNuR7XTY
|
||||
8EUF07we69yCnGPg7BA/QrxbwvaBv2YbWambsskXQpBVK67/FjVA5FkjfpTEesTM
|
||||
fL9OfNyDen9dSIV9G/rLyvfBvNQdnrMAXZM71cr/TLp2QTtCbiRvLHTOdNioVi5s
|
||||
wQtWW74FARfQbpg0aTBR+Awo+/qkNrWlnhsnOwIDAQABAoIBAA3ykVkgd5ysmlSU
|
||||
trcsCnHcJaojgff6l3PACoSpG4VWaGY6a8+54julgRm6MtMBONFCX0ZCsImj484U
|
||||
Wl0xRmwil2YYPuL5MeJgJPktMObY1IfpBCw3tz3w2M3fiuCMf0d2dMGtO1xLiUnH
|
||||
+hgFXTkfamsj6ThkOrbcQBSebeRxbKM5hqyCaQoieV+0IJnyxUVq/apib8N50VsH
|
||||
SHd4oqLUuEZgg6N70+l5DpzedJUb4nrwS/KhUHUBgnoPItYBCiGPmrwLk7fUhPs6
|
||||
kTDqJDtc/xW/JbjmzhWEpVvtumcC/OEKULss7HLdeQqwVBrRQkznb0M9AnSra3d0
|
||||
X11/Y4ECgYEA3FC8SquLPFb2lHK4+YbJ4Ac6QVWeYFEHiZ0Rj+CmONmjcAvOGLPE
|
||||
SblRLm3Nbrkxbm8FF6/AfXa/rviAKEVPs5xqGfSDw/3n1uInPcmShiBCLwM/jHH5
|
||||
NeVG+R5mTg5zyQ/pQMLWRcs+Ail+ZAnZuoGpW3Cdc8OtCUYFQ7XB6nsCgYEAxvBJ
|
||||
zFxcTtsDzWbMWXejugQiUqJcEbKWwEfkRbf3J2rAVO2+EFr7LxdRfN2VwPiTQcWc
|
||||
LnN2QN+ouOjqBMTh3qm5oQY+TLLHy86k9g1k0gXWkMRQgP2ZdfWH1HyrwjLUgLe1
|
||||
VezFN7N1azgy6xFkInAAvuA4loxElZNvkGBgekECgYA/Xw26ILvNIGqO6qzgQXAh
|
||||
+5I7JsiGheg4IjDiBMlrQtbrLMoceuD0H9UFGNplhel9DXwWgxxIOncKejpK2x0A
|
||||
2fX+/0FDh+4+9hA5ipiV8gN3iGSoHkSDxy5yC9d7jlapt+TtFt4Rd1OfxZWwatDw
|
||||
/8jaH3t6yAcmyrhK8KYVrwKBgAE5KwsBqmOlvyE9N5Z5QN189wUREIXfVkP6bTHs
|
||||
jq2EX4hmKdwJ4y+H8i1VY31bSfSGlY5HkXuWpH/2lrHO0CDBZG3UDwADvWzIaYVF
|
||||
0c/kz0v2mRQh+xaZmus4lQnNrDbaalgL666LAPbW0qFVaws3KxoBYPe0BxvwWyhF
|
||||
H3LBAoGBAKRRNsq2pWQ8Gqxc0rVoH0FlexU9U2ci3lsLmgEB0A/o/kQkSyAxaRM+
|
||||
VdKp3sWfO8o8lX5CVQslCNBSjDTNcat3Co4NEBLg6Xv1yKN/WN1GhusnchP9szsP
|
||||
oU47gC89QhUyWSd6vvr2z2NG9C3cACxe4dhDSHQcE4nHSldzCKv2
|
||||
-----END RSA PRIVATE KEY-----
|
||||
|
|
@ -51,10 +51,7 @@
|
|||
# that it has to be started _before_ the ACME service.
|
||||
{ config, pkgs, lib, ... }:
|
||||
let
|
||||
testCerts = import ./snakeoil-certs.nix {
|
||||
minica = pkgs.minica;
|
||||
mkDerivation = pkgs.stdenv.mkDerivation;
|
||||
};
|
||||
testCerts = import ./snakeoil-certs.nix;
|
||||
domain = testCerts.domain;
|
||||
|
||||
resolver = let
|
||||
|
|
|
|||
29
nixos/tests/common/acme/server/generate-certs.nix
Normal file
29
nixos/tests/common/acme/server/generate-certs.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
# Minica can provide a CA key and cert, plus a key
|
||||
# and cert for our fake CA server's Web Front End (WFE).
|
||||
{
|
||||
pkgs ? import <nixpkgs> {},
|
||||
minica ? pkgs.minica,
|
||||
mkDerivation ? pkgs.stdenv.mkDerivation
|
||||
}:
|
||||
let
|
||||
conf = import ./snakeoil-certs.nix;
|
||||
domain = conf.domain;
|
||||
in mkDerivation {
|
||||
name = "test-certs";
|
||||
buildInputs = [ minica ];
|
||||
phases = [ "buildPhase" "installPhase" ];
|
||||
|
||||
buildPhase = ''
|
||||
minica \
|
||||
--ca-key ca.key.pem \
|
||||
--ca-cert ca.cert.pem \
|
||||
--domains ${domain}
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
mv ca.*.pem $out/
|
||||
mv ${domain}/key.pem $out/${domain}.key.pem
|
||||
mv ${domain}/cert.pem $out/${domain}.cert.pem
|
||||
'';
|
||||
}
|
||||
|
|
@ -1,37 +1,13 @@
|
|||
# Minica can provide a CA key and cert, plus a key
|
||||
# and cert for our fake CA server's Web Front End (WFE).
|
||||
{ minica, mkDerivation }:
|
||||
let
|
||||
domain = "acme.test";
|
||||
|
||||
selfSignedCertData = mkDerivation {
|
||||
name = "test-certs";
|
||||
buildInputs = [ minica ];
|
||||
phases = [ "buildPhase" "installPhase" ];
|
||||
|
||||
buildPhase = ''
|
||||
mkdir ca
|
||||
minica \
|
||||
--ca-key ca/key.pem \
|
||||
--ca-cert ca/cert.pem \
|
||||
--domains ${domain}
|
||||
chmod 600 ca/*
|
||||
chmod 640 ${domain}/*.pem
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
mkdir -p $out
|
||||
mv ${domain} ca $out/
|
||||
'';
|
||||
};
|
||||
in {
|
||||
inherit domain;
|
||||
ca = {
|
||||
cert = "${selfSignedCertData}/ca/cert.pem";
|
||||
key = "${selfSignedCertData}/ca/key.pem";
|
||||
cert = ./ca.cert.pem;
|
||||
key = ./ca.key.pem;
|
||||
};
|
||||
"${domain}" = {
|
||||
cert = "${selfSignedCertData}/${domain}/cert.pem";
|
||||
key = "${selfSignedCertData}/${domain}/key.pem";
|
||||
cert = ./. + "/${domain}.cert.pem";
|
||||
key = ./. + "/${domain}.key.pem";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,40 +1,33 @@
|
|||
{ stdenv, buildGoPackage, fetchFromGitHub, installShellFiles }:
|
||||
{ lib, buildGoModule, fetchFromGitHub, installShellFiles }:
|
||||
|
||||
buildGoPackage rec {
|
||||
buildGoModule rec {
|
||||
pname = "micro";
|
||||
version = "2.0.7";
|
||||
|
||||
goPackagePath = "github.com/zyedidia/micro";
|
||||
version = "2.0.8";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "zyedidia";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "07ck1a9arklic3p0z50wcg608cvpba1kljvlfb4fljr6jhv5cmkb";
|
||||
fetchSubmodules = true;
|
||||
sha256 = "1b51fvc9hrjfl8acr3yybp66xfll7d43412qwi76wxwarn06gkci";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
||||
subPackages = [ "cmd/micro" ];
|
||||
|
||||
buildFlagsArray = let t = "${goPackagePath}/internal/util"; in ''
|
||||
-ldflags=
|
||||
-X ${t}.Version=${version}
|
||||
-X ${t}.CommitHash=${src.rev}
|
||||
'';
|
||||
vendorSha256 = "19iqvl63g9y6gkzfmv87rrgj4c4y6ngh467ss94rzrhaybj2b2d8";
|
||||
|
||||
goDeps = ./deps.nix;
|
||||
buildFlagsArray = [ "-ldflags=-s -w -X github.com/zyedidia/micro/v2/internal/util.Version=${version} -X github.com/zyedidia/micro/v2/internal/util.CommitHash=${src.rev}" ];
|
||||
|
||||
postInstall = ''
|
||||
installManPage $src/assets/packaging/micro.1
|
||||
installManPage assets/packaging/micro.1
|
||||
install -Dt $out/share/applications assets/packaging/micro.desktop
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
meta = with lib; {
|
||||
homepage = "https://micro-editor.github.io";
|
||||
description = "Modern and intuitive terminal-based text editor";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ dtzWill ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
345
pkgs/applications/editors/micro/deps.nix
generated
345
pkgs/applications/editors/micro/deps.nix
generated
|
|
@ -1,345 +0,0 @@
|
|||
# file generated from go.mod using vgo2nix (https://github.com/adisbladis/vgo2nix)
|
||||
[
|
||||
{
|
||||
goPackagePath = "github.com/blang/semver";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/blang/semver";
|
||||
rev = "v3.5.1";
|
||||
sha256 = "13ws259bwcibkclbr82ilhk6zadm63kxklxhk12wayklj8ghhsmy";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/chzyer/logex";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/chzyer/logex";
|
||||
rev = "v1.1.10";
|
||||
sha256 = "08pbjj3wx9acavlwyr055isa8a5hnmllgdv5k6ra60l5y1brmlq4";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/chzyer/readline";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/chzyer/readline";
|
||||
rev = "2972be24d48e";
|
||||
sha256 = "104q8dazj8yf6b089jjr82fy9h1g80zyyzvp3g8b44a7d8ngjj6r";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/chzyer/test";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/chzyer/test";
|
||||
rev = "a1ea475d72b1";
|
||||
sha256 = "0rns2aqk22i9xsgyap0pq8wi4cfaxsri4d9q6xxhhyma8jjsnj2k";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/davecgh/go-spew";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/davecgh/go-spew";
|
||||
rev = "v1.1.1";
|
||||
sha256 = "0hka6hmyvp701adzag2g26cxdj47g21x6jz4sc6jjz1mn59d474y";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/dustin/go-humanize";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/dustin/go-humanize";
|
||||
rev = "v1.0.0";
|
||||
sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/gdamore/encoding";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/gdamore/encoding";
|
||||
rev = "v1.0.0";
|
||||
sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/go-errors/errors";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/go-errors/errors";
|
||||
rev = "v1.0.1";
|
||||
sha256 = "0rznpknk19rxkr7li6dqs52c26pjazp69lh493l4ny4sxn5922lp";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/kballard/go-shellquote";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kballard/go-shellquote";
|
||||
rev = "95032a82bc51";
|
||||
sha256 = "1rspvmnsikdq95jmx3dykxd4k1rmgl98ryjrysvl0cf18hl1vq80";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/kr/pretty";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kr/pretty";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "18m4pwg2abd0j9cn5v3k2ksk9ig4vlwxmlw9rrglanziv9l967qp";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/kr/pty";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kr/pty";
|
||||
rev = "v1.1.1";
|
||||
sha256 = "0383f0mb9kqjvncqrfpidsf8y6ns5zlrc91c6a74xpyxjwvzl2y6";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/kr/text";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/kr/text";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "1gm5bsl01apvc84bw06hasawyqm4q84vx1pm32wr9jnd7a8vjgj1";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/lucasb-eyer/go-colorful";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/lucasb-eyer/go-colorful";
|
||||
rev = "v1.0.3";
|
||||
sha256 = "12bgz6dxbb2ki1g3x7fg9ipsjgfkd58fp7cdpv63h4kvlj2n7j69";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-isatty";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-isatty";
|
||||
rev = "v0.0.11";
|
||||
sha256 = "0h671sv7hfprja495kavazkalkx7xzaqksjh13brcnwq67ijrali";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mattn/go-runewidth";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mattn/go-runewidth";
|
||||
rev = "v0.0.7";
|
||||
sha256 = "1snr8mk63vz2h44knq26dm81p83887v7kb09iywqmx0nqzngih66";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/mitchellh/go-homedir";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/mitchellh/go-homedir";
|
||||
rev = "v1.1.0";
|
||||
sha256 = "0ydzkipf28hwj2bfxqmwlww47khyk6d152xax4bnyh60f4lq3nx1";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/pmezard/go-difflib";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/pmezard/go-difflib";
|
||||
rev = "v1.0.0";
|
||||
sha256 = "0c1cn55m4rypmscgf0rrb88pn58j3ysvc2d0432dp3c6fqg6cnzw";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/robertkrimen/otto";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/robertkrimen/otto";
|
||||
rev = "c382bd3c16ff";
|
||||
sha256 = "043y6l647snsz71mdy84s2d3kn22aj6rbqd6c1vd8absvamqhlxa";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/sergi/go-diff";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/sergi/go-diff";
|
||||
rev = "v1.1.0";
|
||||
sha256 = "0ir8ali2vx0j7pipmlfd6k8c973akyy2nmbjrf008fm800zcp7z2";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/stretchr/objx";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/stretchr/objx";
|
||||
rev = "v0.1.0";
|
||||
sha256 = "19ynspzjdynbi85xw06mh8ad5j0qa1vryvxjgvbnyrr8rbm4vd8w";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/stretchr/testify";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/stretchr/testify";
|
||||
rev = "v1.4.0";
|
||||
sha256 = "187i5g88sxfy4vxpm7dw1gwv29pa2qaq475lxrdh5livh69wqfjb";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/xo/terminfo";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/xo/terminfo";
|
||||
rev = "454e5b68f9e8";
|
||||
sha256 = "0xvjb09nwbanp7ja4560pwb6b2xr9h0axyr7f5clgncca2k4f1pd";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/yuin/gopher-lua";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/yuin/gopher-lua";
|
||||
rev = "ab39c6098bdb";
|
||||
sha256 = "13b0rrpv3988qw8rq6z7npajn1my059ybhafi5mxff9jw09k9sja";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/zyedidia/clipboard";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/zyedidia/clipboard";
|
||||
rev = "v1.0.3";
|
||||
sha256 = "134vnx0r51f08b37yaymlxlfl14qv6r8yzgqz7dxxn1zw9197b3q";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/zyedidia/glob";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/zyedidia/glob";
|
||||
rev = "dd4023a66dc3";
|
||||
sha256 = "1vqw4xbqq6j8p5m7mwxvb448w69vjvgzx0ndsfzdh2cxfirwp3y7";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/zyedidia/highlight";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/zyedidia/highlight";
|
||||
rev = "201131ce5cf5";
|
||||
sha256 = "0blaynf32swmqddx2hcrifrfssj9c04kwnbdy42h3kzxihrwz4ps";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/zyedidia/json5";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/zyedidia/json5";
|
||||
rev = "2da050b1a98d";
|
||||
sha256 = "1sgydazf3npr788b4w17ydmlh3fd1zmpriv9b69967ww90ckh2kz";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/zyedidia/poller";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/zyedidia/poller";
|
||||
rev = "v1.0.1";
|
||||
sha256 = "10cjrqfk1j0l55bdbpm7kv4mqc665pngc8avai0p9chq03y2654g";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/zyedidia/pty";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/zyedidia/pty";
|
||||
rev = "v2.0.0";
|
||||
sha256 = "1n946ld8y2v2wfbwsxv8rfaicxbw3w8pk11ryc8iybmw7hkmmf79";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/zyedidia/tcell";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/zyedidia/tcell";
|
||||
rev = "v2.0.2";
|
||||
sha256 = "0fr7zm6zcir2bjll5ycdxy9m98gjr3ins7mzmqpd46b3njzbl75z";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "github.com/zyedidia/terminal";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/zyedidia/terminal";
|
||||
rev = "533c623e2415";
|
||||
sha256 = "16l628f3zgl5yp9z5zkfy2hyl2sckw4d6mg3iqv2jjvh4i8yhrsm";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/sys";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/sys";
|
||||
rev = "33540a1f6037";
|
||||
sha256 = "0fjcv0vzvi6za0b4xmnk3932pr9f9gczzf03y0kgq3ry9rqg169y";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/text";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/text";
|
||||
rev = "v0.3.2";
|
||||
sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "golang.org/x/tools";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://go.googlesource.com/tools";
|
||||
rev = "90fa682c2a6e";
|
||||
sha256 = "03ic2xsy51jw9749wl7gszdbz99iijbd2bckgygl6cm9w5m364ak";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/check.v1";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/check.v1";
|
||||
rev = "41f04d3bba15";
|
||||
sha256 = "0vfk9czmlxmp6wndq8k17rhnjxal764mxfhrccza7nwlia760pjy";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/sourcemap.v1";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/sourcemap.v1";
|
||||
rev = "v1.0.5";
|
||||
sha256 = "08rf2dl13hbnm3fq2cm0nnsspy9fhf922ln23cz5463cv7h62as4";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "gopkg.in/yaml.v2";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://gopkg.in/yaml.v2";
|
||||
rev = "v2.2.7";
|
||||
sha256 = "0k5xcwkd3wmcx54isk7ck9cwp8fapfhyqdz3f13kxp77cxqizazj";
|
||||
};
|
||||
}
|
||||
{
|
||||
goPackagePath = "layeh.com/gopher-luar";
|
||||
fetch = {
|
||||
type = "git";
|
||||
url = "https://github.com/layeh/gopher-luar";
|
||||
rev = "v1.0.7";
|
||||
sha256 = "1rdbni3q7zajmiy62ccvbfgqjzppk5212wpwks2ba726hvyf85mj";
|
||||
};
|
||||
}
|
||||
]
|
||||
|
|
@ -18,17 +18,17 @@
|
|||
|
||||
mkDerivation rec {
|
||||
pname = "cloudcompare";
|
||||
version = "2.11.0";
|
||||
version = "2.11.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "CloudCompare";
|
||||
repo = "CloudCompare";
|
||||
rev = "v${version}";
|
||||
sha256 = "02ahhhivgb9k1aygw1m35wdvhaizag1r98mb0r6zzrs5p4y64wlb";
|
||||
sha256 = "0sb2h08iaf6zrf54sg6ql6wm63q5vq0kpd3gffdm26z8w6j6wv3s";
|
||||
# As of writing includes (https://github.com/CloudCompare/CloudCompare/blob/a1c589c006fc325e8b560c77340809b9c7e7247a/.gitmodules):
|
||||
# * libE57Format
|
||||
# * PoissonRecon
|
||||
# In > 2.11 it will also contain
|
||||
# In a future version it will also contain
|
||||
# * CCCoreLib
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
|
|
@ -53,7 +53,7 @@ mkDerivation rec {
|
|||
];
|
||||
|
||||
cmakeFlags = [
|
||||
# TODO: This will become -DCCCORELIB_USE_TBB=ON in > 2.11.0, see
|
||||
# TODO: This will become -DCCCORELIB_USE_TBB=ON in a future version, see
|
||||
# https://github.com/CloudCompare/CloudCompare/commit/f5a0c9fd788da26450f3fa488b2cf0e4a08d255f
|
||||
"-DCOMPILE_CC_CORE_LIB_WITH_TBB=ON"
|
||||
"-DOPTION_USE_DXF_LIB=ON"
|
||||
|
|
|
|||
|
|
@ -1,27 +1,38 @@
|
|||
{ stdenv, fetchurl, cmake, pkgconfig, gtk3, perl, vte, pcre2, glib , makeWrapper }:
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, cmake
|
||||
, pkgconfig
|
||||
, gtk3
|
||||
, perl
|
||||
, vte
|
||||
, pcre2
|
||||
, glib
|
||||
, makeWrapper
|
||||
}:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "sakura";
|
||||
version = "3.7.0";
|
||||
version = "3.7.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://launchpad.net/sakura/trunk/${version}/+download/${pname}-${version}.tar.gz";
|
||||
sha256 = "15gskj5yv5qs3cj4ps43735kfx2nzjlhq4dk9ghirl8lvhhxsm5m";
|
||||
url = "https://launchpad.net/${pname}/trunk/${version}/+download/${pname}-${version}.tar.bz2";
|
||||
sha256 = "sha256-cppODnUKQpS9kFkkOqxU3yqAElAVn8VQtQsP4Carkos=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake perl pkgconfig ];
|
||||
nativeBuildInputs = [ cmake perl pkgconfig makeWrapper ];
|
||||
|
||||
buildInputs = [ makeWrapper gtk3 vte pcre2 glib ];
|
||||
buildInputs = [ gtk3 vte pcre2 glib ];
|
||||
|
||||
# Wrapper sets path to gsettings-schemata so sakura knows where to find colorchooser, fontchooser ...
|
||||
postInstall = "wrapProgram $out/bin/sakura --suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/";
|
||||
# Set path to gsettings-schemata so sakura knows
|
||||
# where to find colorchooser, fontchooser etc.
|
||||
postInstall = ''
|
||||
wrapProgram $out/bin/sakura \
|
||||
--suffix XDG_DATA_DIRS : ${gtk3}/share/gsettings-schemas/${gtk3.name}/
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://www.pleyades.net/david/projects/sakura";
|
||||
description = "A terminal emulator based on GTK and VTE";
|
||||
homepage = "https://www.pleyades.net/david/projects/sakura";
|
||||
license = licenses.gpl2;
|
||||
maintainers = with maintainers; [ astsmtl codyopel ];
|
||||
platforms = platforms.linux;
|
||||
longDescription = ''
|
||||
sakura is a terminal emulator based on GTK and VTE. It's a terminal
|
||||
emulator with few dependencies, so you don't need a full GNOME desktop
|
||||
|
|
@ -32,5 +43,8 @@ stdenv.mkDerivation rec {
|
|||
terminals in one window and adds a contextual menu with some basic
|
||||
options. No more no less.
|
||||
'';
|
||||
};
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ astsmtl codyopel AndersonTorres ];
|
||||
platforms = platforms.linux;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -50,6 +50,10 @@ stdenv.mkDerivation rec {
|
|||
--replace /usr/bin/ $out/bin/
|
||||
|
||||
ln -s $out/opt/teams/teams $out/bin/
|
||||
|
||||
# Work-around screen sharing bug
|
||||
# https://docs.microsoft.com/en-us/answers/questions/42095/sharing-screen-not-working-anymore-bug.html
|
||||
rm $out/opt/teams/resources/app.asar.unpacked/node_modules/slimcore/bin/rect-overlay
|
||||
'';
|
||||
|
||||
dontAutoPatchelf = true;
|
||||
|
|
|
|||
|
|
@ -24,11 +24,11 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "PortfolioPerformance";
|
||||
version = "0.48.1";
|
||||
version = "0.49.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz";
|
||||
sha256 = "0xhxp4iglggv6rqwsg0xjn8z46v910rj372abkaviwa3cqzf7gdb";
|
||||
sha256 = "1b3dll6ljkj2wyiy3ns9cgxqgjjr60dfrqrbbwdbndqj4pzfvbyf";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -1,14 +1,19 @@
|
|||
{ stdenv, fetchurl, libao }:
|
||||
{ stdenv, fetchgit, libao, autoreconfHook }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
let
|
||||
pname = "aldo";
|
||||
version = "0.7.7";
|
||||
version = "0.7.8";
|
||||
in stdenv.mkDerivation {
|
||||
inherit pname version;
|
||||
|
||||
src = fetchurl {
|
||||
url = "mirror://savannah/${pname}/${pname}-${version}.tar.bz2";
|
||||
sha256 = "14lzgldqzbbzydsy1cai3wln3hpyj1yhj8ji3wygyzr616fq9f7i";
|
||||
src = fetchgit {
|
||||
url = "git://git.savannah.gnu.org/${pname}.git";
|
||||
rev = "v${version}";
|
||||
sha256 = "0swvdq0pw1msy40qkpn1ar9kacqjyrw2azvf2fy38y0svyac8z2i";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
buildInputs = [ libao ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
|
|
@ -1,54 +1,80 @@
|
|||
{ stdenv, fetchFromGitHub, wrapGAppsHook, gtk2, boost, gtkmm2, scons,
|
||||
mjpegtools, libdvdread, dvdauthor, gettext, dvdplusrwtools, libxmlxx, ffmpeg_3,
|
||||
enca, pkgconfig, fetchpatch }:
|
||||
{ stdenv
|
||||
, fetchFromGitHub
|
||||
, pkgconfig
|
||||
, fetchpatch
|
||||
, scons
|
||||
, boost
|
||||
, dvdauthor
|
||||
, dvdplusrwtools
|
||||
, enca
|
||||
, ffmpeg_3
|
||||
, gettext
|
||||
, gtk2
|
||||
, gtkmm2
|
||||
, libdvdread
|
||||
, libxmlxx
|
||||
, mjpegtools
|
||||
, wrapGAppsHook
|
||||
}:
|
||||
|
||||
let fetchPatchFromAur = {name, sha256}:
|
||||
fetchpatch {
|
||||
inherit name sha256;
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=e6cc6bc80c672aaa1a2260abfe8823da299a192c";
|
||||
}; in
|
||||
let
|
||||
fetchPatchFromAur = {name, sha256}:
|
||||
fetchpatch {
|
||||
inherit name sha256;
|
||||
url = "https://aur.archlinux.org/cgit/aur.git/plain/${name}?h=e6cc6bc80c672aaa1a2260abfe8823da299a192c";
|
||||
};
|
||||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bombono";
|
||||
version = "1.2.4";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "muravjov";
|
||||
owner = "bombono-dvd";
|
||||
repo = "bombono-dvd";
|
||||
rev = version;
|
||||
sha256 = "1lz1vik6abn1i1pvxhm55c9g47nxxv755wb2ijszwswwrwgvq5b9";
|
||||
sha256 = "sha256-aRW8H8+ca/61jGLxUs7u3R7yEiulwr5viMEuZWbc4dM=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
(fetchpatch {
|
||||
name = "bombono-dvd-1.2.4-scons3.patch";
|
||||
url = "https://svnweb.mageia.org/packages/cauldron/bombono-dvd/current/SOURCES/bombono-dvd-1.2.4-scons-python3.patch?revision=1447925&view=co&pathrev=1484457";
|
||||
sha256 = "081116d0if6s2r1rgqfr1n5gl3kpvzk01pf4v2k7gg2rnid83qp4";
|
||||
sha256 = "sha256-5OKBWrRZvHem2MTdAObfdw76ig3Z4ZdDFtq4CJoJISA=";
|
||||
})
|
||||
] ++ (map fetchPatchFromAur [
|
||||
{name="fix_ffmpeg_codecid.patch"; sha256="1asfc0lqzk4gjssrvjmsi1xr53ygnsx2sh7c8yzp5r3j2bagxhp7";}
|
||||
{name="fix_ptr2bool_cast.patch"; sha256="0iqzrmbg38ikh4x9cmx0v0rnm7a9lcq0kd8sh1z9yfmnz71qqahg";}
|
||||
{name="fix_c++11_literal_warnings.patch"; sha256="1zbf12i77p0j0090pz5lzg4a7kyahahzqssybv7vi0xikwvw57w9";}
|
||||
{name="autoptr2uniqueptr.patch"; sha256="0a3wvwfplmqvi8fnj929y85z3h1iq7baaz2d4v08h1q2wbmakqdm";}
|
||||
{name="fix_deprecated_boost_api.patch"; sha256="184gdz3w95ihhsd8xscpwvq77xd4il47kvmv6wslax77xyw50gm8";}
|
||||
{name="fix_throw_specifications.patch"; sha256="1f5gi3qwm843hsxvijq7sjy0s62xm7rnr1vdp7f242fi0ldq6c1n";}
|
||||
{name="fix_operator_ambiguity.patch"; sha256="0r4scsbsqfg6wgzsbfxxpckamvgyrida0n1ypg1klx24pk5dc7n7";}
|
||||
{name="fix_ffmpeg30.patch"; sha256="1irva7a9bpbzs60ga8ypa3la9y84i5rz20jnd721qmfqp2yip8dw";}
|
||||
{name="fix_ffmpeg_codecid.patch"; sha256="sha256-58L+1BJy5HK/R+xALbq2z4+Se4i6yp21lo/MjylgTqs=";}
|
||||
{name="fix_ptr2bool_cast.patch"; sha256="sha256-DyqMw/m2Op9+gBq1CTCjSZ1qM9igV5Y6gTOi8VbNH0c=";}
|
||||
{name="fix_c++11_literal_warnings.patch"; sha256="sha256-iZ/CN5+xg7jPXl5r/KGCys+jyPu0/AsSABLcc6IIbv0=";}
|
||||
{name="autoptr2uniqueptr.patch"; sha256="sha256-teGp6uICB4jAJk18pdbBMcDxC/JJJGkdihtXeh3ffCg=";}
|
||||
{name="fix_deprecated_boost_api.patch"; sha256="sha256-qD5QuO/ndEU1N7vueQiNpPVz8OaX6Y6ahjCWxMdvj6A=";}
|
||||
{name="fix_throw_specifications.patch"; sha256="sha256-NjCDGwXRCSLcuW2HbPOpXRgNvNQHy7i7hoOgyvGIr7g=";}
|
||||
{name="fix_operator_ambiguity.patch"; sha256="sha256-xx7WyrxEdDrDuz5YoFrM/u2qJru9u6X/4+Y5rJdmmmQ=";}
|
||||
{name="fix_ffmpeg30.patch"; sha256="sha256-vKEbvbjYVRzEaVYC8XOJBPmk6FDXI/WA0X/dldRRO8c=";}
|
||||
]);
|
||||
|
||||
nativeBuildInputs = [ wrapGAppsHook scons pkgconfig gettext ];
|
||||
|
||||
buildInputs = [
|
||||
gtk2 gtkmm2 mjpegtools libdvdread dvdauthor boost dvdplusrwtools
|
||||
libxmlxx ffmpeg_3 enca
|
||||
];
|
||||
boost
|
||||
dvdauthor
|
||||
dvdplusrwtools
|
||||
enca
|
||||
ffmpeg_3
|
||||
gtk2
|
||||
gtkmm2
|
||||
libdvdread
|
||||
libxmlxx
|
||||
mjpegtools
|
||||
];
|
||||
|
||||
prefixKey = "PREFIX=";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "a DVD authoring program for personal computers";
|
||||
homepage = "http://www.bombono.org/";
|
||||
license = stdenv.lib.licenses.gpl2;
|
||||
maintainers = with stdenv.lib.maintainers; [ symphorien ];
|
||||
homepage = "https://www.bombono.org/";
|
||||
license = licenses.gpl2Only;
|
||||
maintainers = with maintainers; [ symphorien ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -9,7 +9,7 @@ let
|
|||
in
|
||||
|
||||
args@{
|
||||
name
|
||||
name ? "${args.pname}-${args.version}"
|
||||
, bazel ? bazelPkg
|
||||
, bazelFlags ? []
|
||||
, bazelBuildFlags ? []
|
||||
|
|
|
|||
|
|
@ -43,6 +43,8 @@ stdenv.mkDerivation rec {
|
|||
cd go
|
||||
patchShebangs ./ # replace /bin/bash
|
||||
|
||||
# Disable timezone tests (these fail when `tzdata` is updated)
|
||||
rm src/time/{example,format}_test.go
|
||||
# Disabling the 'os/http/net' tests (they want files not available in
|
||||
# chroot builds)
|
||||
rm src/net/{multicast_test.go,parse_test.go,port_test.go}
|
||||
|
|
@ -56,8 +58,6 @@ stdenv.mkDerivation rec {
|
|||
sed -i '/TestDialTimeout/areturn' src/net/dial_test.go
|
||||
# Disable the hostname test
|
||||
sed -i '/TestHostname/areturn' src/os/os_test.go
|
||||
# ParseInLocation fails the test
|
||||
sed -i '/TestParseInSydney/areturn' src/time/format_test.go
|
||||
|
||||
sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go
|
||||
'' + lib.optionalString stdenv.isLinux ''
|
||||
|
|
@ -119,13 +119,6 @@ stdenv.mkDerivation rec {
|
|||
patches = [
|
||||
./remove-tools-1.4.patch
|
||||
./creds-test-1.4.patch
|
||||
|
||||
# This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch
|
||||
# actually works on old versions too.
|
||||
(fetchpatch {
|
||||
url = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch";
|
||||
sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi";
|
||||
})
|
||||
];
|
||||
|
||||
GOOS = if stdenv.isDarwin then "darwin" else "linux";
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "rakudo";
|
||||
version = "2020.09";
|
||||
version = "2020.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.rakudo.org/dl/rakudo/rakudo-${version}.tar.gz";
|
||||
sha256 = "1izfwns7viwy0x9hnhx13j9w5qa97qpyxqk9cd8iax7i68z057m7";
|
||||
sha256 = "0wvsinmpz8icd0409f8rg93mqdb5ml76m0vb4r26ngz237ph69dn";
|
||||
};
|
||||
|
||||
buildInputs = [ icu zlib gmp perl ];
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "moarvm";
|
||||
version = "2020.09";
|
||||
version = "2020.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.moarvm.org/releases/MoarVM-${version}.tar.gz";
|
||||
sha256 = "08prlvnyqwnzb7mwaqvgv662v78xgwsyy12cpyim6gc4z0i1kcj8";
|
||||
sha256 = "1i7jjjwv4av3rsfgbqb213fhb9ns25jfm19nzn7kki0n7w486y33";
|
||||
};
|
||||
|
||||
buildInputs = [ perl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreServices ApplicationServices ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "nqp";
|
||||
version = "2020.09";
|
||||
version = "2020.10";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/raku/nqp/releases/download/${version}/nqp-${version}.tar.gz";
|
||||
sha256 = "09kiy7r732yrh3nzdzdq9yki0jx2hamyqvrbahk4mlxmb6cl9qmh";
|
||||
sha256 = "0nb0vdycz2wrd5yspvps2wy7a21066csr18v786085qim347830h";
|
||||
};
|
||||
|
||||
buildInputs = [ perl ];
|
||||
|
|
|
|||
|
|
@ -33,9 +33,9 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Image pixel format conversion library";
|
||||
homepage = "http://gegl.org/babl/";
|
||||
license = licenses.gpl3;
|
||||
maintainers = with stdenv.lib.maintainers; [ jtojnar ];
|
||||
homepage = "https://gegl.org/babl/";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
src = fetchurl {
|
||||
url = "https://download.gimp.org/pub/gegl/${stdenv.lib.versions.majorMinor version}/${pname}-${version}.tar.xz";
|
||||
sha256 = "097427icgpgvcx40019b3dm8m84cchz79pixzpz648drs8p1wdqg";
|
||||
sha256 = "sha256-DzceLtK5IWL+/T3edD5kjKCKahsrBQBIZ/vdx+IR5CQ=";
|
||||
};
|
||||
|
||||
patches = [
|
||||
|
|
@ -50,7 +50,7 @@ stdenv.mkDerivation rec {
|
|||
# https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/83
|
||||
(fetchpatch {
|
||||
url = "https://gitlab.gnome.org/GNOME/gegl/-/merge_requests/83.patch";
|
||||
sha256 = "CSBYbJ2xnEN23xrla1qqr244jxOR5vNK8ljBSXdg4yE=";
|
||||
sha256 = "sha256-CSBYbJ2xnEN23xrla1qqr244jxOR5vNK8ljBSXdg4yE=";
|
||||
})
|
||||
];
|
||||
|
||||
|
|
@ -120,8 +120,8 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Graph-based image processing framework";
|
||||
homepage = "http://www.gegl.org";
|
||||
license = licenses.gpl3;
|
||||
homepage = "https://www.gegl.org";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,12 +1,24 @@
|
|||
{ stdenv, fetchurl, pkgconfig, babl, libpng, cairo, libjpeg
|
||||
, librsvg, pango, gtk2, bzip2, intltool, libintl
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, pkgconfig
|
||||
, babl
|
||||
, libpng
|
||||
, cairo
|
||||
, libjpeg
|
||||
, librsvg
|
||||
, pango
|
||||
, gtk2
|
||||
, bzip2
|
||||
, intltool
|
||||
, libintl
|
||||
, OpenGL ? null }:
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
name = "gegl-0.2.0";
|
||||
pname = "gegl";
|
||||
version = "0.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "ftp://ftp.gtk.org/pub/gegl/0.2/${name}.tar.bz2";
|
||||
url = "ftp://ftp.gtk.org/pub/gegl/0.2/${pname}-${version}.tar.bz2";
|
||||
sha256 = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426";
|
||||
};
|
||||
|
||||
|
|
@ -17,7 +29,7 @@ stdenv.mkDerivation rec {
|
|||
name = "CVE-2012-4433.patch";
|
||||
})];
|
||||
|
||||
# needs fonts otherwise don't know how to pass them
|
||||
# needs fonts otherwise don't know how to pass them
|
||||
configureFlags = [ "--disable-docs" ];
|
||||
|
||||
buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk2 bzip2 intltool libintl ]
|
||||
|
|
@ -27,10 +39,11 @@ stdenv.mkDerivation rec {
|
|||
|
||||
doCheck = false; # fails 3 out of 19 tests
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Graph-based image processing framework";
|
||||
homepage = "http://www.gegl.org";
|
||||
license = stdenv.lib.licenses.gpl3;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
homepage = "https://www.gegl.org";
|
||||
license = licenses.lgpl3Plus;
|
||||
maintainers = with maintainers; [ jtojnar ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -46,6 +46,6 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
license = with licenses; [ gpl3 lgpl3 ];
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ lschuermann ];
|
||||
maintainers = with maintainers; [ matthiasbeyer ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -12,9 +12,9 @@
|
|||
}:
|
||||
|
||||
let
|
||||
version = "1.6.0";
|
||||
version = "1.7.0";
|
||||
device = if cudaSupport then "cuda" else "cpu";
|
||||
srcs = import ./binary-hashes.nix;
|
||||
srcs = import ./binary-hashes.nix version;
|
||||
unavailable = throw "libtorch is not available for this platform";
|
||||
in stdenv.mkDerivation {
|
||||
inherit version;
|
||||
|
|
|
|||
|
|
@ -1,14 +1,14 @@
|
|||
{
|
||||
version: {
|
||||
x86_64-darwin-cpu = {
|
||||
url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-1.6.0.zip";
|
||||
sha256 = "0d4n7la31qzl4s9pwvm07la7q6lhcwiww0yjpfz3kw6nvx84p22r";
|
||||
url = "https://download.pytorch.org/libtorch/cpu/libtorch-macos-${version}.zip";
|
||||
sha256 = "1912lklil0i7i10j1fm4qzcq96cc8c281l9fn5gfbwa2wwry0r59";
|
||||
};
|
||||
x86_64-linux-cpu = {
|
||||
url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-1.6.0%2Bcpu.zip";
|
||||
sha256 = "1975b4zvyihzh89vnwspw0vf9qr05sxj8939vcrlmv3gzvdspcxz";
|
||||
url = "https://download.pytorch.org/libtorch/cpu/libtorch-cxx11-abi-shared-with-deps-${version}%2Bcpu.zip";
|
||||
sha256 = "0jdd7bjcy20xz2gfv8f61zdrbzxz5425bnqaaqgrwpzvd45ay8px";
|
||||
};
|
||||
x86_64-linux-cuda = {
|
||||
url = "https://download.pytorch.org/libtorch/cu102/libtorch-cxx11-abi-shared-with-deps-1.6.0.zip";
|
||||
sha256 = "127qnfyi1faqbm40sbnsyqxjhrqj82bzwqyz7c1hs2bm0zgrrpya";
|
||||
url = "https://download.pytorch.org/libtorch/cu102/libtorch-cxx11-abi-shared-with-deps-${version}.zip";
|
||||
sha256 = "1ag6lvf3a400ivqq4g9cxpmxzlfrga0y5ssjy0rfpw6i1xljibn6";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -2,6 +2,7 @@
|
|||
, uri, xmlm, omd, ezjsonm }:
|
||||
|
||||
buildDunePackage rec {
|
||||
useDune2 = true;
|
||||
minimumOCamlVersion = "4.02.3";
|
||||
|
||||
version = "2.4.0";
|
||||
|
|
|
|||
|
|
@ -1,15 +1,17 @@
|
|||
{ stdenv, fetchzip, buildDunePackage, jsonm, hex, sexplib }:
|
||||
{ stdenv, fetchurl, buildDunePackage, jsonm, hex, sexplib0 }:
|
||||
|
||||
buildDunePackage rec {
|
||||
pname = "ezjsonm";
|
||||
version = "0.6.0";
|
||||
version = "1.2.0";
|
||||
|
||||
src = fetchzip {
|
||||
url = "https://github.com/mirage/${pname}/archive/${version}.tar.gz";
|
||||
sha256 = "18g64lhai0bz65b9fil12vlgfpwa9b5apj7x6d7n4zzm18qfazvj";
|
||||
useDune2 = true;
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/mirage/ezjsonm/releases/download/v${version}/ezjsonm-v${version}.tbz";
|
||||
sha256 = "1q6cf63cc614lr141rzhm2w4rhi1snfqai6fmkhvfjs84hfbw2w7";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ jsonm hex sexplib ];
|
||||
propagatedBuildInputs = [ jsonm hex sexplib0 ];
|
||||
|
||||
meta = {
|
||||
description = "An easy interface on top of the Jsonm library";
|
||||
|
|
|
|||
|
|
@ -3,6 +3,7 @@
|
|||
buildDunePackage rec {
|
||||
pname = "mustache";
|
||||
version = "3.1.0";
|
||||
useDune2 = true;
|
||||
src = fetchFromGitHub {
|
||||
owner = "rgrinberg";
|
||||
repo = "ocaml-mustache";
|
||||
|
|
|
|||
|
|
@ -55,10 +55,10 @@ stdenv.mkDerivation rec {
|
|||
test "$?" == 124 && echo "ok")
|
||||
'';
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Launcher for Pharo distributions";
|
||||
homepage = "https://pharo.org";
|
||||
longDescription = ''
|
||||
|
||||
Pharo's goal is to deliver a clean, innovative, free open-source
|
||||
Smalltalk-inspired environment. By providing a stable and small
|
||||
core system, excellent dev tools, and maintained releases, Pharo
|
||||
|
|
@ -75,8 +75,7 @@ stdenv.mkDerivation rec {
|
|||
access it very rapidly from your OS application launcher. As a
|
||||
result, launching any image is never more than 3 clicks away.
|
||||
'';
|
||||
homepage = "http://pharo.org";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
license = licenses.mit;
|
||||
maintainers = [ ];
|
||||
platforms = pharo.meta.platforms;
|
||||
};
|
||||
|
|
|
|||
|
|
@ -1,4 +1,20 @@
|
|||
{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, libGLU, libGL, freetype, xorg, alsaLib, cairo, libuuid, makeWrapper, ... }:
|
||||
{ stdenv
|
||||
, fetchurl
|
||||
, cmake
|
||||
, bash
|
||||
, unzip
|
||||
, glibc
|
||||
, openssl
|
||||
, gcc
|
||||
, libGLU
|
||||
, libGL
|
||||
, freetype
|
||||
, xorg
|
||||
, alsaLib
|
||||
, cairo
|
||||
, libuuid
|
||||
, makeWrapper
|
||||
, ... }:
|
||||
|
||||
{ name, src, ... }:
|
||||
|
||||
|
|
@ -10,7 +26,15 @@ stdenv.mkDerivation rec {
|
|||
|
||||
hardeningDisable = [ "format" "pic" ];
|
||||
|
||||
# Building
|
||||
nativeBuildInputs = [ unzip cmake gcc makeWrapper ];
|
||||
|
||||
buildInputs = [ bash glibc openssl libGLU libGL freetype
|
||||
xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ];
|
||||
|
||||
LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath
|
||||
[ cairo libGLU libGL freetype openssl libuuid alsaLib
|
||||
xorg.libICE xorg.libSM ];
|
||||
|
||||
preConfigure = ''
|
||||
cd build/
|
||||
'';
|
||||
|
|
@ -46,12 +70,9 @@ stdenv.mkDerivation rec {
|
|||
ln -s "${pharo-share}/lib/"*.sources $prefix/lib/$name
|
||||
'';
|
||||
|
||||
LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ cairo libGLU libGL freetype openssl libuuid alsaLib xorg.libICE xorg.libSM ];
|
||||
nativeBuildInputs = [ unzip cmake gcc makeWrapper ];
|
||||
buildInputs = [ bash glibc openssl libGLU libGL freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ];
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "Clean and innovative Smalltalk-inspired environment";
|
||||
homepage = "https://pharo.org";
|
||||
longDescription = ''
|
||||
Pharo's goal is to deliver a clean, innovative, free open-source
|
||||
Smalltalk-inspired environment. By providing a stable and small core
|
||||
|
|
@ -65,9 +86,8 @@ stdenv.mkDerivation rec {
|
|||
Please fill bug reports on http://bugs.pharo.org under the 'Ubuntu
|
||||
packaging (ppa:pharo/stable)' project.
|
||||
'';
|
||||
homepage = "http://pharo.org";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = [ stdenv.lib.maintainers.lukego ];
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.lukego ];
|
||||
# Pharo VM sources are packaged separately for darwin (OS X)
|
||||
platforms = stdenv.lib.filter
|
||||
(system: with stdenv.lib.systems.elaborate { inherit system; };
|
||||
|
|
|
|||
|
|
@ -46,6 +46,33 @@ stdenv.mkDerivation rec {
|
|||
# while the VM depends on <= gcc48:
|
||||
"stackprotector" ];
|
||||
|
||||
# gcc 4.8 used for the build:
|
||||
#
|
||||
# gcc5 crashes during compilation; gcc >= 4.9 produces a
|
||||
# binary that crashes when forking a child process. See:
|
||||
# http://forum.world.st/OSProcess-fork-issue-with-Debian-built-VM-td4947326.html
|
||||
#
|
||||
# (stack protection is disabled above for gcc 4.8 compatibility.)
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [
|
||||
bash
|
||||
unzip
|
||||
glibc
|
||||
openssl
|
||||
gcc48
|
||||
libGLU libGL
|
||||
freetype
|
||||
xorg.libX11
|
||||
xorg.libICE
|
||||
xorg.libSM
|
||||
alsaLib
|
||||
cairo
|
||||
pharo-share
|
||||
libuuid
|
||||
];
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# Regenerate the configure script.
|
||||
# Unnecessary? But the build breaks without this.
|
||||
autoreconfPhase = ''
|
||||
|
|
@ -123,35 +150,9 @@ stdenv.mkDerivation rec {
|
|||
ln -s ${libgit2}/lib/libgit2.so* "$out/"
|
||||
'';
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
# gcc 4.8 used for the build:
|
||||
#
|
||||
# gcc5 crashes during compilation; gcc >= 4.9 produces a
|
||||
# binary that crashes when forking a child process. See:
|
||||
# http://forum.world.st/OSProcess-fork-issue-with-Debian-built-VM-td4947326.html
|
||||
#
|
||||
# (stack protection is disabled above for gcc 4.8 compatibility.)
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
buildInputs = [
|
||||
bash
|
||||
unzip
|
||||
glibc
|
||||
openssl
|
||||
gcc48
|
||||
libGLU libGL
|
||||
freetype
|
||||
xorg.libX11
|
||||
xorg.libICE
|
||||
xorg.libSM
|
||||
alsaLib
|
||||
cairo
|
||||
pharo-share
|
||||
libuuid
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Clean and innovative Smalltalk-inspired environment";
|
||||
homepage = "https://pharo.org";
|
||||
longDescription = ''
|
||||
Pharo's goal is to deliver a clean, innovative, free open-source
|
||||
Smalltalk-inspired environment. By providing a stable and small core
|
||||
|
|
@ -165,7 +166,6 @@ stdenv.mkDerivation rec {
|
|||
Please fill bug reports on http://bugs.pharo.org under the 'Ubuntu
|
||||
packaging (ppa:pharo/stable)' project.
|
||||
'';
|
||||
homepage = "http://pharo.org";
|
||||
license = licenses.mit;
|
||||
maintainers = [ maintainers.lukego ];
|
||||
platforms = [ "i686-linux" "x86_64-linux" ];
|
||||
|
|
|
|||
|
|
@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
|
|||
|
||||
meta = {
|
||||
description = "Shared files for Pharo";
|
||||
homepage = "http://pharo.org";
|
||||
homepage = "https://pharo.org";
|
||||
license = stdenv.lib.licenses.mit;
|
||||
maintainers = [ ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5,11 +5,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "apprise";
|
||||
version = "0.8.7";
|
||||
version = "0.8.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "18a65c5917bf7f2d48bb557bf0879e49c5293b4c0e9809328387ae09338ae37b";
|
||||
sha256 = "024db00c6a80dbc8c9038b2de211c9fd32963046612882f3f54ad78930f3e0f7";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ Babel ];
|
||||
|
|
|
|||
|
|
@ -6,11 +6,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "audioread";
|
||||
version = "2.1.8";
|
||||
version = "2.1.9";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "073904fabc842881e07bd3e4a5776623535562f70b1655b635d22886168dd168";
|
||||
sha256 = "a3480e42056c8e80a8192a54f6729a280ef66d27782ee11cbd63e9d4d1523089";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pytestrunner ];
|
||||
|
|
|
|||
|
|
@ -11,12 +11,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "azure-mgmt-datamigration";
|
||||
version = "4.0.0";
|
||||
version = "4.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
extension = "zip";
|
||||
sha256 = "1efda568d67af911156591eb308432b5f9a56075b57ac0a5dd9f7aee17d79217";
|
||||
sha256 = "c33d1deb0ee173a15c8ec21a1e714ba544fe5f4895d3b1d8b0581f3c1b2e8ce4";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -5,13 +5,13 @@
|
|||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
version = "0.9.0";
|
||||
version = "0.10.0";
|
||||
pname = "azure-mgmt-kusto";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9210db89fa18ee8ed53339cd63bbe6fe1d9624cd793b54b7451ddbda8ae92ef3";
|
||||
sha256 = "09e8d4928e19d12feb374adb47651b474f3ee3bc6a12704e4b70c9b38e3bcd9e";
|
||||
extension = "zip";
|
||||
};
|
||||
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "cchardet";
|
||||
version = "2.1.6";
|
||||
version = "2.1.7";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1cs6y59qhbal8fgbyjk2lpjykh8kfjhq16clfssylsddb4hgnsmp";
|
||||
sha256 = "c428b6336545053c2589f6caf24ea32276c6664cb86db817e03a94c60afa0eaf";
|
||||
};
|
||||
|
||||
checkInputs = [ nose ];
|
||||
|
|
|
|||
|
|
@ -22,11 +22,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "chalice";
|
||||
version = "1.21.2";
|
||||
version = "1.21.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "72efc25672ce7535c0e26bbe7157d7bd31ab12ed3f5221a64367548ca2daa265";
|
||||
sha256 = "0b44514cdbafab08b18e21f59fc016cead0b78f5f5fdf14eccd993c469130b39";
|
||||
};
|
||||
|
||||
checkInputs = [ watchdog pytest hypothesis mock ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dominate";
|
||||
version = "2.5.2";
|
||||
version = "2.6.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "456facce7a7ccfd9363948109cf1e978d48c58e46a46b01c71b4c0adc73b1928";
|
||||
sha256 = "76ec2cde23700a6fc4fee098168b9dee43b99c2f1dd0ca6a711f683e8eb7e1e4";
|
||||
};
|
||||
|
||||
doCheck = !isPy3k;
|
||||
|
|
|
|||
|
|
@ -12,11 +12,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "drf-yasg";
|
||||
version = "1.17.1";
|
||||
version = "1.20.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "5572e9d5baab9f6b49318169df9789f7399d0e3c7bdac8fdb8dfccf1d5d2b1ca";
|
||||
sha256 = "d50f197c7f02545d0b736df88c6d5cf874f8fea2507ad85ad7de6ae5bf2d9e5a";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "dropbox";
|
||||
version = "10.6.0";
|
||||
version = "10.7.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "8a7c80eb70ec677a149173154a98cf1fa461c6b0e1a1d833c90e40a735eda2cd";
|
||||
sha256 = "08c1e0bbc16499e0138431e34777c35ea086734ff15ee5067b0df3424df2a9ec";
|
||||
};
|
||||
|
||||
# Set DROPBOX_TOKEN environment variable to a valid token.
|
||||
|
|
|
|||
|
|
@ -11,11 +11,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "Eve";
|
||||
version = "1.1.3";
|
||||
version = "1.1.4";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ef335d13b798bc901636643f11455bab8b8698ddfe3a0b67bc251af1fd809b21";
|
||||
sha256 = "3a057277bba7144a0c15ab8c737dc8a1002e87e7284847aa011ce122e353418e";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -15,11 +15,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "holoviews";
|
||||
version = "1.13.4";
|
||||
version = "1.13.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "34dc09dfb557f79515a011a72b343daf31b5e5d67403a008dded59bab658267c";
|
||||
sha256 = "3f8a00ce1cc67a388a3a949441accd7e7e9ca9960ba16b49ee96a50305105a01";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,11 +13,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nbsphinx";
|
||||
version = "0.7.1";
|
||||
version = "0.8.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0j56bxdj08vn3q1804qwb1ywhga1mdg1awgm7i64wfpfwi8df2zm";
|
||||
sha256 = "369c16fe93af14c878d61fb3e81d838196fb35b27deade2cd7b95efe1fe56ea0";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -13,12 +13,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "nibabel";
|
||||
version = "3.1.1";
|
||||
version = "3.2.0";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1kir9g7kmy2qygyzczx8nj4b0sc6jjvqy0ssm39bxzqsr1vzzvxm";
|
||||
sha256 = "5827b644d1b0833603710dac198f5f8cbb9002769f97001a191e863b32f5956c";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ numpy scipy h5py packaging pydicom ];
|
||||
|
|
|
|||
|
|
@ -16,11 +16,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "oauthenticator";
|
||||
version = "0.11.0";
|
||||
version = "0.12.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "ff1b4ba2458a6ee460c3c4161d780a12e94811b2daaa5d13acdb354fa21a9916";
|
||||
sha256 = "0bc5a4a0ee22689a863090993e0054485030847d0e9884afa1592ca388cccf4a";
|
||||
};
|
||||
|
||||
checkPhase = ''
|
||||
|
|
|
|||
|
|
@ -7,11 +7,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "PuLP";
|
||||
version = "2.3";
|
||||
version = "2.3.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "9d8ecf532868cc31fa9ff59ee5d5b2049600c5c902c18c794a2bad677c1f92e5";
|
||||
sha256 = "5bbe53f854fb3b689e4faacac5bdb5fa576cb270fc12c78edef827dd46a4fb50";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ pyparsing amply ];
|
||||
|
|
|
|||
|
|
@ -10,12 +10,12 @@
|
|||
}:
|
||||
buildPythonPackage rec {
|
||||
pname = "py-multibase";
|
||||
version = "1.0.1";
|
||||
version = "1.0.3";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version ;
|
||||
sha256 = "6ed706ea321b487ba82e4172a9c82d61dacd675c865f576a937a94bca1a23443";
|
||||
sha256 = "d28a20efcbb61eec28f55827a0bf329c7cea80fffd933aecaea6ae8431267fe4";
|
||||
};
|
||||
|
||||
postPatch = ''
|
||||
|
|
|
|||
|
|
@ -4,11 +4,11 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pyface";
|
||||
version = "7.0.1";
|
||||
version = "7.1.0";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "43943cc15889153b90191d9e1bd85e7a3709a6d57b6379220cb14017217fb999";
|
||||
sha256 = "a3e22a4d31429f0d5b9ff50aaac3fb47e4f7da678b6b0439a7b91ef40675f88d";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ setuptools six traits ];
|
||||
|
|
|
|||
|
|
@ -8,13 +8,13 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "pysmb";
|
||||
version = "1.2.4";
|
||||
version = "1.2.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
format = "setuptools";
|
||||
extension = "zip";
|
||||
sha256 = "0937cb44936805d403e8e678d7042feb6d85da950a7019e8ae6842a0720fb00c";
|
||||
sha256 = "7aedd5e003992c6c78b41a0da4bf165359a46ea25ab2a9a1594d13f471ad7287";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
@ -25,6 +25,8 @@ buildPythonPackage rec {
|
|||
# https://github.com/miketeo/pysmb/blob/master/python3/tests/README_1st.txt
|
||||
doCheck = false;
|
||||
|
||||
pythonImportsCheck = [ "nmb" "smb" ];
|
||||
|
||||
meta = {
|
||||
description = "Experimental SMB/CIFS library written in Python to support file sharing between Windows and Linux machines";
|
||||
homepage = "https://miketeo.net/wp/index.php/projects/pysmb";
|
||||
|
|
|
|||
|
|
@ -11,17 +11,20 @@
|
|||
, patchelf
|
||||
, pyyaml
|
||||
, requests
|
||||
, typing-extensions
|
||||
}:
|
||||
|
||||
let
|
||||
pyVerNoDot = builtins.replaceStrings [ "." ] [ "" ] python.pythonVersion;
|
||||
platform = if stdenv.isDarwin then "darwin" else "linux";
|
||||
srcs = import ./binary-hashes.nix;
|
||||
srcs = import ./binary-hashes.nix version;
|
||||
unsupported = throw "Unsupported system";
|
||||
version = "1.7.0";
|
||||
in buildPythonPackage {
|
||||
inherit version;
|
||||
|
||||
pname = "pytorch";
|
||||
# Don't forget to update pytorch to the same version.
|
||||
version = "1.6.0";
|
||||
|
||||
format = "wheel";
|
||||
|
||||
|
|
@ -39,6 +42,17 @@ in buildPythonPackage {
|
|||
numpy
|
||||
pyyaml
|
||||
requests
|
||||
typing-extensions
|
||||
];
|
||||
|
||||
# PyTorch are broken: the dataclasses wheel is required, but ships with
|
||||
# Python >= 3.7. Our dataclasses derivation is incompatible with >= 3.7.
|
||||
#
|
||||
# https://github.com/pytorch/pytorch/issues/46930
|
||||
#
|
||||
# Should be removed with the next PyTorch version.
|
||||
pipInstallFlags = [
|
||||
"--no-deps"
|
||||
];
|
||||
|
||||
postInstall = ''
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
{
|
||||
version: {
|
||||
x86_64-linux-37 = {
|
||||
url = "https://download.pytorch.org/whl/cu102/torch-1.6.0-cp37-cp37m-linux_x86_64.whl";
|
||||
sha256 = "0xhwv68j8gvahfzcp43bqp2x71iwv6zjhkw2f1hb82xps40mrml7";
|
||||
url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp37-cp37m-linux_x86_64.whl";
|
||||
sha256 = "0cvafwzd44d7i2d0y01lyk75lhxffcf6c94cx0wla0cnhcg9mqlf";
|
||||
};
|
||||
x86_64-linux-38 = {
|
||||
url = "https://download.pytorch.org/whl/cu102/torch-1.6.0-cp38-cp38-linux_x86_64.whl";
|
||||
sha256 = "05m2l04wqzw5xvjam6zwvlmc3979cksl3hrdqc2aikrv4hz8fmsk";
|
||||
url = "https://download.pytorch.org/whl/cu102/torch-${version}-cp38-cp38-linux_x86_64.whl";
|
||||
sha256 = "1vxswkb2gzp87sbb5ycvyvs8aw1szp3v2mwdn4mp47yarlnbx8r6";
|
||||
};
|
||||
}
|
||||
|
|
|
|||
29
pkgs/development/python-modules/setuptools-rust/default.nix
Normal file
29
pkgs/development/python-modules/setuptools-rust/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ stdenv
|
||||
, buildPythonPackage
|
||||
, fetchPypi
|
||||
, semantic-version
|
||||
, setuptools
|
||||
, setuptools_scm
|
||||
, toml
|
||||
}:
|
||||
|
||||
buildPythonPackage rec {
|
||||
pname = "setuptools-rust";
|
||||
version = "0.11.3";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1p21sw77197m7pciy8g25bwwaakq1675h0x1lis9sypzr46p2s11";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ setuptools_scm ];
|
||||
|
||||
propagatedBuildInputs = [ semantic-version setuptools toml ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Setuptools plugin for Rust support";
|
||||
homepage = "https://github.com/PyO3/setuptools-rust";
|
||||
license = licenses.mit;
|
||||
maintainers = with maintainers; [ danieldk ];
|
||||
};
|
||||
}
|
||||
|
|
@ -25,12 +25,12 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "snowflake-connector-python";
|
||||
version = "2.3.3";
|
||||
version = "2.3.4";
|
||||
disabled = isPy27;
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "18w6ibpibqj3v136jjfklbax1l4y80v8mfk19apxlaprf6wvwpwy";
|
||||
sha256 = "5a072ee61ef156e5938e04447f0b99248b87ef262e498b5e5002f5b579cd7fb2";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@
|
|||
# XLA without CUDA is broken
|
||||
, xlaSupport ? cudaSupport
|
||||
# Default from ./configure script
|
||||
, cudaCapabilities ? [ "3.5" "5.2" ]
|
||||
, cudaCapabilities ? [ "sm_35" "sm_50" "sm_60" "sm_70" "sm_75" "compute_80" ]
|
||||
, sse42Support ? stdenv.hostPlatform.sse4_2Support
|
||||
, avx2Support ? stdenv.hostPlatform.avx2Support
|
||||
, fmaSupport ? stdenv.hostPlatform.fmaSupport
|
||||
|
|
|
|||
|
|
@ -2,10 +2,12 @@
|
|||
, rustPlatform
|
||||
, fetchFromGitHub
|
||||
, fetchurl
|
||||
, maturin
|
||||
, pipInstallHook
|
||||
, pytest
|
||||
, setuptools-rust
|
||||
, wheel
|
||||
, numpy
|
||||
, python
|
||||
, pytestCheckHook
|
||||
, requests
|
||||
}:
|
||||
|
||||
|
|
@ -18,10 +20,18 @@ let
|
|||
url = "https://s3.amazonaws.com/models.huggingface.co/bert/roberta-base-merges.txt";
|
||||
sha256 = "1idd4rvkpqqbks51i2vjbd928inw7slij9l4r063w3y5fd3ndq8w";
|
||||
};
|
||||
albertVocab = fetchurl {
|
||||
url = "https://s3.amazonaws.com/models.huggingface.co/bert/albert-base-v1-tokenizer.json";
|
||||
sha256 = "1hra9pn8rczx7378z88zjclw2qsdrdwq20m56sy42s2crbas6akf";
|
||||
};
|
||||
bertVocab = fetchurl {
|
||||
url = "https://s3.amazonaws.com/models.huggingface.co/bert/bert-base-uncased-vocab.txt";
|
||||
sha256 = "18rq42cmqa8zanydsbzrb34xwy4l6cz1y900r4kls57cbhvyvv07";
|
||||
};
|
||||
norvigBig = fetchurl {
|
||||
url = "https://norvig.com/big.txt";
|
||||
sha256 = "0yz80icdly7na03cfpl0nfk5h3j3cam55rj486n03wph81ynq1ps";
|
||||
};
|
||||
openaiVocab = fetchurl {
|
||||
url = "https://s3.amazonaws.com/models.huggingface.co/bert/openai-gpt-vocab.json";
|
||||
sha256 = "0y40gc9bixj5rxv674br1rxmxkd3ly29p80x1596h8yywwcrpx7x";
|
||||
|
|
@ -32,38 +42,34 @@ let
|
|||
};
|
||||
in rustPlatform.buildRustPackage rec {
|
||||
pname = "tokenizers";
|
||||
version = "0.8.1";
|
||||
version = "0.9.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huggingface";
|
||||
repo = pname;
|
||||
rev = "python-v${version}";
|
||||
sha256 = "0sxdwx05hr87j2z32rk4rgwn6a26w9r7m5fgj6ah1sgagiiyxbjw";
|
||||
sha256 = "0rsm1g5zfq3ygdb3s8v9xqqpgfzvvkc4n5ik3ahy8sw7pyjljb4m";
|
||||
};
|
||||
|
||||
# Update parking_lot to be compatible with recent Rust versions, that
|
||||
# replace asm! by llvm_asm!:
|
||||
#
|
||||
# https://github.com/Amanieu/parking_lot/pull/223
|
||||
#
|
||||
# Remove once upstream updates this dependency.
|
||||
cargoPatches = [ ./update-parking-lot.diff ];
|
||||
|
||||
cargoSha256 = "0cdkxmj8z2wdspn6r62lqlpvd0sj1z0cmb1zpqaajxvr0b2kjlj8";
|
||||
cargoSha256 = "0yn699dq9hdjh7fyci99ni8mmd5qdhzrsi80grzgf5cch8g38rbi";
|
||||
|
||||
sourceRoot = "source/bindings/python";
|
||||
|
||||
nativeBuildInputs = [
|
||||
maturin
|
||||
pipInstallHook
|
||||
setuptools-rust
|
||||
wheel
|
||||
];
|
||||
|
||||
propagatedBuildInputs = [
|
||||
numpy
|
||||
python
|
||||
];
|
||||
|
||||
# tokenizers uses pyo3, which requires Rust nightly.
|
||||
RUSTC_BOOTSTRAP = 1;
|
||||
installCheckInputs = [
|
||||
pytestCheckHook
|
||||
requests
|
||||
];
|
||||
|
||||
doCheck = false;
|
||||
doInstallCheck = true;
|
||||
|
|
@ -74,51 +80,21 @@ in rustPlatform.buildRustPackage rec {
|
|||
( cd $sourceRoot/tests/data
|
||||
ln -s ${robertaVocab} roberta-base-vocab.json
|
||||
ln -s ${robertaMerges} roberta-base-merges.txt
|
||||
ln -s ${albertVocab} albert-base-v1-tokenizer.json
|
||||
ln -s ${bertVocab} bert-base-uncased-vocab.txt
|
||||
ln -s ${norvigBig} big.txt
|
||||
ln -s ${openaiVocab} openai-gpt-vocab.json
|
||||
ln -s ${openaiMerges} openai-gpt-merges.txt )
|
||||
'';
|
||||
|
||||
postPatch = ''
|
||||
# pyo3's build check verifies that Rust is a nightly
|
||||
# version. Disable this check.
|
||||
substituteInPlace $NIX_BUILD_TOP/$cargoDepsCopy/pyo3/build.rs \
|
||||
--replace "check_rustc_version()?;" ""
|
||||
|
||||
# Patching the vendored dependency invalidates the file
|
||||
# checksums, so remove them. This should be safe, since
|
||||
# this is just a copy of the vendored dependencies and
|
||||
# the integrity of the vendored dependencies is validated
|
||||
# by cargoSha256.
|
||||
sed -r -i 's|"files":\{[^}]+\}|"files":{}|' \
|
||||
$NIX_BUILD_TOP/$cargoDepsCopy/pyo3/.cargo-checksum.json
|
||||
|
||||
# Maturin uses the crate name as the wheel name.
|
||||
substituteInPlace Cargo.toml \
|
||||
--replace "tokenizers-python" "tokenizers"
|
||||
'';
|
||||
|
||||
buildPhase = ''
|
||||
maturin build --release --manylinux off
|
||||
${python.interpreter} setup.py bdist_wheel
|
||||
'';
|
||||
|
||||
installPhase = ''
|
||||
# Put the wheels where the pip install hook can find them.
|
||||
install -Dm644 -t dist target/wheels/*.whl
|
||||
pipInstallPhase
|
||||
'';
|
||||
|
||||
installCheckInputs = [
|
||||
pytest
|
||||
requests
|
||||
];
|
||||
|
||||
installCheckPhase = ''
|
||||
# Append paths, or the binding's tokenizer module will be
|
||||
# used, since the test directories have __init__.py
|
||||
pytest --import-mode=append
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
homepage = "https://github.com/huggingface/tokenizers";
|
||||
description = "Fast State-of-the-Art Tokenizers optimized for Research and Production";
|
||||
|
|
|
|||
|
|
@ -1,63 +0,0 @@
|
|||
diff --git a/bindings/python/Cargo.lock b/bindings/python/Cargo.lock
|
||||
index f50db71..ea71817 100644
|
||||
--- a/Cargo.lock
|
||||
+++ b/Cargo.lock
|
||||
@@ -269,7 +269,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
|
||||
[[package]]
|
||||
name = "lock_api"
|
||||
-version = "0.3.3"
|
||||
+version = "0.3.4"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"scopeguard 1.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -337,16 +337,16 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot"
|
||||
-version = "0.10.0"
|
||||
+version = "0.10.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
- "lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
- "parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
+ "lock_api 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
+ "parking_lot_core 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "parking_lot_core"
|
||||
-version = "0.7.0"
|
||||
+version = "0.7.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
dependencies = [
|
||||
"cfg-if 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -409,7 +409,7 @@ dependencies = [
|
||||
"inventory 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"num-traits 0.2.11 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
- "parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
+ "parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"paste 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"pyo3cls 0.9.2 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
"regex 1.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
|
||||
@@ -768,7 +768,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
"checksum itoa 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)" = "b8b7a7c0c47db5545ed3fef7468ee7bb5b74691498139e4b3f6a20685dc6dd8e"
|
||||
"checksum lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
||||
"checksum libc 0.2.68 (registry+https://github.com/rust-lang/crates.io-index)" = "dea0c0405123bba743ee3f91f49b1c7cfb684eef0da0a50110f758ccf24cdff0"
|
||||
-"checksum lock_api 0.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "79b2de95ecb4691949fea4716ca53cdbcfccb2c612e19644a8bad05edcf9f47b"
|
||||
+"checksum lock_api 0.3.4 (registry+https://github.com/rust-lang/crates.io-index)" = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75"
|
||||
"checksum maybe-uninit 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00"
|
||||
"checksum memchr 2.3.3 (registry+https://github.com/rust-lang/crates.io-index)" = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400"
|
||||
"checksum memoffset 0.5.4 (registry+https://github.com/rust-lang/crates.io-index)" = "b4fc2c02a7e374099d4ee95a193111f72d2110197fe200272371758f6c3643d8"
|
||||
@@ -777,8 +777,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
"checksum number_prefix 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "17b02fc0ff9a9e4b35b3342880f48e896ebf69f2967921fe8646bf5b7125956a"
|
||||
"checksum onig 6.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bd91ccd8a02fce2f7e8a86655aec67bc6c171e6f8e704118a0e8c4b866a05a8a"
|
||||
"checksum onig_sys 69.5.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3814583fad89f3c60ae0701d80e87e1fd3028741723deda72d0d4a0ecf0cb0db"
|
||||
-"checksum parking_lot 0.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "92e98c49ab0b7ce5b222f2cc9193fc4efe11c6d0bd4f648e374684a6857b1cfc"
|
||||
-"checksum parking_lot_core 0.7.0 (registry+https://github.com/rust-lang/crates.io-index)" = "7582838484df45743c8434fbff785e8edf260c28748353d44bc0da32e0ceabf1"
|
||||
+"checksum parking_lot 0.10.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e"
|
||||
+"checksum parking_lot_core 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)" = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
|
||||
"checksum paste 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "ab4fb1930692d1b6a9cfabdde3d06ea0a7d186518e2f4d67660d8970e2fa647a"
|
||||
"checksum paste-impl 0.1.10 (registry+https://github.com/rust-lang/crates.io-index)" = "a62486e111e571b1e93b710b61e8f493c0013be39629b714cb166bdb06aa5a8a"
|
||||
"checksum pkg-config 0.3.17 (registry+https://github.com/rust-lang/crates.io-index)" = "05da548ad6865900e60eaba7f589cc0783590a92e940c26953ff81ddbab2d677"
|
||||
|
|
@ -7,6 +7,7 @@
|
|||
, requests
|
||||
, numpy
|
||||
, parameterized
|
||||
, protobuf
|
||||
, sacremoses
|
||||
, sentencepiece
|
||||
, timeout-decorator
|
||||
|
|
@ -17,19 +18,19 @@
|
|||
|
||||
buildPythonPackage rec {
|
||||
pname = "transformers";
|
||||
version = "3.3.1";
|
||||
version = "3.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "huggingface";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "1j9nzhl0zw5z9rnvzfih7v6bax353rxp05b3f0cvkii3b5dbkc2j";
|
||||
sha256 = "1v09gryxsg57d2cjwagna1535m8mbxlazdbhsww210lxa818m5qj";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [
|
||||
boto3
|
||||
filelock
|
||||
numpy
|
||||
protobuf
|
||||
regex
|
||||
requests
|
||||
sacremoses
|
||||
|
|
@ -44,11 +45,6 @@ buildPythonPackage rec {
|
|||
timeout-decorator
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace setup.py \
|
||||
--replace "tokenizers == 0.8.1.rc2" "tokenizers>=0.8"
|
||||
'';
|
||||
|
||||
preCheck = ''
|
||||
export HOME="$TMPDIR"
|
||||
|
||||
|
|
@ -67,8 +63,10 @@ buildPythonPackage rec {
|
|||
|
||||
# Disable tests that require network access.
|
||||
disabledTests = [
|
||||
"PegasusTokenizationTest"
|
||||
"T5TokenizationTest"
|
||||
"BlenderbotSmallTokenizerTest"
|
||||
"Blenderbot3BTokenizerTests"
|
||||
"TokenizationTest"
|
||||
"TestTokenizationBart"
|
||||
"test_all_tokenizers"
|
||||
"test_batch_encoding_is_fast"
|
||||
"test_batch_encoding_pickle"
|
||||
|
|
|
|||
|
|
@ -25,12 +25,12 @@ with stdenv.lib;
|
|||
|
||||
buildPythonApplication rec {
|
||||
pname = "trytond";
|
||||
version = "5.6.7";
|
||||
version = "5.6.8";
|
||||
disabled = pythonOlder "3.5";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "aca005639931835f4f0eaa92ae48ffebb94551af91649a96018694ea448ca0ae";
|
||||
sha256 = "330067d7319a50b9fb15e89d224e89ab28bc363926774adf7fa119f681b106b6";
|
||||
};
|
||||
|
||||
# Tells the tests which database to use
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
}:
|
||||
|
||||
buildBazelPackage rec {
|
||||
name = "bazel-remote-${version}";
|
||||
pname = "bazel-remote";
|
||||
version = "1.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
python3Packages.buildPythonApplication rec {
|
||||
pname = "litecli";
|
||||
version = "1.3.2";
|
||||
version = "1.4.1";
|
||||
|
||||
# Python 2 won't have prompt_toolkit 2.x.x
|
||||
# See: https://github.com/NixOS/nixpkgs/blob/f49e2ad3657dede09dc998a4a98fd5033fb52243/pkgs/top-level/python-packages.nix#L3408
|
||||
|
|
@ -10,7 +10,7 @@ python3Packages.buildPythonApplication rec {
|
|||
|
||||
src = python3Packages.fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "0bfx7fw6jnkqxa82xvd10yx1w2wbmrrqxwbh4anp5x9wnl91a9lp";
|
||||
sha256 = "FARWjtbS5zi/XQDyAVImUmArLj8xATz1jZ4jnXFdq1w=";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = with python3Packages; [
|
||||
|
|
|
|||
|
|
@ -3,13 +3,13 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "ccls";
|
||||
version = "0.20190823.6";
|
||||
version = "0.20201025";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "MaskRay";
|
||||
repo = "ccls";
|
||||
rev = version;
|
||||
sha256 = "11h5nwk4qqshf3i8yr4bxpnvmidrhkzd0zxhf1xqv8cv6r08k47f";
|
||||
sha256 = "13v00q1bz8g0ckw1sv0zyicbc44irc00vhwxdv3vvwlvylm7s21p";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
|
|
|||
|
|
@ -18,16 +18,16 @@ let
|
|||
in
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "deno";
|
||||
version = "1.3.3";
|
||||
version = "1.5.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "denoland";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0jbnx23f1323sh1rfx8rza2pzr4li4199wblrl4vw4zp5hj4qnkm";
|
||||
sha256 = "1kl3s5kv3wwh4br6zf0f56bffzjwhgzga93zg39mqry8jvwxp6dx";
|
||||
fetchSubmodules = true;
|
||||
};
|
||||
cargoSha256 = "08zi3ynbi44rdgid9qalgsb5g8dcwclr6ynwxvhi8r0v5i7swwrx";
|
||||
cargoSha256 = "1m3wd2gjy2b8a3x9wm49n9z02165afv4c3n13pnqsxcqmd9a764f";
|
||||
|
||||
# Install completions post-install
|
||||
nativeBuildInputs = [ installShellFiles ];
|
||||
|
|
@ -54,6 +54,9 @@ rustPlatform.buildRustPackage rec {
|
|||
|
||||
# TODO: Move to enhanced installShellCompletion when merged: PR #83630
|
||||
postInstall = ''
|
||||
# remove test plugin and test server
|
||||
rm -rf $out/lib $out/bin/test_server
|
||||
|
||||
$out/bin/deno completions bash > deno.bash
|
||||
$out/bin/deno completions fish > deno.fish
|
||||
$out/bin/deno completions zsh > _deno
|
||||
|
|
|
|||
8
pkgs/development/web/deno/deps.nix
generated
8
pkgs/development/web/deno/deps.nix
generated
|
|
@ -2,11 +2,11 @@
|
|||
{}:
|
||||
rec {
|
||||
rustyV8Lib = {
|
||||
version = "0.9.1";
|
||||
version = "0.12.0";
|
||||
sha256s = {
|
||||
x86_64-linux = "07zph4x3k659ywld27b60as7j06bdbab2ws1pf67iwg7w6h7iash";
|
||||
aarch64-linux = "0w9mbsdpkrla3ayaswpdjhiqs74h23qi2sv9355h138pw431ymnx";
|
||||
x86_64-darwin = "091kzdg431lvkvcy0401di3if53pii0isk5ipfpsvic82kr7vaqk";
|
||||
x86_64-linux = "18pim960fh18wrdkhirlj4hnnbxrk172r7yksdn2k5z9lgccighg";
|
||||
aarch64-linux = "0d1c8kcz44n1mqprspnshzbqlqw7mq7vryxpmd49gw3fvhcy66y7";
|
||||
x86_64-darwin = "1pc2dfq8p1a8dahkc4g8r6b9zwnvds60zc2lgbf8cj5n0ijd06y1";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
{ callPackage, openssl, icu, python2, enableNpm ? true }:
|
||||
|
||||
let
|
||||
buildNodejs = callPackage ./nodejs.nix {
|
||||
buildNodejs = callPackage ./nodejs.nix {
|
||||
inherit openssl icu;
|
||||
python = python2;
|
||||
};
|
||||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "10.22.1";
|
||||
sha256 = "0pr569qiabr4m7k38s7rwi3iyzrc5jmx19z2z0k7n4xfvhjlfzzl";
|
||||
version = "10.23.0";
|
||||
sha256 = "07vlqr0493a569i0npwgkxk5wa4vc7j68jsivchg08y2slwn0dgx";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,6 +8,6 @@ let
|
|||
in
|
||||
buildNodejs {
|
||||
inherit enableNpm;
|
||||
version = "14.14.0";
|
||||
sha256 = "1rphkl3lqg0rzgg0r58bfv1hjw3rg96qvqcilk2927kbpps3bs84";
|
||||
version = "14.15.0";
|
||||
sha256 = "0fzv05f8rnc0s1a11k0cqfpgv9yawfbdd8qcl8zr25kv5ridhdip";
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,16 +39,16 @@ in rec {
|
|||
|
||||
unstable = fetchurl rec {
|
||||
# NOTE: Don't forget to change the SHA256 for staging as well.
|
||||
version = "5.18";
|
||||
version = "5.20";
|
||||
url = "https://dl.winehq.org/wine/source/5.x/wine-${version}.tar.xz";
|
||||
sha256 = "0hpkcpi6j162bkgcgzzj8y471777q06j7pydl61yp6qscn4g80ch";
|
||||
sha256 = "sha256-j1Ui+M6+vbqhL1jhumcaEfZjcuCu33T7kyz1qJOQhhw=";
|
||||
inherit (stable) mono gecko32 gecko64;
|
||||
};
|
||||
|
||||
staging = fetchFromGitHub rec {
|
||||
# https://github.com/wine-staging/wine-staging/releases
|
||||
inherit (unstable) version;
|
||||
sha256 = "0bwcvkf1g1dsq1qmric3jfl85rfjzhq6x4h839hfqc536lkfbrpy";
|
||||
sha256 = "sha256-1oWoLb5w9g3wDghpvHpNsJCws7QoZ/E2dqxLuaIgi6o=";
|
||||
owner = "wine-staging";
|
||||
repo = "wine-staging";
|
||||
rev = "v${version}";
|
||||
|
|
|
|||
|
|
@ -74,6 +74,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/tpm2-software/tpm2-pkcs11";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ lschuermann ];
|
||||
maintainers = with maintainers; [ matthiasbeyer ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,11 +8,11 @@ assert withMysql -> (mysql_jdbc != null);
|
|||
|
||||
stdenvNoCC.mkDerivation rec {
|
||||
pname = "atlassian-confluence";
|
||||
version = "7.8.0";
|
||||
version = "7.8.1";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://product-downloads.atlassian.com/software/confluence/downloads/${pname}-${version}.tar.gz";
|
||||
sha256 = "0ivsbhb81v803dsx3c7vj4zbnhx8mr38nn9c45dfdp4lm6shsjq0";
|
||||
sha256 = "0jgwd8vb58yzwvnns0kyb0vzgrdvjwzvpk4x8228hrisjxahsm45";
|
||||
};
|
||||
|
||||
buildPhase = ''
|
||||
|
|
|
|||
|
|
@ -3,11 +3,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "atlassian-crowd";
|
||||
version = "4.0.2";
|
||||
version = "4.2.0";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://www.atlassian.com/software/crowd/downloads/binary/${pname}-${version}.tar.gz";
|
||||
sha256 = "1ndg9qb406rd239q7xycc2vdh2jd4fh9wryx1fm9493rxlncx28b";
|
||||
sha256 = "1gg4jcwvk4za6j4260dx1vz2dprrnqv8paqf6z86s7ka3y1nx1aj";
|
||||
};
|
||||
|
||||
phases = [ "unpackPhase" "buildPhase" "installPhase" "fixupPhase" ];
|
||||
|
|
|
|||
|
|
@ -2,11 +2,11 @@
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "metabase";
|
||||
version = "0.36.4";
|
||||
version = "0.37.0.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "http://downloads.metabase.com/v${version}/metabase.jar";
|
||||
sha256 = "1k6f22ii9vga8j9jxipl1r55msxgag0lbkjxw7vf285z1hdhwylq";
|
||||
sha256 = "7f95f9823bdf567d4044925e9f14c820a6b4a176624ec027d911cac33813bf96";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ makeWrapper ];
|
||||
|
|
|
|||
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
buildGoPackage rec {
|
||||
pname = "snmp_exporter";
|
||||
version = "0.18.0";
|
||||
version = "0.19.0";
|
||||
|
||||
goPackagePath = "github.com/prometheus/snmp_exporter";
|
||||
|
||||
|
|
@ -10,7 +10,7 @@ buildGoPackage rec {
|
|||
owner = "prometheus";
|
||||
repo = "snmp_exporter";
|
||||
rev = "v${version}";
|
||||
sha256 = "1zdkb036zy2sw1drlp2m2z1yb7857d2y3yn2y3l0a1kkd4zcqkk4";
|
||||
sha256 = "1ppi5lmc2lryawpw1b3kpg3qxr7v62zbiwg2v1d8sq1y5b2xdza6";
|
||||
};
|
||||
|
||||
buildInputs = [ net-snmp ];
|
||||
|
|
|
|||
|
|
@ -13,13 +13,13 @@ with stdenv.lib;
|
|||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "bluez-alsa";
|
||||
version = "2.1.0";
|
||||
version = "3.0.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "Arkq";
|
||||
repo = "bluez-alsa";
|
||||
rev = "v${version}";
|
||||
sha256 = "112dfqxc144a61jqil2s3181gngfw5vz7yy10ml4f5a1nd90qnci";
|
||||
sha256 = "1jlsgxyqfhncfhx1sy3ry0dp6p95kd4agh7g2b7g51h0c4cv74h8";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ pkgconfig autoreconfHook ];
|
||||
|
|
|
|||
|
|
@ -1,20 +1,18 @@
|
|||
{ stdenv, fetchurl }:
|
||||
|
||||
let version = "0.8"; in
|
||||
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "buildtorrent";
|
||||
inherit version;
|
||||
version = "0.8";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://mathr.co.uk/blog/code/${pname}-${version}.tar.gz";
|
||||
sha256 = "e8e27647bdb38873ac570d46c1a9689a92b01bb67f59089d1cdd08784f7052d0";
|
||||
sha256 = "sha256-6OJ2R72ziHOsVw1GwalompKwG7Z/WQidHN0IeE9wUtA=";
|
||||
};
|
||||
|
||||
meta = {
|
||||
meta = with stdenv.lib; {
|
||||
description = "A simple commandline torrent creator";
|
||||
homepage = "http://mathr.co.uk/blog/torrent.html";
|
||||
license = stdenv.lib.licenses.gpl3Plus;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
homepage = "https://mathr.co.uk/blog/torrent.html";
|
||||
license = licenses.gpl3Plus;
|
||||
platforms = platforms.all;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -10,13 +10,13 @@
|
|||
|
||||
rustPlatform.buildRustPackage rec {
|
||||
pname = "starship";
|
||||
version = "0.45.2";
|
||||
version = "0.46.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "starship";
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "0kxmgx4pnayp3jf6cgmka05x3aymxr79rim5nff6k3cg5zaqrz59";
|
||||
sha256 = "092nqxl3vdk8k589bv3g05c598k77f4wsxcgymfb1h1fc0lfzqs4";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ installShellFiles ] ++ stdenv.lib.optionals stdenv.isLinux [ pkg-config ];
|
||||
|
|
@ -31,14 +31,17 @@ rustPlatform.buildRustPackage rec {
|
|||
done
|
||||
'';
|
||||
|
||||
cargoSha256 = "0x9a322anwrgpxfqrvqb1ikavp8qffa93wdvj5kln1d2rgmxr2sy";
|
||||
cargoSha256 = "1smz7084ppz79p8migpy0cqp6azf7sixv9ga65l2f3zfna7kbk78";
|
||||
|
||||
checkFlags = [
|
||||
"--skip=directory_in_home"
|
||||
"--skip=fish_directory_in_home"
|
||||
"--skip=home_directory"
|
||||
"--skip=truncated_directory_in_home"
|
||||
"--skip=directory_in_root"
|
||||
"--skip=truncation_symbol_not_truncated_home"
|
||||
"--skip=truncation_symbol_truncated_home"
|
||||
"--skip=folder_with_glide_yaml"
|
||||
"--skip=shows_multiple_tfms"
|
||||
"--skip=shows_pinned_in_project_below_root_with_global_json"
|
||||
];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
|
|
|
|||
24
pkgs/tools/misc/vix/default.nix
Normal file
24
pkgs/tools/misc/vix/default.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ stdenv, fetchFromGitHub, autoreconfHook, SDL }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
pname = "vix";
|
||||
version = "0.1.2";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = "BatchDrake";
|
||||
repo = "vix";
|
||||
rev = "824b6755157a0f7430a0be0af454487d1492204d";
|
||||
sha256 = "1y0a2sajkrsg36px21b8lgx1irf0pyj7hccyd6k806bm4zhgxw1z";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
|
||||
buildInputs = [ SDL ];
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = "Visual Interface heXadecimal dump ";
|
||||
homepage = "http://actinid.org/vix/";
|
||||
license = licenses.gpl3;
|
||||
maintainers = [ maintainers.ehmry ];
|
||||
};
|
||||
}
|
||||
|
|
@ -25,7 +25,7 @@ stdenv.mkDerivation rec {
|
|||
description = "Web Offer One File - Command-line utility to easily exchange files over a local network";
|
||||
license = stdenv.lib.licenses.gpl2Plus;
|
||||
platforms = stdenv.lib.platforms.unix;
|
||||
maintainers = with maintainers; [ lschuermann ];
|
||||
maintainers = with maintainers; [ matthiasbeyer ];
|
||||
};
|
||||
}
|
||||
|
||||
|
|
|
|||
29
pkgs/tools/networking/nxdomain/default.nix
Normal file
29
pkgs/tools/networking/nxdomain/default.nix
Normal file
|
|
@ -0,0 +1,29 @@
|
|||
{ lib, buildPythonApplication, fetchPypi, dnspython, pytestCheckHook }:
|
||||
|
||||
buildPythonApplication rec {
|
||||
pname = "nxdomain";
|
||||
version = "1.0.1";
|
||||
|
||||
src = fetchPypi {
|
||||
inherit pname version;
|
||||
sha256 = "1z9iffggqq2kw6kpnj30shi98cg0bkvkwpglmhnkgwac6g55n2zn";
|
||||
};
|
||||
|
||||
propagatedBuildInputs = [ dnspython ];
|
||||
|
||||
checkInputs = [ pytestCheckHook ];
|
||||
|
||||
postCheck = ''
|
||||
echo example.org > simple.list
|
||||
python -m nxdomain --format dnsmasq --out dnsmasq.conf --simple ./simple.list
|
||||
grep -q 'address=/example.org/' dnsmasq.conf
|
||||
'';
|
||||
|
||||
meta = with lib; {
|
||||
homepage = "https://github.com/zopieux/nxdomain";
|
||||
description = "A domain (ad) block list creator";
|
||||
platforms = platforms.all;
|
||||
license = licenses.gpl3Plus;
|
||||
maintainers = with maintainers; [ zopieux ];
|
||||
};
|
||||
}
|
||||
|
|
@ -26,7 +26,7 @@ stdenv.mkDerivation rec {
|
|||
'';
|
||||
homepage = "http://gnupg-pkcs11.sourceforge.net/";
|
||||
license = licenses.bsd3;
|
||||
maintainers = with maintainers; [ lschuermann philandstuff ];
|
||||
maintainers = with maintainers; [ matthiasbeyer philandstuff ];
|
||||
platforms = platforms.unix;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -44,6 +44,6 @@ stdenv.mkDerivation rec {
|
|||
homepage = "https://github.com/tpm2-software/tpm2-tools";
|
||||
license = licenses.bsd3;
|
||||
platforms = platforms.linux;
|
||||
maintainers = with maintainers; [ lschuermann ];
|
||||
maintainers = with maintainers; [ matthiasbeyer ];
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,39 +1,31 @@
|
|||
{ stdenv, fetchhg, autoreconfHook, zlib, Cocoa }:
|
||||
{ stdenv, fetchFromGitHub, cmake, zlib, Cocoa }:
|
||||
|
||||
stdenv.mkDerivation {
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "atomicparsley";
|
||||
version = "0.9.6";
|
||||
version = "20200701.154658.b0d6223";
|
||||
|
||||
src = fetchhg {
|
||||
url = "https://bitbucket.org/wez/atomicparsley";
|
||||
sha256 = "05n4kbn91ps52h3wi1qb2jwygjsc01qzx4lgkv5mvwl5i49rj8fm";
|
||||
src = fetchFromGitHub {
|
||||
owner = "wez";
|
||||
repo = pname;
|
||||
rev = version;
|
||||
sha256 = "sha256-EHO4WkxoAXUhuJKMNYmBbGfOgtO9uklzXtWS4QsV1c8=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = [ autoreconfHook ];
|
||||
nativeBuildInputs = [ cmake ];
|
||||
|
||||
buildInputs = [ zlib ]
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
|
||||
++ stdenv.lib.optionals stdenv.isDarwin [ Cocoa ];
|
||||
|
||||
configureFlags = stdenv.lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
# AC_FUNC_MALLOC is broken on cross builds.
|
||||
"ac_cv_func_malloc_0_nonnull=yes"
|
||||
"ac_cv_func_realloc_0_nonnull=yes"
|
||||
];
|
||||
|
||||
installPhase = "install -D AtomicParsley $out/bin/AtomicParsley";
|
||||
installPhase = ''
|
||||
runHook preInstall
|
||||
install -D AtomicParsley $out/bin/AtomicParsley
|
||||
runHook postInstall
|
||||
'';
|
||||
|
||||
meta = with stdenv.lib; {
|
||||
description = ''
|
||||
A lightweight command line program for reading, parsing and
|
||||
setting metadata into MPEG-4 files
|
||||
'';
|
||||
|
||||
longDescription = ''
|
||||
This is a maintained fork of the original AtomicParsley.
|
||||
'';
|
||||
|
||||
homepage = "https://bitbucket.org/wez/atomicparsley";
|
||||
license = licenses.gpl2;
|
||||
description = "A CLI program for reading, parsing and setting metadata into MPEG-4 files";
|
||||
homepage = "https://github.com/wez/atomicparsley";
|
||||
license = licenses.gpl2Plus;
|
||||
platforms = platforms.unix;
|
||||
maintainers = with maintainers; [ pjones ];
|
||||
};
|
||||
|
|
|
|||
|
|
@ -5907,6 +5907,8 @@ in
|
|||
|
||||
nwdiag = with python3Packages; toPythonApplication nwdiag;
|
||||
|
||||
nxdomain = python3.pkgs.callPackage ../tools/networking/nxdomain { };
|
||||
|
||||
nxpmicro-mfgtools = callPackage ../development/tools/misc/nxpmicro-mfgtools { };
|
||||
|
||||
nyancat = callPackage ../tools/misc/nyancat { };
|
||||
|
|
@ -7775,6 +7777,8 @@ in
|
|||
|
||||
viu = callPackage ../tools/graphics/viu { };
|
||||
|
||||
vix = callPackage ../tools/misc/vix { };
|
||||
|
||||
vnc2flv = callPackage ../tools/video/vnc2flv {};
|
||||
|
||||
vncrec = callPackage ../tools/video/vncrec { };
|
||||
|
|
|
|||
|
|
@ -6517,6 +6517,8 @@ in {
|
|||
|
||||
setuptools-lint = callPackage ../development/python-modules/setuptools-lint { };
|
||||
|
||||
setuptools-rust = callPackage ../development/python-modules/setuptools-rust { };
|
||||
|
||||
setuptools_scm = callPackage ../development/python-modules/setuptools_scm { };
|
||||
|
||||
setuptools-scm-git-archive = callPackage ../development/python-modules/setuptools-scm-git-archive { };
|
||||
|
|
|
|||
Loading…
Reference in a new issue