From 3fd75812d85c499650eae29502d511e2c5fa4758 Mon Sep 17 00:00:00 2001
From: Virgile Prevosto <virgile.prevosto@m4x.org>
Date: Fri, 12 Mar 2021 18:56:19 +0100
Subject: [PATCH] [nix] don't mix unstable and stable nix packages when not
necessary
It turns out that llvm-11 is now included in nixos-20.03, our main source
in Frama-CI as of now.
---
nix/default.nix | 13 ++-----------
1 file changed, 2 insertions(+), 11 deletions(-)
diff --git a/nix/default.nix b/nix/default.nix
index b99327f8..f876508f 100644
--- a/nix/default.nix
+++ b/nix/default.nix
@@ -2,19 +2,10 @@
{ pkgs, stdenv, src ? ../., opam2nix,
ocaml_version ? "ocamlPackages_latest.ocaml", plugins ? { } }:
-let
- unstablePckgs = import (pkgs.fetchFromGitHub {
- # Descriptive name to make the store path easier to identify
- owner = "nixos";
- repo = "nixpkgs";
- rev = "8d327040c03fe8afbc2a2a9973af17b0d1a77bf4";
- sha256 = "0nqlyqwhb8lr1g9mwia0k2f9h91zj0vfjmaijk6z8daspsci854c";
- }) {};
-in
let frama_clang_build =
{ llvm_version,
- llvm?unstablePckgs.${"llvm_"+llvm_version},
- llvm_package?unstablePckgs.${"llvmPackages_"+llvm_version} } :
+ llvm?pkgs.${"llvm_"+llvm_version},
+ llvm_package?pkgs.${"llvmPackages_"+llvm_version} } :
(plugins.helpers.simple_plugin
{ inherit pkgs stdenv src opam2nix ocaml_version plugins;
--
GitLab