From 2d5a21968842c88b425e1a591bd413c484a470e7 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Tue, 7 May 2019 23:22:47 +0200
Subject: Add basic flake tests

---
 release-common.nix | 1 +
 1 file changed, 1 insertion(+)

(limited to 'release-common.nix')

diff --git a/release-common.nix b/release-common.nix
index 4c5565985..b745932a7 100644
--- a/release-common.nix
+++ b/release-common.nix
@@ -56,6 +56,7 @@ rec {
       # Tests
       git
       mercurial
+      jq
     ]
     ++ lib.optionals stdenv.isLinux [libseccomp utillinuxMinimal]
     ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
-- 
cgit v1.2.3


From 204291f0598c43b10cf20a89b49fc63624d78c7c Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Fri, 4 Oct 2019 10:45:33 +0200
Subject: Merge release.nix, shell.nix and release-common.nix into flake.nix

Also provide a Nixpkgs overlay, memoize Nixpkgs evaluation and fit the
githubFlakes test.
---
 release-common.nix | 80 ------------------------------------------------------
 1 file changed, 80 deletions(-)
 delete mode 100644 release-common.nix

(limited to 'release-common.nix')

diff --git a/release-common.nix b/release-common.nix
deleted file mode 100644
index f103b52b5..000000000
--- a/release-common.nix
+++ /dev/null
@@ -1,80 +0,0 @@
-{ pkgs }:
-
-with pkgs;
-
-rec {
-  # Use "busybox-sandbox-shell" if present,
-  # if not (legacy) fallback and hope it's sufficient.
-  sh = pkgs.busybox-sandbox-shell or (busybox.override {
-    useMusl = true;
-    enableStatic = true;
-    enableMinimal = true;
-    extraConfig = ''
-      CONFIG_FEATURE_FANCY_ECHO y
-      CONFIG_FEATURE_SH_MATH y
-      CONFIG_FEATURE_SH_MATH_64 y
-
-      CONFIG_ASH y
-      CONFIG_ASH_OPTIMIZE_FOR_SIZE y
-
-      CONFIG_ASH_ALIAS y
-      CONFIG_ASH_BASH_COMPAT y
-      CONFIG_ASH_CMDCMD y
-      CONFIG_ASH_ECHO y
-      CONFIG_ASH_GETOPTS y
-      CONFIG_ASH_INTERNAL_GLOB y
-      CONFIG_ASH_JOB_CONTROL y
-      CONFIG_ASH_PRINTF y
-      CONFIG_ASH_TEST y
-    '';
-  });
-
-  configureFlags =
-    [
-      "--enable-gc"
-    ] ++ lib.optionals stdenv.isLinux [
-      "--with-sandbox-shell=${sh}/bin/busybox"
-    ];
-
-  tarballDeps =
-    [ bison
-      flex
-      libxml2
-      libxslt
-      docbook5
-      docbook_xsl_ns
-      autoconf-archive
-      autoreconfHook
-    ];
-
-  buildDeps =
-    [ curl
-      bzip2 xz brotli editline
-      openssl pkgconfig sqlite boehmgc
-      boost
-
-      # Tests
-      git
-      mercurial
-      jq
-    ]
-    ++ lib.optionals stdenv.isLinux [libseccomp utillinuxMinimal]
-    ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium
-    ++ lib.optional (stdenv.isLinux || stdenv.isDarwin)
-      ((aws-sdk-cpp.override {
-        apis = ["s3" "transfer"];
-        customMemoryManagement = false;
-      }).overrideDerivation (args: {
-        /*
-        patches = args.patches or [] ++ [ (fetchpatch {
-          url = https://github.com/edolstra/aws-sdk-cpp/commit/3e07e1f1aae41b4c8b340735ff9e8c735f0c063f.patch;
-          sha256 = "1pij0v449p166f9l29x7ppzk8j7g9k9mp15ilh5qxp29c7fnvxy2";
-        }) ];
-        */
-      }));
-
-  perlDeps =
-    [ perl
-      perlPackages.DBDSQLite
-    ];
-}
-- 
cgit v1.2.3