flake.lock

@@ -10,11 +10,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1723293904,
+        "lastModified": 1703433843,
-        "narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
+        "narHash": "sha256-nmtA4KqFboWxxoOAA6Y1okHbZh+HsXaMPFkYHsoDRDw=",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
+        "rev": "417caa847f9383e111d1397039c9d4337d024bf0",
         "type": "github"
       },
       "original": {
@@ -49,14 +49,17 @@
       "inputs": {
         "nixpkgs": [
           "nixpkgs"
+        ],
+        "systems": [
+          "systems"
         ]
       },
       "locked": {
-        "lastModified": 1722113426,
+        "lastModified": 1701787589,
-        "narHash": "sha256-Yo/3loq572A8Su6aY5GP56knpuKYRvM2a1meP9oJZCw=",
+        "narHash": "sha256-ce+oQR4Zq9VOsLoh9bZT8Ip9PaMLcjjBUHVPzW5d7Cw=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "67cce7359e4cd3c45296fb4aaf6a19e2a9c757ae",
+        "rev": "44ddedcbcfc2d52a76b64fb6122f209881bd3e1e",
         "type": "github"
       },
       "original": {
@@ -88,16 +91,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1726447378,
+        "lastModified": 1704295289,
-        "narHash": "sha256-2yV8nmYE1p9lfmLHhOCbYwQC/W8WYfGQABoGzJOb1JQ=",
+        "narHash": "sha256-9WZDRfpMqCYL6g/HNWVvXF0hxdaAgwgIGeLYiOhmes8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "086b448a5d54fd117f4dc2dee55c9f0ff461bdc1",
+        "rev": "b0b2c5445c64191fd8d0b31f2b1a34e45a64547d",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "nixos-23.11",
         "repo": "nixpkgs",
         "type": "github"
       }

flake.nix

@@ -2,7 +2,7 @@
   description = "Dev Setup";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
 
     systems.url = "github:nix-systems/default";
 

python-overlay.nix

@@ -19,7 +19,7 @@ final: prev: {
       maxminddb-geolite2 = pyFinal.callPackage ./python/maxminddb-geolite2.nix {};
       psycopg2-binary = pyFinal.callPackage ./python/psycopg2-binary.nix {};
       traceback-with-variables = pyFinal.callPackage ./python/traceback-with-variables.nix {};
-      #pydantic = pyFinal.callPackage ./python/pydantic.nix {};
+      pydantic = pyFinal.callPackage ./python/pydantic.nix {};
 
       versioningit = pyPrev.versioningit.overridePythonAttrs (oldAttrs: (rec {
         version = "2.2.1";

python/barcodenumber.nix

@@ -4,13 +4,10 @@
 }:
 buildPythonPackage rec {
   pname = "barcodenumber";
-  version = "0.5.0";
+  version = "0.2.1";
-  format = "wheel";
   src = fetchPypi {
-    inherit format pname version;
+    inherit pname version;
-    python = "py3";
+    sha256 = "sha256-nW8+m32i42kLR4oC4lrKoBkFYgKHgpZPGAFNJvtLMhc=";
-    dist = "py3";
-    sha256 = "sha256-VZfHLwSF9aDoy5L1x4O2mu8/f2ijYKgyjCrQ1KKY5Ho=";
   };
   propagatedBuildInputs = [  ];
   nativeBuildInputs = [ ];

python/bench.nix

@@ -34,7 +34,7 @@ buildPythonPackage rec {
   format = "pyproject";
 
   nativeBuildInputs = [ pythonRelaxDepsHook ];
-  pythonRelaxDeps = [ "jinja2" "python-crontab" "semantic-version" "hatchling" ];
+  pythonRelaxDeps = [ "jinja2" "python-crontab" "semantic-version" ];
 
   buildInputs = [
     hatchling

python/erpnext.nix

@@ -40,7 +40,6 @@ buildPythonPackage rec {
     "pycountry"
     "rapidfuzz"
     "Unidecode"
-    "python-youtube"
   ];
 
   propagatedBuildInputs = [

python/pydantic.nix

@@ -0,0 +1,85 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+, hatchling
+, hatch-fancy-pypi-readme
+, libxcrypt
+, annotated-types
+, pydantic-core
+, typing-extensions
+, email-validator
+, dirty-equals
+, faker
+, pytestCheckHook
+, pytest-mock
+}:
+
+buildPythonPackage rec {
+  pname = "pydantic";
+  version = "2.3.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "pydantic";
+    repo = "pydantic";
+    rev = "refs/tags/v${version}";
+    hash = "sha256-toqrWg8bYzc3UmvG/YmXawfmT8nqaA9fxy24k1cdj+M=";
+  };
+
+  buildInputs = lib.optionals (pythonOlder "3.9") [
+    libxcrypt
+  ];
+
+  nativeBuildInputs = [
+    hatch-fancy-pypi-readme
+    hatchling
+  ];
+
+  propagatedBuildInputs = [
+    annotated-types
+    pydantic-core
+    typing-extensions
+  ];
+
+  passthru.optional-dependencies = {
+    email = [
+      email-validator
+    ];
+  };
+
+  nativeCheckInputs = [
+    dirty-equals
+    faker
+    pytest-mock
+    pytestCheckHook
+  ] ++ lib.flatten (lib.attrValues passthru.optional-dependencies);
+
+  preCheck = ''
+    export HOME=$(mktemp -d)
+    substituteInPlace pyproject.toml \
+      --replace "'--benchmark-columns', 'min,mean,stddev,outliers,rounds,iterations'," "" \
+      --replace "'--benchmark-group-by', 'group'," "" \
+      --replace "'--benchmark-warmup', 'on'," "" \
+      --replace "'--benchmark-disable'," ""
+  '';
+
+  disabledTestPaths = [
+    "tests/benchmarks"
+
+    # avoid cyclic dependency
+    "tests/test_docs.py"
+  ];
+
+  pythonImportsCheck = [ "pydantic" ];
+
+  meta = with lib; {
+    description = "Data validation and settings management using Python type hinting";
+    homepage = "https://github.com/pydantic/pydantic";
+    changelog = "https://github.com/pydantic/pydantic/blob/v${version}/HISTORY.md";
+    license = licenses.mit;
+    maintainers = with maintainers; [ wd15 ];
+  };
+}

srcs/pin.nix

@@ -1,12 +1,12 @@
 {
-  benchVersion = "5.22.9";
+  benchVersion = "5.19.0";
-  erpnextVersion = "15.36.1";
+  erpnextVersion = "15.9.1";
-  frappeVersion = "15.41.0";
+  frappeVersion = "15.8.1";
   hashes = {
-    "benchSrcHash" = "sha256-VOsAd7l09/GPf4eRV/Vrdj6XPLQS19/cq1h4Vym174A=";
+    "benchSrcHash" = "sha256-y8nx4vFVQggwGv2MWQ88WczgVbPxPybZV38FF5u5aWI=";
-    "erpnextSrcHash" = "sha256-fECwtuMWOCRydcfWSx4CXLp5SWzWGIQ5yWOlsDsdDQI=";
+    "erpnextSrcHash" = "sha256-nkXN0PTcWt1nSy3eRdBF2h0WMdAC79qWzaj9kXRsG2I=";
     "erpnextYarnHash" = "1farnqrfnzshpbpx4nyarw13g8m3389ix3hrc4661xxm887lz5fv";
-    "frappeSrcHash" = "sha256-PINpNwJR5m/wvVcor3YKWs0RS805uvuBbT5pUjtk/yE=";
+    "frappeSrcHash" = "sha256-FDUUNbULPmMY6dDgbMHrxXD8pK1AP+T7kG7mY9MmMDg=";
-    "frappeYarnHash" = "0ahch2jazvpigwjhk872i00paachya3ym3zjyc3dl5ris851qyss";
+    "frappeYarnHash" = "0rj2v69siagwjz632hyaii5ni24fp434cznaxpi8978fq07qx6l9";
   };
 }