From 1a5e625de7715a542bc4a15ec30fc05a48924c0d Mon Sep 17 00:00:00 2001 From: purepani Date: Fri, 25 Oct 2024 22:10:26 -0500 Subject: [PATCH 1/2] Updates flake.lock --- flake.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/flake.lock b/flake.lock index e52aa82dc..90167d0fd 100644 --- a/flake.lock +++ b/flake.lock @@ -18,11 +18,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1728538411, - "narHash": "sha256-f0SBJz1eZ2yOuKUr5CA9BHULGXVSn6miBuUWdTyhUhU=", + "lastModified": 1729850857, + "narHash": "sha256-WvLXzNNnnw+qpFOmgaM3JUlNEH+T4s22b5i2oyyCpXE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b69de56fac8c2b6f8fd27f2eca01dcda8e0a4221", + "rev": "41dea55321e5a999b17033296ac05fe8a8b5a257", "type": "github" }, "original": { @@ -41,11 +41,11 @@ "slimlock": "slimlock" }, "locked": { - "lastModified": 1724504251, - "narHash": "sha256-TIw+sac0NX0FeAneud+sQZT+ql1G/WEb7/Vb436rUXM=", + "lastModified": 1728546539, + "narHash": "sha256-Sws7w0tlnjD+Bjck1nv29NjC5DbL6nH5auL9Ex9Iz2A=", "owner": "thomashoneyman", "repo": "purescript-overlay", - "rev": "988b09676c2a0e6a46dfa3589aa6763c90476b8a", + "rev": "4ad4c15d07bd899d7346b331f377606631eb0ee4", "type": "github" }, "original": { From 993ca8de94f1ba96d7bf7c357d51863ceb482ac5 Mon Sep 17 00:00:00 2001 From: purepani Date: Fri, 25 Oct 2024 21:57:33 -0500 Subject: [PATCH 2/2] Adds uv resolver for pdm --- modules/dream2nix/WIP-python-pdm/default.nix | 1 + modules/dream2nix/WIP-python-pdm/lock.nix | 2 ++ 2 files changed, 3 insertions(+) diff --git a/modules/dream2nix/WIP-python-pdm/default.nix b/modules/dream2nix/WIP-python-pdm/default.nix index ffad1e481..a49dbdba5 100644 --- a/modules/dream2nix/WIP-python-pdm/default.nix +++ b/modules/dream2nix/WIP-python-pdm/default.nix @@ -78,6 +78,7 @@ in { jq mkShell pdm + uv runCommand stdenvNoCC stdenv diff --git a/modules/dream2nix/WIP-python-pdm/lock.nix b/modules/dream2nix/WIP-python-pdm/lock.nix index bdb3e2f3f..77cddc044 100644 --- a/modules/dream2nix/WIP-python-pdm/lock.nix +++ b/modules/dream2nix/WIP-python-pdm/lock.nix @@ -6,6 +6,7 @@ }: let pdmConfig = config.deps.writeText "pdm-config.toml" '' check_update = false + use_uv = true [python] use_venv = false ''; @@ -18,6 +19,7 @@ config.deps.coreutils config.deps.pdm config.deps.yq + config.deps.uv ]}" export TMPDIR=$(${config.deps.coreutils}/bin/mktemp -d) trap "${config.deps.coreutils}/bin/chmod -R +w '$TMPDIR'; ${config.deps.coreutils}/bin/rm -rf '$TMPDIR'" EXIT