···1diff --git a/package-build.el b/package-build.el
2-index 29cdb61..c19be1b 100644
3--- a/package-build.el
4+++ b/package-build.el
5-@@ -923,7 +923,6 @@ DIRECTORY is a temporary directory that contains the directory
6- that is put in the tarball."
7- (let* ((name (oref rcp name))
8- (version (oref rcp version))
9-- (time (oref rcp time))
10- (tar (expand-file-name (concat name "-" version ".tar")
11- package-build-archive-dir))
12- (dir (concat name "-" version)))
13-@@ -939,7 +938,7 @@ that is put in the tarball."
14- ;; prevent a reproducible tarball as described at
015 ;; https://reproducible-builds.org/docs/archives.
16 "--sort=name"
17-- (format "--mtime=@%d" time)
18+ "--mtime=@0"
19 "--owner=0" "--group=0" "--numeric-owner"
20 "--pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime"))
21 (when (and package-build-verbose noninteractive)
000000000000000000
···1diff --git a/package-build.el b/package-build.el
2+index e572045..9eb0f82 100644
3--- a/package-build.el
4+++ b/package-build.el
5+@@ -415,7 +415,7 @@ (defun package-build--write-pkg-file (desc dir)
6+ (princ ";; Local Variables:\n;; no-byte-compile: t\n;; End:\n"
7+ (current-buffer)))))
8+9+-(defun package-build--create-tar (name version directory mtime)
10++(defun package-build--create-tar (name version directory)
11+ "Create a tar file containing the contents of VERSION of package NAME.
12+ DIRECTORY is a temporary directory that contains the directory
13+ that is put in the tarball. MTIME is used as the modification
14+@@ -434,7 +434,7 @@ (defun package-build--create-tar (name version directory mtime)
15+ ;; prevent a reproducable tarball as described at
16 ;; https://reproducible-builds.org/docs/archives.
17 "--sort=name"
18+- (format "--mtime=@%d" mtime)
19+ "--mtime=@0"
20 "--owner=0" "--group=0" "--numeric-owner"
21 "--pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime"))
22 (when (and package-build-verbose noninteractive)
23+@@ -848,12 +848,11 @@ (defun package-build--build-multi-file-package (rcp version commit files source-
24+ (package-build--desc-from-library
25+ name version commit files 'tar)
26+ (error "%s[-pkg].el matching package name is missing"
27+- name))))
28+- (mtime (package-build--get-commit-time rcp commit)))
29++ name)))))
30+ (package-build--copy-package-files files source-dir target)
31+ (package-build--write-pkg-file desc target)
32+ (package-build--generate-info-files files source-dir target)
33+- (package-build--create-tar name version tmp-dir mtime)
34++ (package-build--create-tar name version tmp-dir)
35+ (package-build--write-pkg-readme name files source-dir)
36+ (package-build--write-archive-entry desc))
37+ (delete-directory tmp-dir t nil))))
38+--
39+2.37.2
40+
···234 });
235236in {
0000000237238 # If you do upgrade here, please update in pkgs/top-level/release.nix
239 # the permitted insecure version to ensure it gets cached for our users
···279 };
280 };
281282- openssl_3_1 = common {
283- version = "3.1.4";
284- hash = "sha256-hAr1Nmq5tSK95SWCa+PvD7Cvgcap69hMqmAP6hcx7uM=";
285286 patches = [
287 ./3.0/nix-ssl-cert-file.patch
···291 ./3.0/openssl-disable-kernel-detection.patch
292293 (if stdenv.hostPlatform.isDarwin
294- then ./use-etc-ssl-certs-darwin.patch
295- else ./use-etc-ssl-certs.patch)
296 ];
297298 withDocs = true;
···234 });
235236in {
237+ # intended version "policy":
238+ # - 1.1 as long as some package exists, which does not build without it
239+ # - latest 3.x LTS
240+ # - latest 3.x non-LTS as preview/for development
241+ #
242+ # - other versions in between only when reasonable need is stated for some package
243+ # - backport every security critical fix release e.g. 3.0.y -> 3.0.y+1 but no new version, e.g. 3.1 -> 3.2
244245 # If you do upgrade here, please update in pkgs/top-level/release.nix
246 # the permitted insecure version to ensure it gets cached for our users
···286 };
287 };
288289+ openssl_3_2 = common {
290+ version = "3.2.0";
291+ hash = "sha256-FMgm8Hx+QzcG+1xp+p4l2rlWhIRLTJYqLPG/GD60aQ4=";
292293 patches = [
294 ./3.0/nix-ssl-cert-file.patch
···298 ./3.0/openssl-disable-kernel-detection.patch
299300 (if stdenv.hostPlatform.isDarwin
301+ then ./3.2/use-etc-ssl-certs-darwin.patch
302+ else ./3.2/use-etc-ssl-certs.patch)
303 ];
304305 withDocs = true;
···5}:
6crystal.buildCrystalPackage rec {
7 pname = "gi-crystal";
8- version = "0.19.0";
910 src = fetchFromGitHub {
11 owner = "hugopl";
12 repo = "gi-crystal";
13 rev = "v${version}";
14- hash = "sha256-SwBzGAgs0cBbBYXtaJSDWjORE+vrvI5aKG9kaC9VA4o=";
15 };
1617 # Make sure gi-crystal picks up the name of the so or dylib and not the leading nix store path
···5}:
6crystal.buildCrystalPackage rec {
7 pname = "gi-crystal";
8+ version = "0.21.0";
910 src = fetchFromGitHub {
11 owner = "hugopl";
12 repo = "gi-crystal";
13 rev = "v${version}";
14+ hash = "sha256-hL+4MvJn1z9UKCtyvU4zzIxOwRyYQ3Qt4qRb5F0J+sg=";
15 };
1617 # Make sure gi-crystal picks up the name of the so or dylib and not the leading nix store path
···89 else null) null (lib.attrNames archLookupTable);
9091 archLookupTable = table.${localSystem.libc}
92- or (abort "unsupported libc for the pure Linux stdenv");
93 files = archLookupTable.${localSystem.system} or (if getCompatibleTools != null then getCompatibleTools
94- else (abort "unsupported platform for the pure Linux stdenv"));
95 in files
96}:
97
···89 else null) null (lib.attrNames archLookupTable);
9091 archLookupTable = table.${localSystem.libc}
92+ or (throw "unsupported libc for the pure Linux stdenv");
93 files = archLookupTable.${localSystem.system} or (if getCompatibleTools != null then getCompatibleTools
94+ else (throw "unsupported platform for the pure Linux stdenv"));
95 in files
96}:
97
···67 # ld will find the right path to load the library, including for 32-bit apps.
8 LD_PRELOAD="${GAMEMODEAUTO_NAME}${LD_PRELOAD:+:$LD_PRELOAD}"
9-+LD_LIBRARY_PATH="@libraryPath@${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
1011-exec env LD_PRELOAD="${LD_PRELOAD}" $GAMEMODERUNEXEC "$@"
12+exec env LD_PRELOAD="${LD_PRELOAD}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" $GAMEMODERUNEXEC "$@"
···67 # ld will find the right path to load the library, including for 32-bit apps.
8 LD_PRELOAD="${GAMEMODEAUTO_NAME}${LD_PRELOAD:+:$LD_PRELOAD}"
9++LD_LIBRARY_PATH="@libraryPath@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
1011-exec env LD_PRELOAD="${LD_PRELOAD}" $GAMEMODERUNEXEC "$@"
12+exec env LD_PRELOAD="${LD_PRELOAD}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" $GAMEMODERUNEXEC "$@"
+1
pkgs/tools/misc/esphome/default.nix
···75 # esptool is used in esphomeyaml/__main__.py
76 # git is used in esphomeyaml/writer.py
77 "--prefix PATH : ${lib.makeBinPath [ platformio esptool git ]}"
078 "--set ESPHOME_USE_SUBPROCESS ''"
79 ];
80
···75 # esptool is used in esphomeyaml/__main__.py
76 # git is used in esphomeyaml/writer.py
77 "--prefix PATH : ${lib.makeBinPath [ platformio esptool git ]}"
78+ "--prefix PYTHONPATH : $PYTHONPATH" # will show better error messages
79 "--set ESPHOME_USE_SUBPROCESS ''"
80 ];
81