From f640bc851ef89c896e0df808c4687b5ce3adbe3e Mon Sep 17 00:00:00 2001 From: Rodrigo Arias Date: Wed, 22 Feb 2023 10:44:08 +0100 Subject: [PATCH] Remove unused nix files --- nix/nosv.nix | 67 ----------------------------------------------- nix/old-glibc.nix | 38 --------------------------- 2 files changed, 105 deletions(-) delete mode 100644 nix/nosv.nix delete mode 100644 nix/old-glibc.nix diff --git a/nix/nosv.nix b/nix/nosv.nix deleted file mode 100644 index 245f5f5..0000000 --- a/nix/nosv.nix +++ /dev/null @@ -1,67 +0,0 @@ -# Build with `nix-build nix/old-glibc.nix` -let - # Pin the nixpkgs - nixpkgsPath = builtins.fetchTarball { - # Descriptive name to make the store path easier to identify - name = "nixos-20.09"; - # Commit hash for nixos-20.09 as of 2021-01-11 - url = "https://github.com/nixos/nixpkgs/archive/41dddb1283733c4993cb6be9573d5cef937c1375.tar.gz"; - # Hash obtained using `nix-prefetch-url --unpack ` - sha256 = "1blbidbmxhaxar2x76nz72bazykc5yxi0algsbrhxgrsvijs4aiw"; - }; - - pkgs = import nixpkgsPath { }; - - ovni = pkgs.stdenv.mkDerivation rec { - name = "ovni"; - - buildInputs = with pkgs; [ cmake openmpi ]; - - # Prevent accidental reutilization of previous builds, as we are taking the - # current directory as-is - preConfigure = '' - rm -rf build install - - # There is no /bin/bash - patchShebangs test/*.sh - ''; - - cmakeBuildType = "Debug"; - cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; - buildFlags = [ "VERBOSE=1" ]; - preCheck = '' - export CTEST_OUTPUT_ON_FAILURE=1 - ''; - dontStrip = true; - doCheck = true; - checkTarget = "test"; - - src = ../.; - }; - - nosv = pkgs.stdenv.mkDerivation rec { - pname = "nosv"; - version = src.shortRev; - buildInputs = with pkgs; [ autoreconfHook pkg-config numactl ovni ]; - configureFlags = [ "--with-ovni=${ovni}" ]; - dontStrip = true; - src = builtins.fetchGit { - url = "ssh://git@gitlab-internal.bsc.es/nos-v/nos-v.git"; - ref = "master"; - }; - }; - - # Quick fix to avoid rebuilding every time the ovni source changes. - # Use this nosv' version below as dependency of ovni-rt - nosv' = /nix/store/rvnrbc7ibpw06jdilz6mha7szzxcr2mi-nosv-8936f3e; - - ovni-rt = ovni.overrideAttrs (old: { - __impure = true; - __noChroot = true; - buildInputs = old.buildInputs ++ [ nosv pkgs.strace ]; - cmakeFlags = old.cmakeFlags ++ [ "-DBUILD_RT_TESTING=ON" ]; - }); - -in - - ovni-rt diff --git a/nix/old-glibc.nix b/nix/old-glibc.nix deleted file mode 100644 index 09adbcd..0000000 --- a/nix/old-glibc.nix +++ /dev/null @@ -1,38 +0,0 @@ -# Build with `nix-build nix/old-glibc.nix` -let - # Define the set of packages from the old 2018.03 nixos release, so we get a - # glibc 2.26 which doesn't define the gettid() function, and one of the lowest - # cmake versions supported (3.10.2). - url = "https://github.com/NixOS/nixpkgs/archive/3e1be2206b4c1eb3299fb633b8ce9f5ac1c32898.tar.gz"; - pkgs = import (builtins.fetchTarball { inherit url; }) {}; - -in - - with pkgs; - - stdenv.mkDerivation rec { - name = "ovni"; - - buildInputs = [ cmake openmpi ]; - - # Prevent accidental reutilization of previous builds, as we are taking the - # current directory as-is - preConfigure = '' - rm -rf build install - - # There is no /bin/bash - patchShebangs test/*.sh - ''; - - cmakeBuildType = "Debug"; - cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=OFF" ]; - buildFlags = [ "VERBOSE=1" ]; - preCheck = '' - export CTEST_OUTPUT_ON_FAILURE=1 - ''; - dontStrip = true; - doCheck = true; - checkTarget = "test"; - - src = ../.; - }