From 801f67a55f8d6073edc1528fce4f4a4b315c9bc3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 8 May 2019 22:14:33 +0200 Subject: Add flake.nix --- flake.lock | 9 +++++++++ flake.nix | 20 ++++++++++++++++++++ release.nix | 9 +++++---- 3 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 flake.lock create mode 100644 flake.nix diff --git a/flake.lock b/flake.lock new file mode 100644 index 0000000..6d035a5 --- /dev/null +++ b/flake.lock @@ -0,0 +1,9 @@ +{ + "nonFlakeRequires": {}, + "requires": { + "github:edolstra/nixpkgs/a4d896e89932e873c4117908d558db6210fa3b56": { + "uri": "github:edolstra/nixpkgs/a4d896e89932e873c4117908d558db6210fa3b56" + } + }, + "version": 1 +} diff --git a/flake.nix b/flake.nix new file mode 100644 index 0000000..9d579b9 --- /dev/null +++ b/flake.nix @@ -0,0 +1,20 @@ +{ + name = "patchelf"; + + description = "A tool for modifying ELF executables and libraries"; + + requires = [ "nixpkgs" ]; + + provides = deps: rec { + + hydraJobs = import ./release.nix { + patchelfSrc = deps.self; + nixpkgs = deps.nixpkgs; + }; + + packages.patchelf = hydraJobs.build.x86_64-linux; + + defaultPackage = packages.patchelf; + + }; +} diff --git a/release.nix b/release.nix index 55bb37b..147f3c1 100644 --- a/release.nix +++ b/release.nix @@ -1,10 +1,11 @@ { patchelfSrc ? { outPath = ./.; revCount = 1234; shortRev = "abcdef"; } +, nixpkgs ? builtins.fetchTarball https://github.com/NixOS/nixpkgs-channels/archive/nixos-19.03.tar.gz , officialRelease ? false }: let - pkgs = import { }; + pkgs = import nixpkgs { system = builtins.currentSystem or "x86_64-linux"; }; jobs = rec { @@ -34,7 +35,7 @@ let build = pkgs.lib.genAttrs [ "x86_64-linux" "i686-linux" "aarch64-linux" /* "x86_64-freebsd" "i686-freebsd" "x86_64-darwin" "i686-solaris" "i686-cygwin" */ ] (system: - with import { inherit system; }; + with import nixpkgs { inherit system; }; releaseTools.nixBuild { name = "patchelf"; @@ -81,7 +82,7 @@ let makeRPM = system: diskImageFun: - with import { inherit system; }; + with import nixpkgs { inherit system; }; releaseTools.rpmBuild rec { name = "patchelf-rpm"; @@ -97,7 +98,7 @@ let makeDeb = system: diskImageFun: - with import { inherit system; }; + with import nixpkgs { inherit system; }; releaseTools.debBuild { name = "patchelf-deb"; -- cgit v0.12