From 42f287ab73879e148598cfe329c77592808a9857 Mon Sep 17 00:00:00 2001
From: Millian Poquet <millian.poquet@inria.fr>
Date: Wed, 29 Jul 2020 21:31:50 +0200
Subject: [PATCH] [nix] kapack -> nur-kapack
---
default.nix | 1 +
release.nix | 7 +++----
2 files changed, 4 insertions(+), 4 deletions(-)
create mode 120000 default.nix
diff --git a/default.nix b/default.nix
new file mode 120000
index 0000000..ca14ab7
--- /dev/null
+++ b/default.nix
@@ -0,0 +1 @@
+release.nix
\ No newline at end of file
diff --git a/release.nix b/release.nix
index 95fc900..0457bb9 100644
--- a/release.nix
+++ b/release.nix
@@ -1,5 +1,5 @@
{ kapack ? import
- (fetchTarball "https://github.com/oar-team/kapack/archive/master.tar.gz")
+ (fetchTarball "https://github.com/oar-team/nur-kapack/archive/master.tar.gz")
{}
, doCheck ? false
, doCoverage ? true
@@ -12,7 +12,6 @@ let
pkgs = kapack.pkgs;
pythonPackages = pkgs.python37Packages;
buildPythonPackage = pythonPackages.buildPythonPackage;
- optionOnOff = option: "${if option then "on" else "off"}";
jobs = rec {
# Batsched executable file (built from local sources)
@@ -29,7 +28,7 @@ let
mesonFlags = []
++ pkgs.lib.optional doCoverage [ "-Db_coverage=true" ];
nativeBuildInputs = with kapack; [pkgs.meson pkgs.ninja pkgs.pkgconfig
- pkgs.boost gmp rapidjson intervalset loguru redox pkgs.cppzmq pkgs.zeromq];
+ pkgs.boost pkgs.gmp pkgs.rapidjson intervalset loguru redox pkgs.cppzmq pkgs.zeromq];
# Debug build, without any Nix stripping magic.
mesonBuildType = "debug";
hardeningDisable = [ "all" ];
@@ -117,7 +116,7 @@ let
doCheck = true;
};
- # The following packages are not in Nixpkgs so they are defined here.
+ # Dependencies not in nixpkgs as I write these lines.
pytest_metadata = buildPythonPackage {
name = "pytest-metadata-1.8.0";
doCheck = false;
--
GitLab