commit f85baf313ea9a3723e32d718fda11ee79837ed64 · pyrox.dev/nixpkgs

nixos/modules/services/video/go2rtc/default.nix

···

       103
       103
        
             serviceConfig = {

     

       104
       104
        
               DynamicUser = true;

     

       105
       105
        
               User = "go2rtc";

     

       106
       106
       +
               SupplementaryGroups = [

     

       107
       107
       +
                 # for v4l2 devices

     

       108
       108
       +
                 "video"

     

       109
       109
       +
               ];

     

       106
       110
        
               StateDirectory = "go2rtc";

     

       107
       111
        
               ExecStart = "${cfg.package}/bin/go2rtc -config ${configFile}";

     

       108
       112
        
             };

+3 -3

pkgs/applications/blockchains/erigon/default.nix

···

       2
       2
        
       

     

       3
       3
        
       let

     

       4
       4
        
         pname = "erigon";

     

       5
       5
       -
         version = "2.43.0";

     

       5
       5
       +
         version = "2.45.1";

     

       6
       6
        
       in

     

       7
       7
        
       buildGoModule {

     

       8
       8
        
         inherit pname version;

     
···

       11
       11
        
           owner = "ledgerwatch";

     

       12
       12
        
           repo = pname;

     

       13
       13
        
           rev = "v${version}";

     

       14
       14
       -
           sha256 = "sha256-3o7vu2bA8lB1CiVaSF6YU9WjwNliQAK5AcGl82GCqFg=";

     

       14
       14
       +
           sha256 = "sha256-uaEGshpAmCXIIcpN5Fx/VNUK8DgQp9yFm2xBDGz7FNo=";

     

       15
       15
        
           fetchSubmodules = true;

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
       -
         vendorSha256 = "sha256-JhMefeUxo9ksyCnNsLgAhGG0Ix7kxCA/cYyiELd0H64=";

     

       18
       18
       +
         vendorSha256 = "sha256-Yd78OW48HsOgxT5R3QT6/xDzPsRNFRE2nKocljTKKBA=";

     

       19
       19
        
         proxyVendor = true;

     

       20
       20
        
       

     

       21
       21
        
         # Build errors in mdbx when format hardening is enabled:

+2 -2

pkgs/applications/networking/cluster/aiac/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "aiac";

     

       5
       5
       -
         version = "2.4.0";

     

       5
       5
       +
         version = "2.5.0";

     

       6
       6
        
         excludedPackages = [".ci"];

     

       7
       7
        
       

     

       8
       8
        
         src = fetchFromGitHub {

     

       9
       9
        
           owner = "gofireflyio";

     

       10
       10
        
           repo = pname;

     

       11
       11
        
           rev = "v${version}";

     

       12
       12
       -
           hash = "sha256-C9eQdN8S8Qe0x+Uly69nbYNXDKpi1uZ6qNBetn2P4Gk=";

     

       12
       12
       +
           hash = "sha256-BCcoMftnvfAqmabnSz/oRAlJg95KJ236mduxV2DfRG4=";

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         vendorHash = "sha256-Uqr9wH7hCLdZEu6DXddgB7NuLtqcjUbOPJ2YX+9ehKM=";

+2 -2

pkgs/applications/networking/cluster/k0sctl/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildGoModule rec {

     

       8
       8
        
         pname = "k0sctl";

     

       9
       9
       -
         version = "0.15.1";

     

       9
       9
       +
         version = "0.15.2";

     

       10
       10
        
       

     

       11
       11
        
         src = fetchFromGitHub {

     

       12
       12
        
           owner = "k0sproject";

     

       13
       13
        
           repo = pname;

     

       14
       14
        
           rev = "v${version}";

     

       15
       15
       -
           sha256 = "sha256-80AmGc3SdniKayvviVoItrj8v+3m1sAJXSjoRJzw7mE=";

     

       15
       15
       +
           sha256 = "sha256-pti52JlnIxinKg2DxNfLewoJuhMohsAVmHgvR2N5shg=";

     

       16
       16
        
         };

     

       17
       17
        
       

     

       18
       18
        
         vendorSha256 = "sha256-K4/sIHWVe1Wj8LJgrqfoOg1hHXvH3HEgU5vq82tzMSk=";

+3 -3

pkgs/applications/radio/chirp/default.nix

···

       9
       9
        
       

     

       10
       10
        
       python3.pkgs.buildPythonApplication rec {

     

       11
       11
        
         pname = "chirp";

     

       12
       12
       -
         version = "unstable-2023-03-15";

     

       12
       12
       +
         version = "unstable-2023-06-02";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "kk7ds";

     

       16
       16
        
           repo = "chirp";

     

       17
       17
       -
           rev = "33402b7c545c5a92b7042369867e7eb75ef32a59";

     

       18
       18
       -
           hash = "sha256-duSEpd2GBBskoKNFos5X9wFtsjRct1918VhZd1T2rvU=";

     

       17
       17
       +
           rev = "72789c3652c332dc68ba694f8f8f005913fe5c95";

     

       18
       18
       +
           hash = "sha256-WQwCX7h9BFLdYOBVVntxQ6g4t3j7QLfNmlHVLzlRh7U=";

     

       19
       19
        
         };

     

       20
       20
        
         buildInputs = [

     

       21
       21
        
           glib

+3 -3

pkgs/applications/version-management/git-credential-oauth/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "git-credential-oauth";

     

       5
       5
       -
         version = "0.7.0";

     

       5
       5
       +
         version = "0.8.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "hickford";

     

       9
       9
        
           repo = pname;

     

       10
       10
        
           rev = "v${version}";

     

       11
       11
       -
           hash = "sha256-f12PgTtfs/S9RI8+QFROkNqccRWeIW1/YkynqvKJc7I=";

     

       11
       11
       +
           hash = "sha256-t1P20BDNQ0aJRgQhOgYP2Md44+I8xs6884ktBO4nGjY=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         ldflags = [

     
···

       17
       17
        
           "-X main.version=${version}"

     

       18
       18
        
         ];

     

       19
       19
        
       

     

       20
       20
       -
         vendorHash = "sha256-9X7ti3NR5MKK0MpiyTOTO+EtdMuu4/TW/diHq9FjSHY=";

     

       20
       20
       +
         vendorHash = "sha256-oHusgU5SMkFDY2dhFRdDonyYkyOBGOp+zqx2nFmOWXk=";

     

       21
       21
        
       

     

       22
       22
        
         meta = {

     

       23
       23
        
           description = "Git credential helper that securely authenticates to GitHub, GitLab and BitBucket using OAuth";

+12 -3

pkgs/development/compilers/halide/default.nix

···

       1
       1
       -
       { llvmPackages

     

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , llvmPackages

     

       2
       3
        
       , lib

     

       3
       4
        
       , fetchFromGitHub

     

       4
       5
        
       , cmake

     
···

       13
       14
        
       

     

       14
       15
        
       assert blas.implementation == "openblas" && lapack.implementation == "openblas";

     

       15
       16
        
       

     

       16
       16
       -
       llvmPackages.stdenv.mkDerivation rec {

     

       17
       17
       +
       stdenv.mkDerivation rec {

     

       17
       18
        
         pname = "halide";

     

       18
       19
        
         version = "15.0.1";

     

       19
       20
        
       

     
···

       24
       25
        
           sha256 = "sha256-mnZ6QMqDr48bH2W+andGZj2EhajXKApjuW6B50xtzx0=";

     

       25
       26
        
         };

     

       26
       27
        
       

     

       27
       27
       -
         cmakeFlags = [ "-DWARNINGS_AS_ERRORS=OFF" "-DWITH_PYTHON_BINDINGS=OFF" "-DTARGET_WEBASSEMBLY=OFF" ];

     

       28
       28
       +
         cmakeFlags = [

     

       29
       29
       +
           "-DWARNINGS_AS_ERRORS=OFF"

     

       30
       30
       +
           "-DWITH_PYTHON_BINDINGS=OFF"

     

       31
       31
       +
           "-DTARGET_WEBASSEMBLY=OFF"

     

       32
       32
       +
           # Disable performance tests since they may fail on busy machines

     

       33
       33
       +
           "-DWITH_TEST_PERFORMANCE=OFF"

     

       34
       34
       +
         ];

     

       35
       35
       +
       

     

       36
       36
       +
         doCheck = true;

     

       28
       37
        
       

     

       29
       38
        
         # Note: only openblas and not atlas part of this Nix expression

     

       30
       39
        
         # see pkgs/development/libraries/science/math/liblapack/3.5.0.nix

+2 -2

pkgs/development/interpreters/erlang/25.nix

···

       1
       1
        
       { mkDerivation }:

     

       2
       2
        
       

     

       3
       3
        
       mkDerivation {

     

       4
       4
       -
         version = "25.3.2.1";

     

       5
       5
       -
         sha256 = "4PDK18/tekJHgNGECG5hv/HvwvteR+FeN6hlpB9FC9o=";

     

       4
       4
       +
         version = "25.3.2.2";

     

       5
       5
       +
         sha256 = "TeDszsF9X4ExnOfP20ujlJpfxKK1zwhHHnPAbSnm/YQ=";

     

       6
       6
        
       }

+27 -10

pkgs/development/python-modules/diceware/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi

     

       2
       2
       -
       , pytest-runner

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       3
       4
        
       , setuptools

     

       4
       4
       -
       , coverage, pytest

     

       5
       5
       +
       , pytestCheckHook

     

       6
       6
       +
       , pythonOlder

     

       5
       7
        
       }:

     

       6
       8
        
       

     

       7
       9
        
       buildPythonPackage rec {

     

       8
       10
        
         pname = "diceware";

     

       9
       11
        
         version = "0.10";

     

       12
       12
       +
         format = "setuptools";

     

       13
       13
       +
       

     

       14
       14
       +
         disabled = pythonOlder "3.7";

     

       10
       15
        
       

     

       11
       16
        
         src = fetchPypi {

     

       12
       17
        
           inherit pname version;

     

       13
       18
        
           hash = "sha256-srTMm1n1aNLvUb/fn34a+UHSX7j1wl8XAZHburzpZWk=";

     

       14
       19
        
         };

     

       15
       20
        
       

     

       16
       16
       -
         nativeBuildInputs = [ pytest-runner ];

     

       21
       21
       +
         postPatch = ''

     

       22
       22
       +
           substituteInPlace setup.py \

     

       23
       23
       +
             --replace "'pytest_runner'," ""

     

       24
       24
       +
         '';

     

       25
       25
       +
       

     

       26
       26
       +
         propagatedBuildInputs = [

     

       27
       27
       +
           setuptools

     

       28
       28
       +
         ];

     

       17
       29
        
       

     

       18
       18
       -
         propagatedBuildInputs = [ setuptools ];

     

       30
       30
       +
         nativeCheckInputs = [

     

       31
       31
       +
           pytestCheckHook

     

       32
       32
       +
         ];

     

       19
       33
        
       

     

       20
       20
       -
         nativeCheckInputs = [ coverage pytest ];

     

       34
       34
       +
         pytestFlagsArray = [

     

       35
       35
       +
           # see https://github.com/ulif/diceware/commit/a7d844df76cd4b95a717f21ef5aa6167477b6733

     

       36
       36
       +
           "-m 'not packaging'"

     

       37
       37
       +
         ];

     

       21
       38
        
       

     

       22
       22
       -
         # see https://github.com/ulif/diceware/commit/a7d844df76cd4b95a717f21ef5aa6167477b6733

     

       23
       23
       -
         checkPhase = ''

     

       24
       24
       -
           py.test -m 'not packaging'

     

       25
       25
       -
         '';

     

       39
       39
       +
         pythonImportsCheck = [

     

       40
       40
       +
           "diceware"

     

       41
       41
       +
         ];

     

       26
       42
        
       

     

       27
       43
        
         meta = with lib; {

     

       28
       44
        
           description = "Generates passphrases by concatenating words randomly picked from wordlists";

     

       29
       45
        
           homepage = "https://github.com/ulif/diceware";

     

       46
       46
       +
           changelog = "https://github.com/ulif/diceware/blob/v${version}/CHANGES.rst";

     

       30
       47
        
           license = licenses.gpl3;

     

       31
       48
        
           maintainers = with maintainers; [ asymmetric ];

     

       32
       49
        
         };

+30 -6

pkgs/development/python-modules/libais/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi,

     

       2
       2
       -
         six, pytest, pytest-runner, pytest-cov, coverage

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , pytestCheckHook

     

       5
       5
       +
       , pythonOlder

     

       6
       6
       +
       , six

     

       3
       7
        
       }:

     

       8
       8
       +
       

     

       4
       9
        
       buildPythonPackage rec {

     

       5
       10
        
         pname = "libais";

     

       6
       11
        
         version = "0.17";

     

       12
       12
       +
         format = "setuptools";

     

       13
       13
       +
       

     

       14
       14
       +
         disabled = pythonOlder "3.7";

     

       7
       15
        
       

     

       8
       16
        
         src = fetchPypi {

     

       9
       17
        
           inherit pname version;

     

       10
       10
       -
           sha256 = "0pyka09h8nb0vlzh14npq4nxmzg1046lr3klgn97dsf5k0iflapb";

     

       18
       18
       +
           hash = "sha256-6yrqIpjF6XaSfXSOTA0B4f3aLcHXkgA/3WBZBBNQ018=";

     

       11
       19
        
         };

     

       12
       20
        
       

     

       21
       21
       +
         postPatch = ''

     

       22
       22
       +
           substituteInPlace setup.py \

     

       23
       23
       +
             --replace "'pytest-runner'," ""

     

       24
       24
       +
         '';

     

       25
       25
       +
       

     

       26
       26
       +
         propagatedBuildInputs = [

     

       27
       27
       +
           six

     

       28
       28
       +
         ];

     

       29
       29
       +
       

     

       30
       30
       +
         nativeCheckInputs = [

     

       31
       31
       +
           pytestCheckHook

     

       32
       32
       +
         ];

     

       33
       33
       +
       

     

       13
       34
        
         # data files missing

     

       14
       35
        
         doCheck = false;

     

       15
       36
        
       

     

       16
       16
       -
         nativeCheckInputs = [ pytest pytest-runner pytest-cov coverage ];

     

       17
       17
       -
         propagatedBuildInputs = [ six ];

     

       37
       37
       +
         pythonImportsCheck = [

     

       38
       38
       +
           "ais"

     

       39
       39
       +
         ];

     

       18
       40
        
       

     

       19
       41
        
         meta = with lib; {

     

       20
       20
       -
           homepage = "https://github.com/schwehr/libais";

     

       21
       42
        
           description = "Library for decoding maritime Automatic Identification System messages";

     

       43
       43
       +
           homepage = "https://github.com/schwehr/libais";

     

       44
       44
       +
           changelog = "https://github.com/schwehr/libais/blob/master/Changelog.md";

     

       22
       45
        
           license = licenses.asl20;

     

       46
       46
       +
           maintainers = with maintainers; [ ];

     

       23
       47
        
           platforms = platforms.unix;

     

       24
       48
        
         };

     

       25
       49
        
       }

+2 -2

pkgs/development/python-modules/policyuniverse/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "policyuniverse";

     

       9
       9
       -
         version = "1.5.1.20230526";

     

       9
       9
       +
         version = "1.5.1.20230608";

     

       10
       10
        
         format = "setuptools";

     

       11
       11
        
       

     

       12
       12
        
         disabled = pythonOlder "3.7";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchPypi {

     

       15
       15
        
           inherit pname version;

     

       16
       16
       -
           hash = "sha256-80Q1qkCAD3VwNk0pblPWni3qY/8Dc2YrOLDjPrg/2Os=";

     

       16
       16
       +
           hash = "sha256-q0Btbo5jznv3mUXh5SjVU7SmdxFpPkiVe/ZNY+lzUCg=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         # Tests are not shipped and there are no GitHub tags

+18 -10

pkgs/development/python-modules/pycategories/default.nix

···

       1
       1
       -
       { buildPythonPackage

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       2
       3
        
       , callPackage

     

       3
       3
       -
       , pytest-cov

     

       4
       4
        
       , fetchPypi

     

       5
       5
       -
       , lib

     

       6
       6
       -
       , pytest

     

       5
       5
       +
       , pytestCheckHook

     

       7
       6
        
       , pythonOlder

     

       8
       8
       -
       , pytest-runner

     

       9
       7
        
       }:

     

       10
       8
        
       

     

       11
       9
        
       buildPythonPackage rec {

     

       12
       10
        
         pname = "pycategories";

     

       13
       11
        
         version = "1.2.0";

     

       14
       14
       -
         disabled = pythonOlder "3.4";

     

       12
       12
       +
         format = "setuptools";

     

       13
       13
       +
       

     

       14
       14
       +
         disabled = pythonOlder "3.7";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchPypi {

     

       17
       17
        
           inherit pname version;

     

       18
       18
       -
           sha256 = "bd70ecb5e94e7659e564ea153f0c7673291dc37c526c246800fc08d6c5378099";

     

       18
       18
       +
           hash = "sha256-vXDstelOdlnlZOoVPwx2cykdw3xSbCRoAPwI1sU3gJk=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
       -
         nativeBuildInputs = [ pytest-runner ];

     

       21
       21
       +
         postPatch = ''

     

       22
       22
       +
           substituteInPlace setup.py \

     

       23
       23
       +
             --replace "'pytest-runner'," ""

     

       24
       24
       +
           substituteInPlace setup.cfg \

     

       25
       25
       +
             --replace "--cov-report term --cov=categories" ""

     

       26
       26
       +
         '';

     

       22
       27
        
       

     

       23
       28
        
         # Is private because the author states it's unmaintained

     

       24
       29
        
         # and shouldn't be used in production code

     

       25
       30
        
         propagatedBuildInputs = [ (callPackage ./infix.nix { }) ];

     

       26
       31
        
       

     

       27
       27
       -
         nativeCheckInputs = [ pytest pytest-cov ];

     

       32
       32
       +
         nativeCheckInputs = [

     

       33
       33
       +
           pytestCheckHook

     

       34
       34
       +
         ];

     

       28
       35
        
       

     

       29
       36
        
         meta = with lib; {

     

       37
       37
       +
           description = "Implementation of some concepts from category theory";

     

       30
       38
        
           homepage = "https://gitlab.com/danielhones/pycategories";

     

       31
       31
       -
           description = "Implementation of some concepts from category theory";

     

       39
       39
       +
           changelog = "https://gitlab.com/danielhones/pycategories/-/blob/v${version}/CHANGELOG.rst";

     

       32
       40
        
           license = licenses.mit;

     

       33
       41
        
           maintainers = with maintainers; [ dmvianna ];

     

       34
       42
        
         };

+21 -8

pkgs/development/python-modules/pysrim/default.nix

···

       1
       1
        
       { lib

     

       2
       2
       -
       , fetchPypi

     

       3
       2
        
       , buildPythonPackage

     

       4
       4
       -
       , pytest-runner

     

       3
       3
       +
       , fetchPypi

     

       5
       4
        
       , numpy

     

       5
       5
       +
       , pythonOlder

     

       6
       6
        
       , pyyaml

     

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
        
       buildPythonPackage rec {

     

       10
       10
        
         pname = "pysrim";

     

       11
       11
        
         version = "0.5.10";

     

       12
       12
       +
         format = "setuptools";

     

       13
       13
       +
       

     

       14
       14
       +
         disabled = pythonOlder "3.7";

     

       12
       15
        
       

     

       13
       16
        
         src = fetchPypi {

     

       14
       17
        
           inherit pname version;

     

       15
       15
       -
           sha256 = "ada088f73f7e1a3bf085206e81e0f83ed89c1d0b23a789ecd0ba0a250724aee8";

     

       18
       18
       +
           hash = "sha256-raCI9z9+GjvwhSBugeD4PticHQsjp4ns0LoKJQckrug=";

     

       16
       19
        
         };

     

       17
       20
        
       

     

       18
       18
       -
         buildInputs = [ pytest-runner ];

     

       19
       19
       -
         propagatedBuildInputs = [ numpy pyyaml ];

     

       21
       21
       +
         postPatch = ''

     

       22
       22
       +
           substituteInPlace setup.py \

     

       23
       23
       +
             --replace "'pytest-runner', " ""

     

       24
       24
       +
         '';

     

       25
       25
       +
       

     

       26
       26
       +
         propagatedBuildInputs = [

     

       27
       27
       +
           numpy

     

       28
       28
       +
           pyyaml

     

       29
       29
       +
         ];

     

       20
       30
        
       

     

       21
       31
        
         # Tests require git lfs download of repository

     

       22
       32
        
         doCheck = false;

     

       23
       33
        
       

     

       24
       24
       -
         meta = {

     

       34
       34
       +
         # pythonImportsCheck does not work

     

       35
       35
       +
         # TypeError: load() missing 1 required positional argument: 'Loader'

     

       36
       36
       +
       

     

       37
       37
       +
         meta = with lib; {

     

       25
       38
        
           description = "Srim Automation of Tasks via Python";

     

       26
       39
        
           homepage = "https://gitlab.com/costrouc/pysrim";

     

       27
       27
       -
           license = lib.licenses.mit;

     

       28
       28
       -
           maintainers = with lib.maintainers; [ costrouc ];

     

       40
       40
       +
           license = licenses.mit;

     

       41
       41
       +
           maintainers = with maintainers; [ costrouc ];

     

       29
       42
        
         };

     

       30
       43
        
       }

+52

pkgs/development/python-modules/sensirion-ble/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , hatchling

     

       5
       5
       +
       , bluetooth-data-tools

     

       6
       6
       +
       , bluetooth-sensor-state-data

     

       7
       7
       +
       , home-assistant-bluetooth

     

       8
       8
       +
       , sensor-state-data

     

       9
       9
       +
       , pythonOlder

     

       10
       10
       +
       }:

     

       11
       11
       +
       

     

       12
       12
       +
       buildPythonPackage rec {

     

       13
       13
       +
         pname = "sensirion-ble";

     

       14
       14
       +
         version = "0.1.0";

     

       15
       15
       +
         format = "pyproject";

     

       16
       16
       +
       

     

       17
       17
       +
         disabled = pythonOlder "3.8";

     

       18
       18
       +
       

     

       19
       19
       +
         src = fetchFromGitHub {

     

       20
       20
       +
           owner = "akx";

     

       21
       21
       +
           repo = "sensirion-ble";

     

       22
       22
       +
           rev = "refs/tags/v${version}";

     

       23
       23
       +
           hash = "sha256-7l76/Bci1ztt2CfwytLOySK6IL8IDijpB0AYhksRP7o=";

     

       24
       24
       +
         };

     

       25
       25
       +
       

     

       26
       26
       +
         postPatch = ''

     

       27
       27
       +
           substituteInPlace pyproject.toml \

     

       28
       28
       +
             --replace " --cov=sensirion_ble --cov-report=term-missing:skip-covered" ""

     

       29
       29
       +
         '';

     

       30
       30
       +
       

     

       31
       31
       +
         nativeBuildInputs = [

     

       32
       32
       +
           hatchling

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         propagatedBuildInputs = [

     

       36
       36
       +
           bluetooth-data-tools

     

       37
       37
       +
           bluetooth-sensor-state-data

     

       38
       38
       +
           home-assistant-bluetooth

     

       39
       39
       +
           sensor-state-data

     

       40
       40
       +
         ];

     

       41
       41
       +
       

     

       42
       42
       +
         pythonImportsCheck = [

     

       43
       43
       +
           "sensirion_ble"

     

       44
       44
       +
         ];

     

       45
       45
       +
       

     

       46
       46
       +
         meta = with lib; {

     

       47
       47
       +
           description = "Parser for Sensirion BLE devices";

     

       48
       48
       +
           homepage = "https://github.com/akx/sensirion-ble";

     

       49
       49
       +
           license = licenses.mit;

     

       50
       50
       +
           maintainers = with maintainers; [ fab ];

     

       51
       51
       +
         };

     

       52
       52
       +
       }

+23 -5

pkgs/development/python-modules/srptools/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchPypi, six, pytest, pytest-runner }:

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , six

     

       5
       5
       +
       , pytestCheckHook

     

       6
       6
       +
       , pythonOlder

     

       7
       7
       +
       }:

     

       2
       8
        
       

     

       3
       9
        
       buildPythonPackage rec {

     

       4
       10
        
         pname = "srptools";

     

       5
       11
        
         version = "1.0.1";

     

       12
       12
       +
         format = "setuptools";

     

       13
       13
       +
       

     

       14
       14
       +
         disabled = pythonOlder "3.7";

     

       6
       15
        
       

     

       7
       16
        
         src = fetchPypi {

     

       8
       17
        
           inherit pname version;

     

       9
       9
       -
           sha256 = "7fa4337256a1542e8f5bb4bed19e1d9aea98fe5ff9baf76693342a1dd6ac7c96";

     

       18
       18
       +
           hash = "sha256-f6QzclahVC6PW7S+0Z4dmuqY/l/5uvdmkzQqHdasfJY=";

     

       10
       19
        
         };

     

       11
       20
        
       

     

       12
       12
       -
         propagatedBuildInputs = [ six ];

     

       21
       21
       +
         propagatedBuildInputs = [

     

       22
       22
       +
           six

     

       23
       23
       +
         ];

     

       13
       24
        
       

     

       14
       14
       -
         nativeCheckInputs = [ pytest pytest-runner ];

     

       25
       25
       +
         nativeCheckInputs = [

     

       26
       26
       +
           pytestCheckHook

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       29
       29
       +
         pythonImportsCheck = [

     

       30
       30
       +
           "srptools"

     

       31
       31
       +
         ];

     

       15
       32
        
       

     

       16
       33
        
         meta = with lib; {

     

       17
       17
       -
           description = "Python-Tools to implement Secure Remote Password (SRP) authentication";

     

       34
       34
       +
           description = "Module to implement Secure Remote Password (SRP) authentication";

     

       18
       35
        
           homepage = "https://github.com/idlesign/srptools";

     

       36
       36
       +
           changelog = "https://github.com/idlesign/srptools/blob/v${version}/CHANGELOG";

     

       19
       37
        
           license = licenses.bsd3;

     

       20
       38
        
           maintainers = with maintainers; [ ];

     

       21
       39
        
         };

+23 -9

pkgs/development/python-modules/tatsu/default.nix

···

       1
       1
       -
       { lib, buildPythonPackage, fetchFromGitHub, pythonOlder

     

       2
       2
       -
       , colorama, regex

     

       3
       3
       -
       , pytest-runner, pytestCheckHook, pytest-mypy

     

       1
       1
       +
       { lib

     

       2
       2
       +
       , buildPythonPackage

     

       3
       3
       +
       , colorama

     

       4
       4
       +
       , fetchFromGitHub

     

       5
       5
       +
       , pytest-mypy

     

       6
       6
       +
       , pytestCheckHook

     

       7
       7
       +
       , pythonOlder

     

       8
       8
       +
       , regex

     

       4
       9
        
       }:

     

       5
       10
        
       

     

       6
       11
        
       buildPythonPackage rec {

     

       7
       12
        
         pname = "tatsu";

     

       8
       13
        
         version = "5.8.3";

     

       9
       9
       -
         # upstream only supports 3.10+

     

       14
       14
       +
         format = "setuptools";

     

       15
       15
       +
       

     

       10
       16
        
         disabled = pythonOlder "3.10";

     

       11
       17
        
       

     

       12
       18
        
         src = fetchFromGitHub {

     
···

       16
       22
        
           hash = "sha256-cKEMRbH/xNtYM0lmNVazv3i0Q1tmVrVPrB6F2s02Sro=";

     

       17
       23
        
         };

     

       18
       24
        
       

     

       19
       19
       -
         nativeBuildInputs = [ pytest-runner ];

     

       20
       20
       -
         propagatedBuildInputs = [ colorama regex ];

     

       21
       21
       -
         nativeCheckInputs = [ pytestCheckHook pytest-mypy ];

     

       25
       25
       +
         propagatedBuildInputs = [

     

       26
       26
       +
           colorama

     

       27
       27
       +
           regex

     

       28
       28
       +
         ];

     

       22
       29
        
       

     

       23
       23
       -
         pythonImportsCheck = [ "tatsu" ];

     

       30
       30
       +
         nativeCheckInputs = [

     

       31
       31
       +
           pytest-mypy

     

       32
       32
       +
           pytestCheckHook

     

       33
       33
       +
         ];

     

       34
       34
       +
       

     

       35
       35
       +
         pythonImportsCheck = [

     

       36
       36
       +
           "tatsu"

     

       37
       37
       +
         ];

     

       24
       38
        
       

     

       25
       39
        
         meta = with lib; {

     

       26
       40
        
           description = "Generates Python parsers from grammars in a variation of EBNF";

     
···

       30
       44
        
             Python.

     

       31
       45
        
           '';

     

       32
       46
        
           homepage = "https://tatsu.readthedocs.io/";

     

       47
       47
       +
           changelog = "https://github.com/neogeny/TatSu/releases/tag/v${version}";

     

       33
       48
        
           license = licenses.bsd2;

     

       34
       49
        
           maintainers = with maintainers; [ ];

     

       35
       50
        
         };

     

       36
       36
       -
       

     

       37
       51
        
       }

+222

pkgs/games/shipwright/default.nix

···

       1
       1
       +
       { stdenv

     

       2
       2
       +
       , cmake

     

       3
       3
       +
       , lsb-release

     

       4
       4
       +
       , ninja

     

       5
       5
       +
       , lib

     

       6
       6
       +
       , fetchFromGitHub

     

       7
       7
       +
       , fetchurl

     

       8
       8
       +
       , makeDesktopItem

     

       9
       9
       +
       , python3

     

       10
       10
       +
       , libX11

     

       11
       11
       +
       , libXrandr

     

       12
       12
       +
       , libXinerama

     

       13
       13
       +
       , libXcursor

     

       14
       14
       +
       , libXi

     

       15
       15
       +
       , libXext

     

       16
       16
       +
       , glew

     

       17
       17
       +
       , boost

     

       18
       18
       +
       , SDL2

     

       19
       19
       +
       , SDL2_net

     

       20
       20
       +
       , pkg-config

     

       21
       21
       +
       , libpulseaudio

     

       22
       22
       +
       , libpng

     

       23
       23
       +
       , imagemagick

     

       24
       24
       +
       , requireFile

     

       25
       25
       +
       

     

       26
       26
       +
       , oot ? rec {

     

       27
       27
       +
           enable = true;

     

       28
       28
       +
           variant = "debug";

     

       29
       29
       +
       

     

       30
       30
       +
           rom = requireFile {

     

       31
       31
       +
             name = "oot-${variant}.z64";

     

       32
       32
       +
             message = ''

     

       33
       33
       +
               This nix expression requires that oot-${variant}.z64 is already part of the store.

     

       34
       34
       +
               To get this file you can dump your Ocarina of Time's cartridge to a file,

     

       35
       35
       +
               and add it to the nix store with nix-store --add-fixed sha1 <FILE>, or override the package:

     

       36
       36
       +
                 shipwright.override { oot = { enable = true; variant = "debug"; rom = path/to/oot-debug-mq.z64; } }

     

       37
       37
       +
       

     

       38
       38
       +
               The supported variants are:

     

       39
       39
       +
                - debug: Ocarina of Time Debug PAL GC (not Master Quest)

     

       40
       40
       +
                - pal-gc: Ocarina of Time PAL GameCube (may lead to crashes and instability)

     

       41
       41
       +
       

     

       42
       42
       +
               This is optional if you have imported an Ocarina of Time Master Quest ROM.

     

       43
       43
       +
               If so, please set oot.enable to false and ootMq.enable to true.

     

       44
       44
       +
               If both are enabled, Ship of Harkinian will be built with both ROMs.

     

       45
       45
       +
             '';

     

       46
       46
       +
       

     

       47
       47
       +
             # From upstream: https://github.com/HarbourMasters/Shipwright/blob/e46c60a7a1396374e23f7a1f7122ddf9efcadff7/README.md#1-check-your-sha1

     

       48
       48
       +
             sha1 = {

     

       49
       49
       +
               debug = "cee6bc3c2a634b41728f2af8da54d9bf8cc14099";

     

       50
       50
       +
               pal-gc = "0227d7c0074f2d0ac935631990da8ec5914597b4";

     

       51
       51
       +
             }.${variant} or (throw "Unsupported romVariant ${variant}. Valid options are 'debug' and 'pal-gc'.");

     

       52
       52
       +
           };

     

       53
       53
       +
         }

     

       54
       54
       +
       

     

       55
       55
       +
       , ootMq ? rec {

     

       56
       56
       +
           enable = false;

     

       57
       57
       +
           variant = "debug-mq";

     

       58
       58
       +
       

     

       59
       59
       +
           rom = requireFile {

     

       60
       60
       +
             name = "oot-${variant}.z64";

     

       61
       61
       +
             message = ''

     

       62
       62
       +
               This nix expression requires that oot-${variant}.z64 is already part of the store.

     

       63
       63
       +
               To get this file you can dump your Ocarina of Time Master Quest's cartridge to a file,

     

       64
       64
       +
               and add it to the nix store with nix-store --add-fixed sha1 <FILE>, or override the package:

     

       65
       65
       +
                 shipwright.override { ootMq = { enable = true; variant = "debug-mq"; rom = path/to/oot-debug-mq.z64; } }

     

       66
       66
       +
       

     

       67
       67
       +
               The supported variants are:

     

       68
       68
       +
                - debug-mq: Ocarina of Time Debug PAL GC MQ (Dungeons will be Master Quest)

     

       69
       69
       +
                - debug-mq-alt: Alternate ROM, not produced by decompilation.

     

       70
       70
       +
       

     

       71
       71
       +
               This is optional if you have imported an Ocarina of Time ROM.

     

       72
       72
       +
               If so, please set oot.enable to true and ootMq.enable to false.

     

       73
       73
       +
               If both are enabled, Ship of Harkinian will be built with both ROMs.

     

       74
       74
       +
             '';

     

       75
       75
       +
       

     

       76
       76
       +
             # From upstream: https://github.com/HarbourMasters/Shipwright/blob/e46c60a7a1396374e23f7a1f7122ddf9efcadff7/README.md#1-check-your-sha1

     

       77
       77
       +
             sha1 = {

     

       78
       78
       +
               debug-mq = "079b855b943d6ad8bd1eb026c0ed169ecbdac7da";

     

       79
       79
       +
               debug-mq-alt = "50bebedad9e0f10746a52b07239e47fa6c284d03";

     

       80
       80
       +
             }.${variant} or (throw "Unsupported mqRomVariant ${variant}. Valid options are 'debug-mq' and 'debug-mq-alt'.");

     

       81
       81
       +
           };

     

       82
       82
       +
         }

     

       83
       83
       +
       }:

     

       84
       84
       +
       

     

       85
       85
       +
       let

     

       86
       86
       +
         checkAttrs = attrs:

     

       87
       87
       +
           let

     

       88
       88
       +
             validAttrs = [ "enable" "rom" "variant" ];

     

       89
       89
       +
           in

     

       90
       90
       +
           lib.all (name: lib.elem name validAttrs) (lib.attrNames attrs);

     

       91
       91
       +
       in

     

       92
       92
       +
       assert (lib.assertMsg (checkAttrs oot) "oot must have the attributes 'enable' and 'rom', and none other");

     

       93
       93
       +
       assert (lib.assertMsg (checkAttrs ootMq) "ootMq must have the attributes 'enable' and 'rom', and none other");

     

       94
       94
       +
       assert (lib.assertMsg (oot.enable || ootMq.enable) "At least one of 'oot.enable' and 'ootMq.enable' must be true");

     

       95
       95
       +
       

     

       96
       96
       +
       stdenv.mkDerivation rec {

     

       97
       97
       +
         pname = "shipwright";

     

       98
       98
       +
         version = "7.0.2";

     

       99
       99
       +
       

     

       100
       100
       +
         src = fetchFromGitHub {

     

       101
       101
       +
           owner = "harbourmasters";

     

       102
       102
       +
           repo = "shipwright";

     

       103
       103
       +
           rev = version;

     

       104
       104
       +
           hash = "sha256-2VCcczGWSvp6hk8FTA1/T1E1KkrrvWyOdkEw8eiYYnY=";

     

       105
       105
       +
           fetchSubmodules = true;

     

       106
       106
       +
         };

     

       107
       107
       +
       

     

       108
       108
       +
         # This would get fetched at build time otherwise, see:

     

       109
       109
       +
         # https://github.com/HarbourMasters/Shipwright/blob/e46c60a7a1396374e23f7a1f7122ddf9efcadff7/soh/CMakeLists.txt#L736

     

       110
       110
       +
         gamecontrollerdb = fetchurl {

     

       111
       111
       +
           name = "gamecontrollerdb.txt";

     

       112
       112
       +
           url = "https://raw.githubusercontent.com/gabomdq/SDL_GameControllerDB/c5b4df0e1061175cb11e3ebbf8045178339864a5/gamecontrollerdb.txt";

     

       113
       113
       +
           hash = "sha256-2VFCsaalXoe+JYWCH6IbgjnLXNKxe0UqSyJNGZMn5Ko=";

     

       114
       114
       +
         };

     

       115
       115
       +
       

     

       116
       116
       +
         nativeBuildInputs = [

     

       117
       117
       +
           cmake

     

       118
       118
       +
           ninja

     

       119
       119
       +
           pkg-config

     

       120
       120
       +
           lsb-release

     

       121
       121
       +
           python3

     

       122
       122
       +
           imagemagick

     

       123
       123
       +
         ];

     

       124
       124
       +
       

     

       125
       125
       +
         buildInputs = [

     

       126
       126
       +
           boost

     

       127
       127
       +
           libX11

     

       128
       128
       +
           libXrandr

     

       129
       129
       +
           libXinerama

     

       130
       130
       +
           libXcursor

     

       131
       131
       +
           libXi

     

       132
       132
       +
           libXext

     

       133
       133
       +
           glew

     

       134
       134
       +
           SDL2

     

       135
       135
       +
           SDL2_net

     

       136
       136
       +
           libpulseaudio

     

       137
       137
       +
           libpng

     

       138
       138
       +
         ];

     

       139
       139
       +
       

     

       140
       140
       +
         patches = [

     

       141
       141
       +
           # These patches make soh look inside the nix store for data files (the controller database and the OTRs)

     

       142
       142
       +
           ./lus-install-paths.patch

     

       143
       143
       +
           ./soh-misc-otr-patches.patch

     

       144
       144
       +
         ];

     

       145
       145
       +
       

     

       146
       146
       +
         cmakeFlags = [

     

       147
       147
       +
           "-DCMAKE_INSTALL_PREFIX=${placeholder "out"}/lib"

     

       148
       148
       +
         ];

     

       149
       149
       +
       

     

       150
       150
       +
         dontAddPrefix = true;

     

       151
       151
       +
       

     

       152
       152
       +
         # Linking fails without this

     

       153
       153
       +
         hardeningDisable = [ "format" ];

     

       154
       154
       +
       

     

       155
       155
       +
         postBuild = ''

     

       156
       156
       +
           cp ${gamecontrollerdb} ${gamecontrollerdb.name}

     

       157
       157
       +
       

     

       158
       158
       +
           pushd ../OTRExporter

     

       159
       159
       +
           ${lib.optionalString oot.enable "python3 ./extract_assets.py -z ../build/ZAPD/ZAPD.out ${oot.rom}"}

     

       160
       160
       +
           ${lib.optionalString ootMq.enable "python3 ./extract_assets.py -z ../build/ZAPD/ZAPD.out ${ootMq.rom}"}

     

       161
       161
       +
           popd

     

       162
       162
       +
         '';

     

       163
       163
       +
       

     

       164
       164
       +
         preInstall = ''

     

       165
       165
       +
           # Cmake likes it here for its install paths

     

       166
       166
       +
           cp ../OTRExporter/soh.otr ..

     

       167
       167
       +
         '';

     

       168
       168
       +
       

     

       169
       169
       +
         postInstall = ''

     

       170
       170
       +
           mkdir -p $out/bin

     

       171
       171
       +
       

     

       172
       172
       +
           # Copy the extracted assets, required to be in the same directory as the executable

     

       173
       173
       +
           ${lib.optionalString oot.enable "cp ../OTRExporter/oot.otr $out/lib"}

     

       174
       174
       +
           ${lib.optionalString ootMq.enable "cp ../OTRExporter/oot-mq.otr $out/lib"}

     

       175
       175
       +
       

     

       176
       176
       +
           ln -s $out/lib/soh.elf $out/bin/soh

     

       177
       177
       +
         '';

     

       178
       178
       +
       

     

       179
       179
       +
         desktopItems = [

     

       180
       180
       +
           (makeDesktopItem {

     

       181
       181
       +
             name = "soh";

     

       182
       182
       +
             icon = "soh";

     

       183
       183
       +
             exec = "soh";

     

       184
       184
       +
             genericName = "Ship of Harkinian";

     

       185
       185
       +
             desktopName = "soh";

     

       186
       186
       +
             categories = [ "Game" ];

     

       187
       187
       +
           })

     

       188
       188
       +
         ];

     

       189
       189
       +
       

     

       190
       190
       +
         meta = with lib; {

     

       191
       191
       +
           homepage = "https://github.com/HarbourMasters/Shipwright";

     

       192
       192
       +
           description = "A PC port of Ocarina of Time with modern controls, widescreen, high-resolution, and more";

     

       193
       193
       +
           longDescription = ''

     

       194
       194
       +
             An PC port of Ocarina of Time with modern controls, widescreen, high-resolution and more, based off of decompilation.

     

       195
       195
       +
             Note that you must supply an OoT rom yourself to use this package because propietary assets are extracted from it.

     

       196
       196
       +
       

     

       197
       197
       +
             You can change the game variant like this:

     

       198
       198
       +
               shipwright.override { oot.enable = false; ootMq.enable = true }

     

       199
       199
       +
       

     

       200
       200
       +
             The default ROM variants for Oot and OotMq are debug and debug-mq respectively.

     

       201
       201
       +
             If you have a pal-gc rom, you should override like this:

     

       202
       202
       +
               shipwright.override { oot = { enable = true; variant = "pal-gc"; rom = path/to/oot-pal-gc.z64; } }

     

       203
       203
       +
       

     

       204
       204
       +
             The supported Oot variants are:

     

       205
       205
       +
              - debug: Ocarina of Time Debug PAL GC (not Master Quest)

     

       206
       206
       +
              - pal-gc: Ocarina of Time PAL GameCube (may lead to crashes and instability)

     

       207
       207
       +
       

     

       208
       208
       +
             The supported OotMq variants are:

     

       209
       209
       +
              - debug-mq: Ocarina of Time Debug PAL GC MQ (Dungeons will be Master Quest)

     

       210
       210
       +
              - debug-mq-alt: Alternate ROM, not produced by decompilation.

     

       211
       211
       +
           '';

     

       212
       212
       +
           mainProgram = "soh";

     

       213
       213
       +
           platforms = [ "x86_64-linux" ];

     

       214
       214
       +
           maintainers = with maintainers; [ ivar j0lol ];

     

       215
       215
       +
           license = with licenses; [

     

       216
       216
       +
             # OTRExporter, OTRGui, ZAPDTR, libultraship

     

       217
       217
       +
             mit

     

       218
       218
       +
             # Ship of Harkinian itself

     

       219
       219
       +
             unfree

     

       220
       220
       +
           ];

     

       221
       221
       +
         };

     

       222
       222
       +
       }

+146

pkgs/games/shipwright/lus-install-paths.patch

···

       1
       1
       +
       Submodule libultraship contains modified content

     

       2
       2
       +
       diff --git a/libultraship/src/CMakeLists.txt b/libultraship/src/CMakeLists.txt

     

       3
       3
       +
       index f95c3c9..5b967b9 100644

     

       4
       4
       +
       --- a/libultraship/src/CMakeLists.txt

     

       5
       5
       +
       +++ b/libultraship/src/CMakeLists.txt

     

       6
       6
       +
       @@ -74,7 +74,10 @@ target_sources(libultraship PRIVATE ${Source_Files__Controller})

     

       7
       7
       +
        

     

       8
       8
       +
        #=================== Core ===================

     

       9
       9
       +
        

     

       10
       10
       +
       +configure_file( ${CMAKE_CURRENT_SOURCE_DIR}/install_config.h.in ${CMAKE_BINARY_DIR}/install_config.h @ONLY)

     

       11
       11
       +
       +

     

       12
       12
       +
        set(Source_Files__Core

     

       13
       13
       +
       +    ${CMAKE_BINARY_DIR}/install_config.h

     

       14
       14
       +
            ${CMAKE_CURRENT_SOURCE_DIR}/core/Window.h

     

       15
       15
       +
            ${CMAKE_CURRENT_SOURCE_DIR}/core/Window.cpp

     

       16
       16
       +
            ${CMAKE_CURRENT_SOURCE_DIR}/core/ConsoleVariable.h

     

       17
       17
       +
       @@ -329,7 +332,7 @@ endif()

     

       18
       18
       +
        #=================== Packages & Includes ===================

     

       19
       19
       +
        

     

       20
       20
       +
        target_include_directories(libultraship

     

       21
       21
       +
       -    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../extern

     

       22
       22
       +
       +    PRIVATE ${CMAKE_CURRENT_SOURCE_DIR}/../extern ${CMAKE_BINARY_DIR}

     

       23
       23
       +
            PUBLIC ${CMAKE_CURRENT_SOURCE_DIR} ${INCLUDE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/../extern/spdlog/include ${CMAKE_CURRENT_SOURCE_DIR}/../extern/stb

     

       24
       24
       +
        )

     

       25
       25
       +
        

     

       26
       26
       +
       diff --git a/libultraship/src/core/Context.cpp b/libultraship/src/core/Context.cpp

     

       27
       27
       +
       index 776333e..fa546e6 100644

     

       28
       28
       +
       --- a/libultraship/src/core/Context.cpp

     

       29
       29
       +
       +++ b/libultraship/src/core/Context.cpp

     

       30
       30
       +
       @@ -14,6 +14,7 @@

     

       31
       31
       +
        #elif defined(__WIIU__)

     

       32
       32
       +
        #include "port/wiiu/WiiUImpl.h"

     

       33
       33
       +
        #endif

     

       34
       34
       +
       +#include "install_config.h"

     

       35
       35
       +
        

     

       36
       36
       +
        namespace LUS {

     

       37
       37
       +
        std::weak_ptr<Context> Context::mContext;

     

       38
       38
       +
       @@ -281,6 +282,18 @@ std::string Context::GetShortName() {

     

       39
       39
       +
        }

     

       40
       40
       +
        

     

       41
       41
       +
        std::string Context::GetAppBundlePath() {

     

       42
       42
       +
       +#ifdef CMAKE_INSTALL_PREFIX

     

       43
       43
       +
       +    static const std::string fpath = CMAKE_INSTALL_PREFIX;

     

       44
       44
       +
       +    static int exists = -1;

     

       45
       45
       +
       +

     

       46
       46
       +
       +    if (exists == -1) {

     

       47
       47
       +
       +        exists = fpath.size() > 0 && std::filesystem::is_directory(fpath);

     

       48
       48
       +
       +    }

     

       49
       49
       +
       +

     

       50
       50
       +
       +    if (exists) {

     

       51
       51
       +
       +        return fpath;

     

       52
       52
       +
       +    }

     

       53
       53
       +
       +#else

     

       54
       54
       +
        #ifdef __APPLE__

     

       55
       55
       +
            FolderManager folderManager;

     

       56
       56
       +
            return folderManager.getMainBundlePath();

     

       57
       57
       +
       @@ -291,6 +304,7 @@ std::string Context::GetAppBundlePath() {

     

       58
       58
       +
            if (fpath != NULL) {

     

       59
       59
       +
                return std::string(fpath);

     

       60
       60
       +
            }

     

       61
       61
       +
       +#endif

     

       62
       62
       +
        #endif

     

       63
       63
       +
        

     

       64
       64
       +
            return ".";

     

       65
       65
       +
       @@ -304,6 +318,13 @@ std::string Context::GetAppDirectoryPath() {

     

       66
       66
       +
            }

     

       67
       67
       +
        #endif

     

       68
       68
       +
        

     

       69
       69
       +
       +    char *prefpath = SDL_GetPrefPath(NULL, "soh");

     

       70
       70
       +
       +    if (prefpath != NULL) {

     

       71
       71
       +
       +        std::string ret(prefpath);

     

       72
       72
       +
       +        SDL_free(prefpath);

     

       73
       73
       +
       +        return ret;

     

       74
       74
       +
       +    }

     

       75
       75
       +
       +

     

       76
       76
       +
            return ".";

     

       77
       77
       +
        }

     

       78
       78
       +
        

     

       79
       79
       +
       @@ -315,7 +336,24 @@ std::string Context::GetPathRelativeToAppDirectory(const char* path) {

     

       80
       80
       +
            return GetAppDirectoryPath() + "/" + path;

     

       81
       81
       +
        }

     

       82
       82
       +
        

     

       83
       83
       +
       +std::string Context::FindFileFromAllAppDirectories(const char* path) {

     

       84
       84
       +
       +    std::string fpath;

     

       85
       85
       +
       +

     

       86
       86
       +
       +    // app configuration dir (eg. ~/.local/share)

     

       87
       87
       +
       +    fpath = GetPathRelativeToAppDirectory(path);

     

       88
       88
       +
       +    if (std::filesystem::exists(fpath)) {

     

       89
       89
       +
       +        return fpath;

     

       90
       90
       +
       +    }

     

       91
       91
       +
       +    // app install dir (eg. /usr/)

     

       92
       92
       +
       +    fpath = GetPathRelativeToAppBundle(path);

     

       93
       93
       +
       +    if (std::filesystem::exists(fpath)) {

     

       94
       94
       +
       +        return fpath;

     

       95
       95
       +
       +    }

     

       96
       96
       +
       +    // current dir

     

       97
       97
       +
       +    return "./" + std::string(path);

     

       98
       98
       +
       +}

     

       99
       99
       +
       +

     

       100
       100
       +
        bool Context::DoesOtrFileExist() {

     

       101
       101
       +
            return mOtrFileExists;

     

       102
       102
       +
        }

     

       103
       103
       +
       -} // namespace LUS

     

       104
       104
       +
       \ No newline at end of file

     

       105
       105
       +
       +} // namespace LUS

     

       106
       106
       +
       diff --git a/libultraship/src/core/Context.h b/libultraship/src/core/Context.h

     

       107
       107
       +
       index c32f4dd..a9f1639 100644

     

       108
       108
       +
       --- a/libultraship/src/core/Context.h

     

       109
       109
       +
       +++ b/libultraship/src/core/Context.h

     

       110
       110
       +
       @@ -26,6 +26,7 @@ class Context {

     

       111
       111
       +
            static std::string GetAppDirectoryPath();

     

       112
       112
       +
            static std::string GetPathRelativeToAppDirectory(const char* path);

     

       113
       113
       +
            static std::string GetPathRelativeToAppBundle(const char* path);

     

       114
       114
       +
       +    static std::string FindFileFromAllAppDirectories(const char* path);

     

       115
       115
       +
        

     

       116
       116
       +
            Context(std::string name, std::string shortName);

     

       117
       117
       +
        

     

       118
       118
       +
       diff --git a/libultraship/src/core/libultra/os.cpp b/libultraship/src/core/libultra/os.cpp

     

       119
       119
       +
       index 9058fe1..7d9387e 100644

     

       120
       120
       +
       --- a/libultraship/src/core/libultra/os.cpp

     

       121
       121
       +
       +++ b/libultraship/src/core/libultra/os.cpp

     

       122
       122
       +
       @@ -21,8 +21,8 @@ int32_t osContInit(OSMesgQueue* mq, uint8_t* controllerBits, OSContStatus* statu

     

       123
       123
       +
            }

     

       124
       124
       +
        

     

       125
       125
       +
        #ifndef __SWITCH__

     

       126
       126
       +
       -    const char* controllerDb = "gamecontrollerdb.txt";

     

       127
       127
       +
       -    int mappingsAdded = SDL_GameControllerAddMappingsFromFile(controllerDb);

     

       128
       128
       +
       +    std::string controllerDb = LUS::Context::GetPathRelativeToAppBundle("gamecontrollerdb.txt");

     

       129
       129
       +
       +    int mappingsAdded = SDL_GameControllerAddMappingsFromFile(controllerDb.c_str());

     

       130
       130
       +
            if (mappingsAdded >= 0) {

     

       131
       131
       +
                SPDLOG_INFO("Added SDL game controllers from \"{}\" ({})", controllerDb, mappingsAdded);

     

       132
       132
       +
            } else {

     

       133
       133
       +
       @@ -90,4 +90,4 @@ int32_t osRecvMesg(OSMesgQueue* mq, OSMesg* msg, int32_t flag) {

     

       134
       134
       +
            mq->validCount--;

     

       135
       135
       +
            return 0;

     

       136
       136
       +
        }

     

       137
       137
       +
       -}

     

       138
       138
       +
       \ No newline at end of file

     

       139
       139
       +
       +}

     

       140
       140
       +
       diff --git a/libultraship/src/install_config.h.in b/libultraship/src/install_config.h.in

     

       141
       141
       +
       new file mode 100644

     

       142
       142
       +
       index 0000000..029753c

     

       143
       143
       +
       --- /dev/null

     

       144
       144
       +
       +++ b/libultraship/src/install_config.h.in

     

       145
       145
       +
       @@ -0,0 +1 @@

     

       146
       146
       +
       +#cmakedefine CMAKE_INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"

+119

pkgs/games/shipwright/soh-misc-otr-patches.patch

···

       1
       1
       +
       diff --git a/soh/soh/Extractor/Extract.cpp b/soh/soh/Extractor/Extract.cpp

     

       2
       2
       +
       index a9ddc4f4..f6d45fe2 100644

     

       3
       3
       +
       --- a/soh/soh/Extractor/Extract.cpp

     

       4
       4
       +
       +++ b/soh/soh/Extractor/Extract.cpp

     

       5
       5
       +
       @@ -490,28 +490,27 @@ const char* Extractor::GetZapdVerStr() const {

     

       6
       6
       +
        

     

       7
       7
       +
        extern "C" int zapd_main(int argc, char** argv);

     

       8
       8
       +
        

     

       9
       9
       +
       -bool Extractor::CallZapd() {

     

       10
       10
       +
       +bool Extractor::CallZapd(std::string &assetPath) {

     

       11
       11
       +
            constexpr int argc = 16;

     

       12
       12
       +
       -    char xmlPath[100];

     

       13
       13
       +
       -    char confPath[100];

     

       14
       14
       +
            std::array<const char*, argc> argv;

     

       15
       15
       +
            const char* version = GetZapdVerStr();

     

       16
       16
       +
        

     

       17
       17
       +
       -    snprintf(xmlPath, 100, "assets/extractor/xmls/%s", version);

     

       18
       18
       +
       -    snprintf(confPath, 100, "assets/extractor/Config_%s.xml", version);

     

       19
       19
       +
       +    std::string xmlPath = assetPath + "/assets/extractor/xmls/" + version;

     

       20
       20
       +
       +    std::string confPath = assetPath + "/assets/extractor/Config_" + version + ".xml";

     

       21
       21
       +
       +    std::string fileListsPath = assetPath + "/assets/extractor/filelists";

     

       22
       22
       +
        

     

       23
       23
       +
            argv[0] = "ZAPD";

     

       24
       24
       +
            argv[1] = "ed";

     

       25
       25
       +
            argv[2] = "-i";

     

       26
       26
       +
       -    argv[3] = xmlPath;

     

       27
       27
       +
       +    argv[3] = xmlPath.c_str();

     

       28
       28
       +
            argv[4] = "-b";

     

       29
       29
       +
            argv[5] = mCurrentRomPath.c_str();

     

       30
       30
       +
            argv[6] = "-fl";

     

       31
       31
       +
       -    argv[7] = "assets/extractor/filelists";

     

       32
       32
       +
       +    argv[7] = fileListsPath.c_str();

     

       33
       33
       +
            argv[8] = "-gsf";

     

       34
       34
       +
       -    argv[9] = "1";

     

       35
       35
       +
       +    argv[9] = "0";

     

       36
       36
       +
            argv[10] = "-rconf";

     

       37
       37
       +
       -    argv[11] = confPath;

     

       38
       38
       +
       +    argv[11] = confPath.c_str();

     

       39
       39
       +
            argv[12] = "-se";

     

       40
       40
       +
            argv[13] = "OTR";

     

       41
       41
       +
            argv[14] = "--otrfile";

     

       42
       42
       +
       diff --git a/soh/soh/Extractor/Extract.h b/soh/soh/Extractor/Extract.h

     

       43
       43
       +
       index e4eb2e5b..3c95b025 100644

     

       44
       44
       +
       --- a/soh/soh/Extractor/Extract.h

     

       45
       45
       +
       +++ b/soh/soh/Extractor/Extract.h

     

       46
       46
       +
       @@ -57,7 +57,7 @@ class Extractor {

     

       47
       47
       +
            bool IsMasterQuest() const;

     

       48
       48
       +
        

     

       49
       49
       +
            bool Run(RomSearchMode searchMode = RomSearchMode::Both);

     

       50
       50
       +
       -    bool CallZapd();

     

       51
       51
       +
       +    bool CallZapd(std::string& assetPath);

     

       52
       52
       +
            const char* GetZapdStr();

     

       53
       53
       +
        };

     

       54
       54
       +
        #endif

     

       55
       55
       +
       diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp

     

       56
       56
       +
       index d192de6a..cc516085 100644

     

       57
       57
       +
       --- a/soh/soh/OTRGlobals.cpp

     

       58
       58
       +
       +++ b/soh/soh/OTRGlobals.cpp

     

       59
       59
       +
       @@ -201,11 +201,11 @@ const char* constCameraStrings[] = {

     

       60
       60
       +
        

     

       61
       61
       +
        OTRGlobals::OTRGlobals() {

     

       62
       62
       +
            std::vector<std::string> OTRFiles;

     

       63
       63
       +
       -    std::string mqPath = LUS::Context::GetPathRelativeToAppDirectory("oot-mq.otr");

     

       64
       64
       +
       +    std::string mqPath = LUS::Context::FindFileFromAllAppDirectories("oot-mq.otr");

     

       65
       65
       +
            if (std::filesystem::exists(mqPath)) { 

     

       66
       66
       +
                OTRFiles.push_back(mqPath);

     

       67
       67
       +
            } 

     

       68
       68
       +
       -    std::string ootPath = LUS::Context::GetPathRelativeToAppDirectory("oot.otr");

     

       69
       69
       +
       +    std::string ootPath = LUS::Context::FindFileFromAllAppDirectories("oot.otr");

     

       70
       70
       +
            if (std::filesystem::exists(ootPath)) {

     

       71
       71
       +
                OTRFiles.push_back(ootPath);

     

       72
       72
       +
            }

     

       73
       73
       +
       @@ -213,7 +213,7 @@ OTRGlobals::OTRGlobals() {

     

       74
       74
       +
            if (std::filesystem::exists(sohOtrPath)) {

     

       75
       75
       +
                OTRFiles.push_back(sohOtrPath);

     

       76
       76
       +
            }

     

       77
       77
       +
       -    std::string patchesPath = LUS::Context::GetPathRelativeToAppDirectory("mods");

     

       78
       78
       +
       +    std::string patchesPath = LUS::Context::FindFileFromAllAppDirectories("mods");

     

       79
       79
       +
            if (patchesPath.length() > 0 && std::filesystem::exists(patchesPath)) {

     

       80
       80
       +
                if (std::filesystem::is_directory(patchesPath)) {

     

       81
       81
       +
                    for (const auto& p : std::filesystem::recursive_directory_iterator(patchesPath)) {

     

       82
       82
       +
       @@ -709,8 +709,10 @@ extern "C" void OTRExtScanner() {

     

       83
       83
       +
        

     

       84
       84
       +
        extern "C" void InitOTR() {

     

       85
       85
       +
        #if not defined (__SWITCH__) && not defined(__WIIU__)

     

       86
       86
       +
       -    if (!std::filesystem::exists(LUS::Context::GetPathRelativeToAppDirectory("oot-mq.otr")) &&

     

       87
       87
       +
       -        !std::filesystem::exists(LUS::Context::GetPathRelativeToAppDirectory("oot.otr"))){

     

       88
       88
       +
       +    if (!std::filesystem::exists(LUS::Context::FindFileFromAllAppDirectories("oot-mq.otr")) &&

     

       89
       89
       +
       +        !std::filesystem::exists(LUS::Context::FindFileFromAllAppDirectories("oot.otr"))){

     

       90
       90
       +
       +        std::string exporterAssetPath = LUS::Context::GetAppBundlePath();

     

       91
       91
       +
       +

     

       92
       92
       +
                bool generatedOtrIsMQ = false;

     

       93
       93
       +
                if (Extractor::ShowYesNoBox("No OTR Files", "No OTR files found. Generate one now?") == IDYES) {

     

       94
       94
       +
                    Extractor extract;

     

       95
       95
       +
       @@ -718,7 +720,7 @@ extern "C" void InitOTR() {

     

       96
       96
       +
                        Extractor::ShowErrorBox("Error", "An error occured, no OTR file was generated. Exiting...");

     

       97
       97
       +
                        exit(1);

     

       98
       98
       +
                    }

     

       99
       99
       +
       -            extract.CallZapd();

     

       100
       100
       +
       +            extract.CallZapd(exporterAssetPath);

     

       101
       101
       +
                    generatedOtrIsMQ = extract.IsMasterQuest();

     

       102
       102
       +
                } else {

     

       103
       103
       +
                    exit(1);

     

       104
       104
       +
       @@ -728,7 +730,7 @@ extern "C" void InitOTR() {

     

       105
       105
       +
                    if (!extract.Run(generatedOtrIsMQ ? RomSearchMode::Vanilla : RomSearchMode::MQ)) {

     

       106
       106
       +
                        Extractor::ShowErrorBox("Error", "An error occured, an OTR file may have been generated by a different step. Continuing...");

     

       107
       107
       +
                    } else {

     

       108
       108
       +
       -                extract.CallZapd();

     

       109
       109
       +
       +                extract.CallZapd(exporterAssetPath);

     

       110
       110
       +
                    }

     

       111
       111
       +
                }

     

       112
       112
       +
            }

     

       113
       113
       +
       @@ -2018,4 +2020,4 @@ extern "C" void Gfx_RegisterBlendedTexture(const char* name, u8* mask, u8* repla

     

       114
       114
       +
        

     

       115
       115
       +
        extern "C" void SaveManager_ThreadPoolWait() {

     

       116
       116
       +
            SaveManager::Instance->ThreadPoolWait();

     

       117
       117
       +
       -}

     

       118
       118
       +
       \ No newline at end of file

     

       119
       119
       +
       +}

+5 -5

pkgs/misc/urbit/default.nix

···

       10
       10
        
       in

     

       11
       11
        
       stdenv.mkDerivation rec {

     

       12
       12
        
         pname = "urbit";

     

       13
       13
       -
         version = "2.8";

     

       13
       13
       +
         version = "2.9";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchzip {

     

       16
       16
        
           url = "https://github.com/urbit/vere/releases/download/vere-v${version}/${platform}.tgz";

     

       17
       17
        
           sha256 = {

     

       18
       18
       -
             x86_64-linux = "sha256-reU8i7++VdAiuH36AyfhZhAJPnE4t0nBnYvWoglrKwA=";

     

       19
       19
       -
             aarch64-linux = "sha256-l3190BUIeJVbQI1tfP8W6WHw6WyfoYpI8rnjbgevznk=";

     

       20
       20
       -
             x86_64-darwin = "sha256-tsBuIcbWiK1oyu9UzHfwJe/nsVrLWXzoX/eIHyg4uaU=";

     

       21
       21
       -
             aarch64-darwin = "sha256-f+C5DB+IeN6ZcZ4oES4dc3LQ4pwDDszffu/U/KFwqmg=";

     

       18
       18
       +
             x86_64-linux = "sha256-CX3KoB5NNZBfikARh0ikeKQocaGIhbWcZsTFWOFk5oI=";

     

       19
       19
       +
             aarch64-linux = "sha256-PHVh4ktUe2HIPyudiwEUNuAfwOu4yCI9lxgbjrIllSU=";

     

       20
       20
       +
             x86_64-darwin = "sha256-lACh1UYtGrZUw+dtR0Ye6zqdtgp7llV9EkUoGOi+V4c=";

     

       21
       21
       +
             aarch64-darwin = "sha256-IRVMIriFVEsv69yUCxsiUaEgIlc618tf9dHiz76D+ug=";

     

       22
       22
        
           }.${stdenv.hostPlatform.system} or (throw "unsupported system ${stdenv.hostPlatform.system}");

     

       23
       23
        
         };

     

       24
       24

+3 -1

pkgs/servers/home-assistant/component-packages.nix

···

       3500
       3500
        
             psutil-home-assistant

     

       3501
       3501
        
             pyserial

     

       3502
       3502
        
             pyudev

     

       3503
       3503
       +
             sensirion-ble

     

       3503
       3504
        
             sqlalchemy

     

       3504
       3505
        
             webrtcvad

     

       3505
       3506
        
             zeroconf

     

       3506
       3506
       -
           ]; # missing inputs: sensirion-ble

     

       3507
       3507
       +
           ];

     

       3507
       3508
        
           "sensor" = ps: with ps; [

     

       3508
       3509
        
             fnv-hash-fast

     

       3509
       3510
        
             psutil-home-assistant

     
···

       5280
       5281
        
           "sense"

     

       5281
       5282
        
           "senseme"

     

       5282
       5283
        
           "sensibo"

     

       5284
       5284
       +
           "sensirion_ble"

     

       5283
       5285
        
           "sensor"

     

       5284
       5286
        
           "sensorpro"

     

       5285
       5287
        
           "sensorpush"

+3 -3

pkgs/servers/matrix-synapse/default.nix

···

       12
       12
        
       with python3.pkgs;

     

       13
       13
        
       buildPythonApplication rec {

     

       14
       14
        
         pname = "matrix-synapse";

     

       15
       15
       -
         version = "1.85.1";

     

       15
       15
       +
         version = "1.85.2";

     

       16
       16
        
         format = "pyproject";

     

       17
       17
        
       

     

       18
       18
        
         src = fetchFromGitHub {

     

       19
       19
        
           owner = "matrix-org";

     

       20
       20
        
           repo = "synapse";

     

       21
       21
        
           rev = "v${version}";

     

       22
       22
       -
           hash = "sha256-I/InjuTJOwYXw98qW7zT+fTnyLUo96xsVkFGSL+x+5k=";

     

       22
       22
       +
           hash = "sha256-pFafBsisBPfpDnFYWcimUuBgfFVPZzLna3yHeqIBAAE=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         cargoDeps = rustPlatform.fetchCargoTarball {

     

       26
       26
        
           inherit src;

     

       27
       27
        
           name = "${pname}-${version}";

     

       28
       28
       -
           hash = "sha256-KE56crjZDM1cJnVS7MvObIQ7NvH7+fUm1Mlb6HcT9+U=";

     

       28
       28
       +
           hash = "sha256-dnno+5Ma0YNYpmj3oZ5UG22uAanKwVT67BwQW+mHoFc=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         postPatch = ''

+3 -3

pkgs/tools/admin/trivy/default.nix

···

       5
       5
        
       

     

       6
       6
        
       buildGoModule rec {

     

       7
       7
        
         pname = "trivy";

     

       8
       8
       -
         version = "0.42.0";

     

       8
       8
       +
         version = "0.42.1";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           owner = "aquasecurity";

     

       12
       12
        
           repo = pname;

     

       13
       13
        
           rev = "v${version}";

     

       14
       14
       -
           sha256 = "sha256-TmtQ7rs77W6YFjh3y9kvIZabcGT6U/SCr5Hg6pa7K+s=";

     

       14
       14
       +
           sha256 = "sha256-QEjhnZmrmVzNG1/Zj8z/76v0Fb1N0rMYlvGb2pid2VM=";

     

       15
       15
        
         };

     

       16
       16
        
         # hash missmatch on across linux and darwin

     

       17
       17
        
         proxyVendor = true;

     

       18
       18
       -
         vendorHash = "sha256-4YUJ4HfbAvYt/QtI9wmh8326T4avIXCtPkICo4lEpqQ=";

     

       18
       18
       +
         vendorHash = "sha256-bEmp3Fq9Zop3YCbZH4lOG71osY0P71xuhpIPOUSnHSY=";

     

       19
       19
        
       

     

       20
       20
        
         excludedPackages = [ "magefiles" "misc" ];

     

       21
       21

+5 -2

pkgs/tools/misc/nitch/default.nix

···

       4
       4
        
         version = "0.1.6";

     

       5
       5
        
         nimBinOnly = true;

     

       6
       6
        
         src = fetchFromGitHub {

     

       7
       7
       -
           owner = "unxsh";

     

       7
       7
       +
           owner = "ssleert";

     

       8
       8
        
           repo = "nitch";

     

       9
       9
        
           rev = "42ad6899931dd5e0cec7b021c2b7e383fcc891f3";

     

       10
       10
        
           hash = "sha256-QI7CbP0lvvjD+g29FR/YJjuZboZ+PoHynsNbpYC9SvE=";

     
···

       15
       15
        
             url = "https://github.com/unxsh/nitch/commit/6831cf96144f58c4da298a0bc9b50d33056f6c08.patch";

     

       16
       16
        
             sha256 = "sha256-uZUzUBLHBsssNqDxZ0NuTRMN9/gBxIlIiGgQkqCqEFc=";

     

       17
       17
        
           })

     

       18
       18
       +
           (fetchpatch {

     

       19
       19
       +
             url = "https://github.com/ssleert/nitch/commit/ff10dea47dbc4d9736bd839b87869f53166cf395.patch";

     

       20
       20
       +
             hash = "sha256-n7JtI1Td0xMqhuScnMvxTkbY2I+l+FcUTz7aytxFasE=";

     

       21
       21
       +
           })

     

       18
       22
        
         ];

     

       19
       23
        
       

     

       20
       24
        
         meta = with lib; {

     
···

       23
       27
        
           license = licenses.mit;

     

       24
       28
        
           platforms = platforms.linux;

     

       25
       29
        
           maintainers = with maintainers; [ michaelBelsanti ];

     

       26
       26
       -
           mainProgram = "nitch";

     

       27
       30
        
         };

     

       28
       31
        
       }

+2 -2

pkgs/tools/misc/phrase-cli/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "phrase-cli";

     

       5
       5
       -
         version = "2.8.0";

     

       5
       5
       +
         version = "2.8.2";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "phrase";

     

       9
       9
        
           repo = "phrase-cli";

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-Gima27E77iJEgOVY49Y2s9kQkd+rnzS359ru5NAyGik=";

     

       11
       11
       +
           sha256 = "sha256-jsN7JouIyrFd//+kDAcEEsXiGLZx8e5jQsiNVQuDiQg=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         vendorHash = "sha256-a0QA/1vUryAnO0Nr+m8frxtpnSHBOSOP1pq+BORTIJw=";

pkgs/top-level/all-packages.nix

···

       36221
       36221
        
       

     

       36222
       36222
        
         keeperrl = callPackage ../games/keeperrl { };

     

       36223
       36223
        
       

     

       36224
       36224
       +
         shipwright = callPackage ../games/shipwright { };

     

       36225
       36225
       +
       

     

       36224
       36226
        
         ### GAMES/DOOM-PORTS

     

       36225
       36227
        
       

     

       36226
       36228
        
         dhewm3 = callPackage ../games/doom-ports/dhewm3 { };

pkgs/top-level/python-packages.nix

···

       11040
       11040
        
       

     

       11041
       11041
        
         sense-energy = callPackage ../development/python-modules/sense-energy { };

     

       11042
       11042
        
       

     

       11043
       11043
       +
         sensirion-ble = callPackage ../development/python-modules/sensirion-ble { };

     

       11044
       11044
       +
       

     

       11043
       11045
        
         sensor-state-data = callPackage ../development/python-modules/sensor-state-data { };

     

       11044
       11046
        
       

     

       11045
       11047
        
         sensorpro-ble = callPackage ../development/python-modules/sensorpro-ble { };