diff options
| author |  Tom Willemse | 2025-09-02 15:10:31 -0700 |
|---|---|---|
| committer | Tom Willemse | 2025-09-02 15:10:31 -0700 |
| commit | a849117439f3097fca61d4895198f298f36fce97 (patch) | |
| tree | 0d9055dba48624d9cf21c7f3029329acbd61a4f2 | |
| parent | b409ca94ac9141db42a568ff4d3bac961c5bb3e2 (diff) | |
| download | new-dotfiles-a849117439f3097fca61d4895198f298f36fce97.tar.gz new-dotfiles-a849117439f3097fca61d4895198f298f36fce97.zip | |
atuin: Fix compatibility with old Rust packaging methods
The way Rust packages are packaged has changed, this commit fixes compatibility
with the in-between compatibility layer until I can properly make atuin work for
the new packaging system.
| -rw-r--r-- | oni/home/config/common.scm | 11 | ||||
| -rw-r--r-- | oni/packages/atuin.scm | 12 |
2 files changed, 13 insertions, 10 deletions
diff --git a/oni/home/config/common.scm b/oni/home/config/common.scm index 7495aa9..1d8e5d6 100644 --- a/oni/home/config/common.scm +++ b/oni/home/config/common.scm @@ -251,4 +251,13 @@ LocalForward 19999 localhost:19999")) (make-channel-introduction "7677db76330121a901604dfbad19077893865f35" (openpgp-fingerprint - "13E7 6CD6 E649 C28C 3385 4DF5 5E5A A665 6149 17F7"))))))) + "13E7 6CD6 E649 C28C 3385 4DF5 5E5A A665 6149 17F7")))) + (channel + (name 'guix-rust-past-crates) + (url "https://codeberg.org/guix/guix-rust-past-crates.git") + (branch "trunk") + (introduction + (make-channel-introduction + "1db24ca92c28255b28076792b93d533eabb3dc6a" + (openpgp-fingerprint + "F4C2D1DF3FDEEA63D1D30776ACC66D09CA528292"))))))) diff --git a/oni/packages/atuin.scm b/oni/packages/atuin.scm index 5cedfcc..5131ce9 100644 --- a/oni/packages/atuin.scm +++ b/oni/packages/atuin.scm @@ -3,15 +3,8 @@ #:use-module (guix download) #:use-module (guix build-system cargo) #:use-module ((guix licenses) #:prefix license:) - #:use-module (gnu packages crates-io) - #:use-module (gnu packages crates-windows) - #:use-module (gnu packages crates-graphics) - #:use-module (gnu packages crates-apple) - #:use-module (gnu packages crates-crypto) - #:use-module (gnu packages crates-web) - #:use-module (gnu packages crates-tls) - #:use-module (gnu packages crates-shell) - #:use-module (gnu packages crates-database)) + #:use-module (gnu packages sqlite) + #:use-module (past-crates packages crates-io)) (define-public rust-tracing-tree-0.4 (package @@ -1503,6 +1496,7 @@ SQLite.") #:cargo-development-inputs (("rust-tracing-tree" ,rust-tracing-tree-0.4)) ;; These tests all try to connect to a locally running server instance. #:cargo-test-flags '("--" "--skip" "sync" "--skip" "change_password" "--skip" "multi_user_test" "--skip" "registration"))) + (native-inputs (list sqlite)) (home-page "https://atuin.sh") (synopsis "atuin - magical shell history") (description "This package provides atuin - magical shell history.") |