diff options
Diffstat (limited to 'Omni/Bild')
| -rw-r--r-- | Omni/Bild/CcacheWrapper.nix | 11 | ||||
| -rw-r--r-- | Omni/Bild/Constants.nix | 2 | ||||
| -rw-r--r-- | Omni/Bild/Deps.nix | 11 | ||||
| -rw-r--r-- | Omni/Bild/Haskell.nix | 1 | ||||
| -rw-r--r-- | Omni/Bild/Nixpkgs.nix | 14 | ||||
| -rw-r--r-- | Omni/Bild/Python.nix | 1 | ||||
| -rw-r--r-- | Omni/Bild/Sources.json | 22 |
7 files changed, 32 insertions, 30 deletions
diff --git a/Omni/Bild/CcacheWrapper.nix b/Omni/Bild/CcacheWrapper.nix index 78e5a08..644c2f6 100644 --- a/Omni/Bild/CcacheWrapper.nix +++ b/Omni/Bild/CcacheWrapper.nix @@ -6,6 +6,7 @@ let ccacheDir = "/var/cache/ccache"; # https://github.com/NixOS/nixpkgs/pull/216363#issuecomment-1430356886 + # deadnix: skip fixwebkit = pkg: self.useCcacheStdenv (pkg.overrideAttrs (attrs: rec { preConfigure = attrs.preConfigure + '' @@ -49,9 +50,9 @@ in { nvcc = self.useCcacheStdenv super.nvcc; onnx = self.useCcacheStdenv super.onnx; onnxruntime = self.useCcacheStdenv super.onnxruntime; - webkit = fixwebkit super.webkit; - webkitgtk = fixwebkit super.webkitgtk; - webkitgtk_4_1 = fixwebkit super.webkitgtk_4_1; - webkitgtk_5_0 = fixwebkit super.webkitgtk_5_0; - webkitgtk_6_0 = fixwebkit super.webkitgtk_6_0; + # webkit = fixwebkit super.webkit; + # webkitgtk = fixwebkit super.webkitgtk; + # webkitgtk_4_1 = fixwebkit super.webkitgtk_4_1; + # webkitgtk_5_0 = fixwebkit super.webkitgtk_5_0; + # webkitgtk_6_0 = fixwebkit super.webkitgtk_6_0; } diff --git a/Omni/Bild/Constants.nix b/Omni/Bild/Constants.nix index 20c992e..776f580 100644 --- a/Omni/Bild/Constants.nix +++ b/Omni/Bild/Constants.nix @@ -1 +1 @@ -{ ghcCompiler = "ghc948"; } +{ ghcCompiler = "ghc966"; } diff --git a/Omni/Bild/Deps.nix b/Omni/Bild/Deps.nix index 9ba0b31..3414418 100644 --- a/Omni/Bild/Deps.nix +++ b/Omni/Bild/Deps.nix @@ -32,14 +32,5 @@ _self: super: ollama = super.ollama.override { acceleration = "cuda"; }; - # https://github.com/NixOS/nixpkgs/issues/317147#issuecomment-2147343125 - radicale = super.radicale.overrideAttrs (_old: rec { - version = "3.2.0"; - src = super.fetchFromGitHub { - owner = "Kozea"; - repo = "Radicale"; - rev = "v${version}"; - hash = "sha256-RxC8VOfdTXJZiAroDHTKjJqGWu65Z5uyb4WK1LOqubQ="; - }; - }); + radicale = super.radicale.overrideAttrs (_old: { doCheck = false; }); } diff --git a/Omni/Bild/Haskell.nix b/Omni/Bild/Haskell.nix index c744848..764ef5d 100644 --- a/Omni/Bild/Haskell.nix +++ b/Omni/Bild/Haskell.nix @@ -18,6 +18,7 @@ in rec { clay = doJailbreak sup.clay; cmark = doJailbreak sup.cmark; docopt = buildCabal sel "docopt"; + filelock = dontCheck sup.filelock; linear-generics = doJailbreak sup.linear-generics; req = doJailbreak sup.req; servant-auth = doJailbreak sup.servant-auth; diff --git a/Omni/Bild/Nixpkgs.nix b/Omni/Bild/Nixpkgs.nix index 212e3f1..828021c 100644 --- a/Omni/Bild/Nixpkgs.nix +++ b/Omni/Bild/Nixpkgs.nix @@ -23,21 +23,17 @@ let (import ./Deps.nix) (import ./Python.nix) (import ./Haskell.nix) + # backport newer packages from unstable + (_: _: { unstable = nixos-unstable-small.pkgs; }) ]; nixos-unstable-small = import sources.nixos-unstable-small { inherit system config overlays; }; in { - nixos-24_05 = import sources.nixos-24_05 { - inherit system config; - overlays = overlays ++ [ - (_: _: { - # backport newer packages from unstable - unstable = nixos-unstable-small.pkgs; - }) - ]; - }; + nixos-24_05 = import sources.nixos-24_05 { inherit system config overlays; }; + + nixos-24_11 = import sources.nixos-24_11 { inherit system config overlays; }; inherit nixos-unstable-small; } diff --git a/Omni/Bild/Python.nix b/Omni/Bild/Python.nix index 23e9ecd..88abe94 100644 --- a/Omni/Bild/Python.nix +++ b/Omni/Bild/Python.nix @@ -5,6 +5,7 @@ _self: super: { let dontCheck = p: p.overridePythonAttrs (_: { doCheck = false; }); in { interegular = callPackage ./Deps/interegular.nix { }; + ipython = dontCheck pysuper.ipython; ludic = callPackage ./Deps/ludic.nix { }; mypy = dontCheck pysuper.mypy; outlines = callPackage ./Deps/outlines.nix { }; diff --git a/Omni/Bild/Sources.json b/Omni/Bild/Sources.json index a52395c..a2f695a 100644 --- a/Omni/Bild/Sources.json +++ b/Omni/Bild/Sources.json @@ -47,9 +47,9 @@ }, "inspekt3d": { "branch": "master", - "type": "git", "repo": "https://git.sr.ht/~morgansmith/inspekt3d", - "rev": "703f52ccbfedad2bf5240bf8183d1b573c9d54ef" + "rev": "703f52ccbfedad2bf5240bf8183d1b573c9d54ef", + "type": "git" }, "interegular": { "branch": "master", @@ -124,6 +124,18 @@ "url": "https://github.com/nixos/nixpkgs/archive/e8c38b73aeb218e27163376a2d617e61a2ad9b59.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, + "nixos-24_11": { + "branch": "nixos-24.11", + "description": "Nix Packages collection & NixOS", + "homepage": "", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "3ffbbdbac0566a0977da3d2657b89cbcfe9a173b", + "sha256": "0m3zh14is40vixpv125alyacd22835v0v845dsnk5d68wvwhikq2", + "type": "tarball", + "url": "https://github.com/nixos/nixpkgs/archive/3ffbbdbac0566a0977da3d2657b89cbcfe9a173b.tar.gz", + "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" + }, "nixos-mailserver": { "repo": "https://gitlab.com/simple-nixos-mailserver/nixos-mailserver", "rev": "f535d8123c4761b2ed8138f3d202ea710a334a1d", @@ -175,10 +187,10 @@ "homepage": "https://radicale.org", "owner": "kozea", "repo": "radicale", - "rev": "d7ce2f0b98589400b0e1718cfd7bb29b7ebeaebe", - "sha256": "08himwwwikhnn4amqzgbbqq323xhfy7yf5vaqczkm2fw6h1s3skg", + "rev": "ac8abbd12c4457fb87e4f5804a62f32db5067b9d", + "sha256": "0zx7kfadi7ng4f5dgkijmnyjbdk1fs11p026zx7d7mbwd28qnxqq", "type": "tarball", - "url": "https://github.com/kozea/radicale/archive/d7ce2f0b98589400b0e1718cfd7bb29b7ebeaebe.tar.gz", + "url": "https://github.com/kozea/radicale/archive/ac8abbd12c4457fb87e4f5804a62f32db5067b9d.tar.gz", "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" }, "regex-applicative": { |