diff --git a/nix/packages/default.nix b/nix/packages/default.nix index 5c4f4f14..fa60aa08 100644 --- a/nix/packages/default.nix +++ b/nix/packages/default.nix @@ -63,13 +63,6 @@ in rec { logisim-evolution = pkgs.callPackage ./logisim-evolution.nix {}; necrolib = pkgs.callPackage ./necrolib.nix {}; - why3-wrapped = let - why3-pinned = import sources.pin-why3 {}; - alt-ergo-pinned = import sources.pin-alt-ergo { - config.allowUnfree = true; - }; - in - why3-pinned.callPackage ./why3.nix {inherit (alt-ergo-pinned) alt-ergo;}; maeel = pkgs.callPackage ./maeel.nix {}; tokei = pkgs.callPackage ./tokei {}; # alpha tokei with typst, skel, hledger diff --git a/nix/packages/why3.nix b/nix/packages/why3.nix deleted file mode 100644 index ee93f2ee..00000000 --- a/nix/packages/why3.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ - symlinkJoin, - makeWrapper, - why3, - cvc4, - z3_4_12, - alt-ergo, -}: let - provers = [ - alt-ergo - cvc4 - z3_4_12 - ]; -in - symlinkJoin { - name = "why3"; - # Generate configuration in the store, and wrap why3 with the corresponding option - paths = [(why3.override {version = "1.6.0";})]; - buildInputs = provers; - nativeBuildInputs = [makeWrapper]; - postBuild = '' - $out/bin/why3 config detect --config=$out/why3.conf - wrapProgram $out/bin/why3 --add-flags "--config=$out/why3.conf" - ''; - } diff --git a/nix/sources.json b/nix/sources.json index 176a1c01..da1b5e37 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -145,18 +145,6 @@ "url": "https://github.com/nix-community/nur/archive/6b8339ef517be0618224555960e1693156de1bf9.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, - "pin-alt-ergo": { - "branch": "master", - "description": "Nix Packages collection & NixOS", - "homepage": "", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "1b95daa381fa4a0963217a5d386433c20008208a", - "sha256": "1kvbdqgc8y8bszizvmwb4max2rrhnlygag1rg6k3qhh42a9js0dz", - "type": "tarball", - "url": "https://github.com/nixos/nixpkgs/archive/1b95daa381fa4a0963217a5d386433c20008208a.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, "pin-fourmolu": { "branch": "haskell-updates", "description": "Nix Packages collection & NixOS", @@ -193,18 +181,6 @@ "url": "https://github.com/nixos/nixpkgs/archive/c58ed2fc0f592ebc280bfba077ea418ce10213d1.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, - "pin-why3": { - "branch": "master", - "description": "Nix Packages collection & NixOS", - "homepage": "", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "805a384895c696f802a9bf5bf4720f37385df547", - "sha256": "1q7y5ygr805l5axcjhn0rn3wj8zrwbrr0c6a8xd981zh8iccmx0p", - "type": "tarball", - "url": "https://github.com/nixos/nixpkgs/archive/805a384895c696f802a9bf5bf4720f37385df547.tar.gz", - "url_template": "https://github.com///archive/.tar.gz" - }, "pin-wireshark": { "branch": "master", "description": "Nix Packages collection & NixOS",