diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-06-16 06:56:35 +0000 |
commit | 99fcaeccb89621dd492203ce1f2d551c06f228ed (patch) | |
tree | 41cb730ae07383004789779b0f6e11cb3f4642a3 /nixpkgs/pkgs/development/python-modules/pyosf | |
parent | 59c5f5ac8682acc13bb22bc29c7cf02f7d75f01f (diff) | |
parent | 75a5ebf473cd60148ba9aec0d219f72e5cf52519 (diff) | |
download | nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.gz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.bz2 nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.lz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.xz nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.tar.zst nixlib-99fcaeccb89621dd492203ce1f2d551c06f228ed.zip |
Merge branch 'nixos-unstable' of https://github.com/NixOS/nixpkgs
Conflicts: nixpkgs/nixos/modules/config/console.nix nixpkgs/nixos/modules/services/mail/mailman.nix nixpkgs/nixos/modules/services/mail/public-inbox.nix nixpkgs/nixos/modules/services/mail/rss2email.nix nixpkgs/nixos/modules/services/networking/ssh/sshd.nix nixpkgs/pkgs/applications/networking/instant-messengers/dino/default.nix nixpkgs/pkgs/applications/networking/irc/weechat/default.nix nixpkgs/pkgs/applications/window-managers/sway/default.nix nixpkgs/pkgs/build-support/go/module.nix nixpkgs/pkgs/build-support/rust/build-rust-package/default.nix nixpkgs/pkgs/development/interpreters/python/default.nix nixpkgs/pkgs/development/node-packages/overrides.nix nixpkgs/pkgs/development/tools/b4/default.nix nixpkgs/pkgs/servers/dict/dictd-db.nix nixpkgs/pkgs/servers/mail/public-inbox/default.nix nixpkgs/pkgs/tools/security/pinentry/default.nix nixpkgs/pkgs/tools/text/unoconv/default.nix nixpkgs/pkgs/top-level/all-packages.nix
Diffstat (limited to 'nixpkgs/pkgs/development/python-modules/pyosf')
-rw-r--r-- | nixpkgs/pkgs/development/python-modules/pyosf/default.nix | 33 |
1 files changed, 23 insertions, 10 deletions
diff --git a/nixpkgs/pkgs/development/python-modules/pyosf/default.nix b/nixpkgs/pkgs/development/python-modules/pyosf/default.nix index 07c657bf226e..3a23d687b8e1 100644 --- a/nixpkgs/pkgs/development/python-modules/pyosf/default.nix +++ b/nixpkgs/pkgs/development/python-modules/pyosf/default.nix @@ -1,33 +1,46 @@ { lib , buildPythonPackage , fetchFromGitHub -, isPy27 -, pytest-runner +, pythonOlder , requests }: buildPythonPackage rec { pname = "pyosf"; version = "1.0.5"; - disabled = isPy27; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "psychopy"; repo = pname; - rev = "v${version}"; - sha256 = "1fkpmylpcbqa9ky111mz4qr1n8pik49gs7pblbb5qx6b54fzl5k2"; + rev = "refs/tags/v${version}"; + hash = "sha256-Yhb6HSnLdFzWouse/RKZ8SIbMia/hhD8TAovdqmvd7o="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "'pytest-runner', " "" + ''; + preBuild = "export HOME=$TMP"; - buildInputs = [ pytest-runner ]; # required via `setup_requires` - propagatedBuildInputs = [ requests ]; - doCheck = false; # requires network access - pythonImportsCheck = [ "pyosf" ]; + propagatedBuildInputs = [ + requests + ]; + + # Tests require network access + doCheck = false; + + pythonImportsCheck = [ + "pyosf" + ]; meta = with lib; { - homepage = "https://github.com/psychopy/pyosf"; description = "Pure Python library for simple sync with Open Science Framework"; + homepage = "https://github.com/psychopy/pyosf"; + changelog = "https://github.com/psychopy/pyosf/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ bcdarwin ]; }; |