Compare commits

...

7 Commits

5 changed files with 89 additions and 14 deletions

View File

@ -13,6 +13,7 @@
nixpkgs.config = {
allowUnfree = true;
joypixels.acceptLicense = true;
permittedInsecurePackages = [ "electron-13.6.9" ];
};
nixpkgs.overlays = [
# (self: super: { libvirt = (import (builtins.fetchTarball "https://github.com/NixOS/nixpkgs/archive/066676b839a217f6b1b5d8ab05842604d33b7258.tar.gz") {}).libvirt; })

View File

@ -2,11 +2,11 @@
"nodes": {
"emacs-overlay": {
"locked": {
"lastModified": 1646384912,
"narHash": "sha256-pl0ISKGsHiHIHLzdZEmti9JTY+dgUmhPWq5EH6iwmSA=",
"lastModified": 1649732714,
"narHash": "sha256-D8iDZsLJWXB4n/Iy/KCpgdKSLFff2rynCeohO7Xs3R0=",
"owner": "nix-community",
"repo": "emacs-overlay",
"rev": "bc45dd6df81fa947b4b4da904a03fad6c14898c2",
"rev": "8b7323d06cc5310f75781ae87dd50840c3b2bfc7",
"type": "github"
},
"original": {
@ -22,11 +22,11 @@
]
},
"locked": {
"lastModified": 1646364779,
"narHash": "sha256-481vkO9b3h++bHzLbGDDhgpBoXQ0Wlo4lm4h5/EJMO4=",
"lastModified": 1649642044,
"narHash": "sha256-V9ZjTJcbDPgWG+H3rIC6XuPHZAPK1VupBbSsuDbptkQ=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "d119cea3763977801ad66330668c1ab4346cb7f7",
"rev": "e39a9d0103e3b2e42059c986a8c633824b96c193",
"type": "github"
},
"original": {
@ -37,11 +37,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1646254136,
"narHash": "sha256-8nQx02tTzgYO21BP/dy5BCRopE8OwE8Drsw98j+Qoaw=",
"lastModified": 1649497218,
"narHash": "sha256-groqC9m1P4hpnL6jQvZ3C8NEtduhdkvwGT0+0LUrcYw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "3e072546ea98db00c2364b81491b893673267827",
"rev": "fd364d268852561223a5ada15caad669fd72800e",
"type": "github"
},
"original": {
@ -52,11 +52,11 @@
},
"nur": {
"locked": {
"lastModified": 1646396795,
"narHash": "sha256-oLNXIU6MRVTCEtsELPkF9MWR/v/PCbXgBCjZpbFoS5g=",
"lastModified": 1649749110,
"narHash": "sha256-gN/BkRu93GDHGENao+G0oHrknSJB3l+sfGOZWkqG2RY=",
"owner": "nix-community",
"repo": "NUR",
"rev": "350174f57e02b77e4b2423749838081e5275b7dc",
"rev": "287aa9ab138e00c3a3519e437a56b7627c62c478",
"type": "github"
},
"original": {

View File

@ -25,8 +25,10 @@ with lib;
tor-browser-bundle-bin
thunderbird
evolution
calibre
# calibre
atom
obsidian
flameshot
openshot-qt
blender

View File

@ -125,6 +125,7 @@
go
gemini
tidal
javascript
:email
(mu4e +org)

View File

@ -1,5 +1,76 @@
final: prev:
let inherit (prev) callPackage;
let inherit (final) callPackage;
in {
python39Packages = prev.python39Packages // {
pycurl = callPackage ({ lib, buildPythonPackage, isPyPy, fetchPypi
, pythonOlder, curl, openssl, bottle, pytestCheckHook, flaky }:
buildPythonPackage rec {
pname = "pycurl";
version = "7.45.1";
disabled = isPyPy
|| (pythonOlder "3.5"); # https://github.com/pycurl/pycurl/issues/208
src = fetchPypi {
inherit pname version;
sha256 = "sha256-qGOtGP9Hj1VFkkBXiHza5CLhsnRuQWdGFfaHSY6luIo=";
};
preConfigure = ''
substituteInPlace setup.py --replace '--static-libs' '--libs'
export PYCURL_SSL_LIBRARY=openssl
'';
buildInputs = [ curl openssl.out ];
nativeBuildInputs = [ curl ];
checkInputs = [ bottle pytestCheckHook flaky ];
pytestFlagsArray = [
# don't pick up the tests directory below examples/
"tests"
];
preCheck = ''
export HOME=$TMPDIR
'';
disabledTests = [
# libcurl stopped passing the reason phrase from the HTTP status line
# https://github.com/pycurl/pycurl/issues/679
"test_failonerror"
"test_failonerror_status_line_invalid_utf8_python3"
# bottle>=0.12.17 escapes utf8 properly, so these test don't work anymore
# https://github.com/pycurl/pycurl/issues/669
"test_getinfo_content_type_invalid_utf8_python3"
"test_getinfo_cookie_invalid_utf8_python3"
"test_getinfo_raw_content_type_invalid_utf8"
"test_getinfo_raw_cookie_invalid_utf8"
# tests that require network access
"test_keyfunction"
"test_keyfunction_bogus_return"
# OSError: tests/fake-curl/libcurl/with_openssl.so: cannot open shared object file: No such file or directory
"test_libcurl_ssl_openssl"
# OSError: tests/fake-curl/libcurl/with_nss.so: cannot open shared object file: No such file or directory
"test_libcurl_ssl_nss"
# OSError: tests/fake-curl/libcurl/with_gnutls.so: cannot open shared object file: No such file or directory
"test_libcurl_ssl_gnutls"
# AssertionError: assert 'crypto' in ['curl']
"test_ssl_in_static_libs"
# pycurl.error: (27, '')
"test_getinfo_raw_certinfo"
"test_request_with_certinfo"
"test_request_with_verifypeer"
"test_request_without_certinfo"
];
meta = with lib; {
homepage = "http://pycurl.io/";
description = "Python Interface To The cURL library";
license = with licenses; [ lgpl2Only mit ];
maintainers = with maintainers; [ SuperSandro2000 ];
};
});
};
}