diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-09-21 06:23:26 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-09-21 06:23:26 +0000 |
commit | 071a9fc320fae79a4613cc089992e5b55dbf307d (patch) | |
tree | 4a47655cbb1ac225edcde50f43a097f8d5ab2417 /pkgs/build-support | |
parent | 7da9ac9ae62b66fd2f65009748c54853507687a2 (diff) | |
parent | d3270d6b32c6a5404c2429e20ab75969d8376d1d (diff) | |
download | nixlib-071a9fc320fae79a4613cc089992e5b55dbf307d.tar nixlib-071a9fc320fae79a4613cc089992e5b55dbf307d.tar.gz nixlib-071a9fc320fae79a4613cc089992e5b55dbf307d.tar.bz2 nixlib-071a9fc320fae79a4613cc089992e5b55dbf307d.tar.lz nixlib-071a9fc320fae79a4613cc089992e5b55dbf307d.tar.xz nixlib-071a9fc320fae79a4613cc089992e5b55dbf307d.tar.zst nixlib-071a9fc320fae79a4613cc089992e5b55dbf307d.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/build-support')
-rw-r--r-- | pkgs/build-support/docker/default.nix | 1 | ||||
-rw-r--r-- | pkgs/build-support/docker/examples.nix | 17 | ||||
-rw-r--r-- | pkgs/build-support/emacs/melpa.nix | 23 | ||||
-rw-r--r-- | pkgs/build-support/emacs/package-build-dont-use-mtime.patch | 40 |
4 files changed, 76 insertions, 5 deletions
diff --git a/pkgs/build-support/docker/default.nix b/pkgs/build-support/docker/default.nix index 6876e9e73588..e5b39cdd9dce 100644 --- a/pkgs/build-support/docker/default.nix +++ b/pkgs/build-support/docker/default.nix @@ -794,6 +794,7 @@ rec { # This provides the ca bundle in common locations caCertificates = runCommand "ca-certificates" { } '' + mkdir -p $out/etc/ssl/certs $out/etc/pki/tls/certs # Old NixOS compatibility. ln -s ${cacert}/etc/ssl/certs/ca-bundle.crt $out/etc/ssl/certs/ca-bundle.crt # NixOS canonical location + Debian/Ubuntu/Arch/Gentoo compatibility. diff --git a/pkgs/build-support/docker/examples.nix b/pkgs/build-support/docker/examples.nix index ff3934941c7b..1e9f07045e37 100644 --- a/pkgs/build-support/docker/examples.nix +++ b/pkgs/build-support/docker/examples.nix @@ -698,4 +698,21 @@ rec { tag = "latest"; contents = [ pkgs.bashInteractive ./test-dummy ]; }; + + # ensure that caCertificates builds + image-with-certs = buildImage { + name = "image-with-certs"; + tag = "latest"; + + copyToRoot = pkgs.buildEnv { + name = "image-with-certs-root"; + paths = [ + pkgs.coreutils + pkgs.dockerTools.caCertificates + ]; + }; + + config = { + }; + }; } diff --git a/pkgs/build-support/emacs/melpa.nix b/pkgs/build-support/emacs/melpa.nix index 924e6d95f14a..85bc8aa37b3a 100644 --- a/pkgs/build-support/emacs/melpa.nix +++ b/pkgs/build-support/emacs/melpa.nix @@ -35,11 +35,24 @@ import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({ then pname else ename; - packageBuild = fetchFromGitHub { - owner = "melpa"; - repo = "package-build"; - rev = "35017a2d87376c70c3239f48bdbac7efca85aa10"; - sha256 = "07hdmam85452v4r2vaabj1qfyami1hgbh0jgj9dcwbkpr0y1gvqj"; + packageBuild = stdenv.mkDerivation { + name = "package-build"; + src = fetchFromGitHub { + owner = "melpa"; + repo = "package-build"; + rev = "c3c535e93d9dc92acd21ebc4b15016b5c3b90e7d"; + sha256 = "17z0wbqdd6fspbj43yq8biff6wfggk74xgnaf1xx6ynsp1i74is5"; + }; + + patches = [ ./package-build-dont-use-mtime.patch ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = " + mkdir -p $out + cp -r * $out + "; }; elpa2nix = ./elpa2nix.el; diff --git a/pkgs/build-support/emacs/package-build-dont-use-mtime.patch b/pkgs/build-support/emacs/package-build-dont-use-mtime.patch new file mode 100644 index 000000000000..fe94de57a300 --- /dev/null +++ b/pkgs/build-support/emacs/package-build-dont-use-mtime.patch @@ -0,0 +1,40 @@ +diff --git a/package-build.el b/package-build.el +index e572045..9eb0f82 100644 +--- a/package-build.el ++++ b/package-build.el +@@ -415,7 +415,7 @@ (defun package-build--write-pkg-file (desc dir) + (princ ";; Local Variables:\n;; no-byte-compile: t\n;; End:\n" + (current-buffer))))) + +-(defun package-build--create-tar (name version directory mtime) ++(defun package-build--create-tar (name version directory) + "Create a tar file containing the contents of VERSION of package NAME. + DIRECTORY is a temporary directory that contains the directory + that is put in the tarball. MTIME is used as the modification +@@ -434,7 +434,7 @@ (defun package-build--create-tar (name version directory mtime) + ;; prevent a reproducable tarball as described at + ;; https://reproducible-builds.org/docs/archives. + "--sort=name" +- (format "--mtime=@%d" mtime) ++ "--mtime=@0" + "--owner=0" "--group=0" "--numeric-owner" + "--pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime")) + (when (and package-build-verbose noninteractive) +@@ -848,12 +848,11 @@ (defun package-build--build-multi-file-package (rcp version commit files source- + (package-build--desc-from-library + name version commit files 'tar) + (error "%s[-pkg].el matching package name is missing" +- name)))) +- (mtime (package-build--get-commit-time rcp commit))) ++ name))))) + (package-build--copy-package-files files source-dir target) + (package-build--write-pkg-file desc target) + (package-build--generate-info-files files source-dir target) +- (package-build--create-tar name version tmp-dir mtime) ++ (package-build--create-tar name version tmp-dir) + (package-build--write-pkg-readme name files source-dir) + (package-build--write-archive-entry desc)) + (delete-directory tmp-dir t nil)))) +-- +2.37.2 + |