about summary refs log tree commit diff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--third_party/overlays/ecl-static.nix9
-rw-r--r--third_party/overlays/haskell/default.nix18
-rw-r--r--third_party/sources/sources.json38
-rw-r--r--tvix/build-go/build.pb.go2
-rw-r--r--tvix/build-go/rpc_build.pb.go2
-rw-r--r--tvix/castore-go/castore.pb.go2
-rw-r--r--tvix/castore-go/rpc_blobstore.pb.go2
-rw-r--r--tvix/castore-go/rpc_directory.pb.go2
-rw-r--r--tvix/castore/src/proto/tests/directory.rs4
-rw-r--r--tvix/eval/src/value/attrs/tests.rs6
-rw-r--r--tvix/glue/src/builtins/derivation.rs2
-rw-r--r--tvix/nix-compat/src/derivation/parser.rs4
-rw-r--r--tvix/nix-compat/src/nar/wire/tag.rs60
-rw-r--r--tvix/store-go/default.nix2
-rw-r--r--tvix/store-go/pathinfo.pb.go2
-rw-r--r--tvix/store-go/rpc_pathinfo.pb.go2
16 files changed, 61 insertions, 96 deletions
diff --git a/third_party/overlays/ecl-static.nix b/third_party/overlays/ecl-static.nix
index 66579c33ab..d81075bdee 100644
--- a/third_party/overlays/ecl-static.nix
+++ b/third_party/overlays/ecl-static.nix
@@ -20,15 +20,6 @@ self: super:
   ecl-static = (super.pkgsMusl.ecl.override {
     inherit (self.pkgsStatic) gmp libffi boehmgc;
   }).overrideAttrs (drv: rec {
-    # version must not be changed as it indicates where to find the bundled libs,
-    # using ecl HEAD is necessary for us since it includes multiple fixes to do
-    # with bytecode compilation and allows to concatenate fasc files again.
-    src = self.fetchFromGitLab {
-      owner = "embeddable-common-lisp";
-      repo = "ecl";
-      rev = "1c989247c1b0bf1d38a76aec30b9ca5e41afe1e3";
-      sha256 = "0bzjqw6m1kk5z5b81yizic347k931msp5lf78x65dcw3fqfwv3xn";
-    };
     configureFlags = drv.configureFlags ++ [
       "--disable-shared"
       "--with-dffi=no" # will fail at runtime anyways if statically linked
diff --git a/third_party/overlays/haskell/default.nix b/third_party/overlays/haskell/default.nix
index 614fc26d56..5dbb8f45f8 100644
--- a/third_party/overlays/haskell/default.nix
+++ b/third_party/overlays/haskell/default.nix
@@ -8,20 +8,6 @@ self: super: # overlay parameters for the nixpkgs overlay
 
 let
   haskellLib = self.haskell.lib.compose;
-  dhall-source = subdir: pkg:
-    haskellLib.overrideSrc
-      {
-        src = "${super.fetchFromGitHub {
-          owner = "Profpatsch";
-          repo = "dhall-haskell";
-          # https://github.com/dhall-lang/dhall-haskell/pull/2426
-          rev = "5e3a407d8ac826597d935d8398825a0ca73fc4e9";
-          sha256 = "005plj6kgxlkm9npaq07kmsgmiqk50dpwb9li9w1ly4aj1zgfjnd";
-        }}/${subdir}";
-      }
-      (haskellLib.overrideCabal { patches = [ ]; } pkg);
-
-
 in
 {
   haskellPackages = super.haskellPackages.override {
@@ -40,10 +26,6 @@ in
         haskellLib.doJailbreak
       ];
 
-      # TODO: this is to fix a bug in dhall-nix
-      dhall = dhall-source "dhall" hsSuper.dhall;
-      dhall-nix = dhall-source "dhall-nix" hsSuper.dhall-nix;
-
       pa-prelude = hsSelf.callPackage ./extra-pkgs/pa-prelude.nix { };
       pa-error-tree = hsSelf.callPackage ./extra-pkgs/pa-error-tree-0.1.0.0.nix { };
       pa-field-parser = hsSelf.callPackage ./extra-pkgs/pa-field-parser.nix { };
diff --git a/third_party/sources/sources.json b/third_party/sources/sources.json
index 3fc00d6703..379de03fb3 100644
--- a/third_party/sources/sources.json
+++ b/third_party/sources/sources.json
@@ -5,10 +5,10 @@
         "homepage": "https://matrix.to/#/#agenix:nixos.org",
         "owner": "ryantm",
         "repo": "agenix",
-        "rev": "13ac9ac6d68b9a0896e3d43a082947233189e247",
-        "sha256": "196k2gchfy4y0258j6n15zd96harinzx91yqcmfrv1dvgwk9x94c",
+        "rev": "0.15.0",
+        "sha256": "01dhrghwa7zw93cybvx4gnrskqk97b004nfxgsys0736823956la",
         "type": "tarball",
-        "url": "https://github.com/ryantm/agenix/archive/13ac9ac6d68b9a0896e3d43a082947233189e247.tar.gz",
+        "url": "https://github.com/ryantm/agenix/archive/0.15.0.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "emacs-overlay": {
@@ -17,10 +17,10 @@
         "homepage": "",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "e9e995a2f582217b7c4efe38415fafbbc06274d2",
-        "sha256": "06851d4ddnljfpyl545kcxrqb66rjz5yfspwxjahddddl3jddw86",
+        "rev": "53b4803d6cb623b5b4e3540af99e1b356bbc7f30",
+        "sha256": "1jsb4slrw1jgas8casw3jdscbgvlvjm5iw99zb5c6s8j8c1g3189",
         "type": "tarball",
-        "url": "https://github.com/nix-community/emacs-overlay/archive/e9e995a2f582217b7c4efe38415fafbbc06274d2.tar.gz",
+        "url": "https://github.com/nix-community/emacs-overlay/archive/53b4803d6cb623b5b4e3540af99e1b356bbc7f30.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "home-manager": {
@@ -29,10 +29,10 @@
         "homepage": "https://nix-community.github.io/home-manager/",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2aff324cf65f5f98f89d878c056b779466b17db8",
-        "sha256": "1sipxx381b7ri9sh1nyhk740szbsgc54r30x87n7lghxfyfkj629",
+        "rev": "f2942f3385f1b35cc8a1abb03a45e29c9cb4d3c8",
+        "sha256": "1y27iri5brs2kg6935mknkbwwm134i9hki1nbacza82fvjs89lwg",
         "type": "tarball",
-        "url": "https://github.com/nix-community/home-manager/archive/2aff324cf65f5f98f89d878c056b779466b17db8.tar.gz",
+        "url": "https://github.com/nix-community/home-manager/archive/f2942f3385f1b35cc8a1abb03a45e29c9cb4d3c8.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "impermanence": {
@@ -77,22 +77,22 @@
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5f64a12a728902226210bf01d25ec6cbb9d9265b",
-        "sha256": "0lq73nhcg11485ppazbnpz767qjifbydgqxn5xhj3xxlbfml39ba",
+        "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d",
+        "sha256": "0939vbhln9d33xkqw63nsk908k03fxihj85zaf70i3il9z42q8mc",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/5f64a12a728902226210bf01d25ec6cbb9d9265b.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/9b19f5e77dd906cb52dade0b7bd280339d2a1f3d.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "nixpkgs-stable": {
-        "branch": "nixos-23.05",
+        "branch": "nixos-23.11",
         "description": "Nix Packages collection",
         "homepage": "",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7790e078f8979a9fcd543f9a47427eeaba38f268",
-        "sha256": "1iyaik6rkiwjr9dzhk5x2w94z4k8klcanrwyd1a4z47d6ybiwlgl",
+        "rev": "3dc440faeee9e889fe2d1b4d25ad0f430d449356",
+        "sha256": "0a30jv7s6qpy7i98jznc6iirq68344byrgpvcvarpjrdvfp84sv1",
         "type": "tarball",
-        "url": "https://github.com/NixOS/nixpkgs/archive/7790e078f8979a9fcd543f9a47427eeaba38f268.tar.gz",
+        "url": "https://github.com/NixOS/nixpkgs/archive/3dc440faeee9e889fe2d1b4d25ad0f430d449356.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "rust-overlay": {
@@ -101,10 +101,10 @@
         "homepage": "",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "2b24e1f369f00f5ae9876e15e12f77e12c9c2374",
-        "sha256": "14chq4i99lx0iqh5gn8wz97n1f18ngkzs7mcgilr66pmyl6hclh8",
+        "rev": "9e0af26ffe52bf955ad5575888f093e41fba0104",
+        "sha256": "18vyy6fykp21l61kgpsnqv2lrvvan2rhw7psjpqgg1x393wk80r0",
         "type": "tarball",
-        "url": "https://github.com/oxalica/rust-overlay/archive/2b24e1f369f00f5ae9876e15e12f77e12c9c2374.tar.gz",
+        "url": "https://github.com/oxalica/rust-overlay/archive/9e0af26ffe52bf955ad5575888f093e41fba0104.tar.gz",
         "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
     },
     "rustsec-advisory-db": {
diff --git a/tvix/build-go/build.pb.go b/tvix/build-go/build.pb.go
index 6646d4e91f..de0f11727f 100644
--- a/tvix/build-go/build.pb.go
+++ b/tvix/build-go/build.pb.go
@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.32.0
 // 	protoc        (unknown)
 // source: tvix/build/protos/build.proto
 
diff --git a/tvix/build-go/rpc_build.pb.go b/tvix/build-go/rpc_build.pb.go
index 4bde10b219..36de46b765 100644
--- a/tvix/build-go/rpc_build.pb.go
+++ b/tvix/build-go/rpc_build.pb.go
@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.32.0
 // 	protoc        (unknown)
 // source: tvix/build/protos/rpc_build.proto
 
diff --git a/tvix/castore-go/castore.pb.go b/tvix/castore-go/castore.pb.go
index ab39f1fda1..26c23de1b0 100644
--- a/tvix/castore-go/castore.pb.go
+++ b/tvix/castore-go/castore.pb.go
@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.32.0
 // 	protoc        (unknown)
 // source: tvix/castore/protos/castore.proto
 
diff --git a/tvix/castore-go/rpc_blobstore.pb.go b/tvix/castore-go/rpc_blobstore.pb.go
index 73bcb91ba9..71ccc1e0b1 100644
--- a/tvix/castore-go/rpc_blobstore.pb.go
+++ b/tvix/castore-go/rpc_blobstore.pb.go
@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.32.0
 // 	protoc        (unknown)
 // source: tvix/castore/protos/rpc_blobstore.proto
 
diff --git a/tvix/castore-go/rpc_directory.pb.go b/tvix/castore-go/rpc_directory.pb.go
index d65d646e71..2ee7180635 100644
--- a/tvix/castore-go/rpc_directory.pb.go
+++ b/tvix/castore-go/rpc_directory.pb.go
@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.32.0
 // 	protoc        (unknown)
 // source: tvix/castore/protos/rpc_directory.proto
 
diff --git a/tvix/castore/src/proto/tests/directory.rs b/tvix/castore/src/proto/tests/directory.rs
index a5e4f3c9c1..5fda394775 100644
--- a/tvix/castore/src/proto/tests/directory.rs
+++ b/tvix/castore/src/proto/tests/directory.rs
@@ -141,9 +141,7 @@ fn digest() {
 
     assert_eq!(
         d.digest(),
-        (&hex!("af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262"))
-            .try_into()
-            .unwrap()
+        (&hex!("af1349b9f5f9a1a6a0404dea36dcc9499bcb25c9adc112b7cc9a93cae41f3262")).into()
     )
 }
 
diff --git a/tvix/eval/src/value/attrs/tests.rs b/tvix/eval/src/value/attrs/tests.rs
index 473592c519..5c693873cd 100644
--- a/tvix/eval/src/value/attrs/tests.rs
+++ b/tvix/eval/src/value/attrs/tests.rs
@@ -78,11 +78,7 @@ fn test_kv_attrs_iter() {
     )
     .expect("constructing K/V pair attrs should succeed");
 
-    let mut iter = kv_attrs
-        .iter()
-        .collect::<Vec<_>>()
-        .into_iter()
-        .map(|(k, v)| (k, v));
+    let mut iter = kv_attrs.iter().collect::<Vec<_>>().into_iter();
     let (k, v) = iter.next().unwrap();
     assert!(k == *NAME_REF);
     assert!(v.to_str().unwrap() == meaning_val.to_str().unwrap());
diff --git a/tvix/glue/src/builtins/derivation.rs b/tvix/glue/src/builtins/derivation.rs
index 180567b8c4..227b703f36 100644
--- a/tvix/glue/src/builtins/derivation.rs
+++ b/tvix/glue/src/builtins/derivation.rs
@@ -526,5 +526,3 @@ pub(crate) mod derivation_builtins {
         Ok(Value::String(NixString::new_context_from(context, &path)))
     }
 }
-
-pub use derivation_builtins::builtins as derivation_builtins;
diff --git a/tvix/nix-compat/src/derivation/parser.rs b/tvix/nix-compat/src/derivation/parser.rs
index f54852cb22..7ffa6fd46e 100644
--- a/tvix/nix-compat/src/derivation/parser.rs
+++ b/tvix/nix-compat/src/derivation/parser.rs
@@ -23,7 +23,7 @@ pub enum Error<I> {
     #[error("premature EOF")]
     Incomplete,
     #[error("validation error: {0}")]
-    ValidationError(super::DerivationError),
+    Validation(super::DerivationError),
 }
 
 pub(crate) fn parse(i: &[u8]) -> Result<Derivation, Error<&[u8]>> {
@@ -33,7 +33,7 @@ pub(crate) fn parse(i: &[u8]) -> Result<Derivation, Error<&[u8]>> {
             debug_assert!(rest.is_empty());
 
             // invoke validate
-            derivation.validate(true).map_err(Error::ValidationError)?;
+            derivation.validate(true).map_err(Error::Validation)?;
 
             Ok(derivation)
         }
diff --git a/tvix/nix-compat/src/nar/wire/tag.rs b/tvix/nix-compat/src/nar/wire/tag.rs
index 55ce4b4a2a..55b93f9985 100644
--- a/tvix/nix-compat/src/nar/wire/tag.rs
+++ b/tvix/nix-compat/src/nar/wire/tag.rs
@@ -91,36 +91,6 @@ macro_rules! make {
     };
 }
 
-pub(crate) use make;
-
-#[cfg(test)]
-mod test {
-    use super::super::tag::{self, Tag};
-
-    const TOK_A: [u8; 3] = [0xed, 0xef, 0x1c];
-    const TOK_B: [u8; 3] = [0xed, 0xf0, 0x1c];
-
-    const OFFSET: usize = 1;
-
-    make! {
-        enum Token[OFFSET] {
-            A = TOK_A,
-            B = TOK_B,
-        }
-    }
-
-    #[test]
-    fn example() {
-        assert_eq!(Token::from_u8(0xed), None);
-
-        let tag = Token::from_u8(0xef).unwrap();
-        assert_eq!(tag.as_bytes(), &TOK_A[..]);
-
-        let tag = Token::from_u8(0xf0).unwrap();
-        assert_eq!(tag.as_bytes(), &TOK_B[..]);
-    }
-}
-
 // The following functions are written somewhat unusually,
 // since they're const functions that cannot use iterators.
 
@@ -163,3 +133,33 @@ pub const fn min_of(mut xs: &[usize]) -> usize {
 pub const fn buf_of(xs: &[usize]) -> usize {
     max_of(&[min_of(xs), max_of(xs) - min_of(xs)])
 }
+
+pub(crate) use make;
+
+#[cfg(test)]
+mod test {
+    use super::super::tag::{self, Tag};
+
+    const TOK_A: [u8; 3] = [0xed, 0xef, 0x1c];
+    const TOK_B: [u8; 3] = [0xed, 0xf0, 0x1c];
+
+    const OFFSET: usize = 1;
+
+    make! {
+        enum Token[OFFSET] {
+            A = TOK_A,
+            B = TOK_B,
+        }
+    }
+
+    #[test]
+    fn example() {
+        assert_eq!(Token::from_u8(0xed), None);
+
+        let tag = Token::from_u8(0xef).unwrap();
+        assert_eq!(tag.as_bytes(), &TOK_A[..]);
+
+        let tag = Token::from_u8(0xf0).unwrap();
+        assert_eq!(tag.as_bytes(), &TOK_B[..]);
+    }
+}
diff --git a/tvix/store-go/default.nix b/tvix/store-go/default.nix
index f1f5a81548..e4c3efd7ad 100644
--- a/tvix/store-go/default.nix
+++ b/tvix/store-go/default.nix
@@ -18,7 +18,7 @@ in
         ${regenerate}
         if [[ -n "$(git status --porcelain -unormal)" ]]; then
             echo "-----------------------------"
-            echo ".pb.go files need to be updated, mg run //tvix/store-go/generate"
+            echo ".pb.go files need to be updated, mg run //tvix/store-go/regenerate"
             echo "-----------------------------"
             git status -unormal
             exit 1
diff --git a/tvix/store-go/pathinfo.pb.go b/tvix/store-go/pathinfo.pb.go
index 4b393ad4f3..23808765ba 100644
--- a/tvix/store-go/pathinfo.pb.go
+++ b/tvix/store-go/pathinfo.pb.go
@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.32.0
 // 	protoc        (unknown)
 // source: tvix/store/protos/pathinfo.proto
 
diff --git a/tvix/store-go/rpc_pathinfo.pb.go b/tvix/store-go/rpc_pathinfo.pb.go
index 63df3bff24..6b8355ff24 100644
--- a/tvix/store-go/rpc_pathinfo.pb.go
+++ b/tvix/store-go/rpc_pathinfo.pb.go
@@ -3,7 +3,7 @@
 
 // Code generated by protoc-gen-go. DO NOT EDIT.
 // versions:
-// 	protoc-gen-go v1.31.0
+// 	protoc-gen-go v1.32.0
 // 	protoc        (unknown)
 // source: tvix/store/protos/rpc_pathinfo.proto
generated by cgit-pink 1.4.1 (git 2.44.0) at 2024-05-10T06ยท55+0000