···11diff --git a/package-build.el b/package-build.el
22-index 29cdb61..c19be1b 100644
22+index e572045..9eb0f82 100644
33--- a/package-build.el
44+++ b/package-build.el
55-@@ -923,7 +923,6 @@ DIRECTORY is a temporary directory that contains the directory
66- that is put in the tarball."
77- (let* ((name (oref rcp name))
88- (version (oref rcp version))
99-- (time (oref rcp time))
1010- (tar (expand-file-name (concat name "-" version ".tar")
1111- package-build-archive-dir))
1212- (dir (concat name "-" version)))
1313-@@ -939,7 +938,7 @@ that is put in the tarball."
1414- ;; prevent a reproducible tarball as described at
55+@@ -415,7 +415,7 @@ (defun package-build--write-pkg-file (desc dir)
66+ (princ ";; Local Variables:\n;; no-byte-compile: t\n;; End:\n"
77+ (current-buffer)))))
88+99+-(defun package-build--create-tar (name version directory mtime)
1010++(defun package-build--create-tar (name version directory)
1111+ "Create a tar file containing the contents of VERSION of package NAME.
1212+ DIRECTORY is a temporary directory that contains the directory
1313+ that is put in the tarball. MTIME is used as the modification
1414+@@ -434,7 +434,7 @@ (defun package-build--create-tar (name version directory mtime)
1515+ ;; prevent a reproducable tarball as described at
1516 ;; https://reproducible-builds.org/docs/archives.
1617 "--sort=name"
1717-- (format "--mtime=@%d" time)
1818+- (format "--mtime=@%d" mtime)
1819+ "--mtime=@0"
1920 "--owner=0" "--group=0" "--numeric-owner"
2021 "--pax-option=exthdr.name=%d/PaxHeaders/%f,delete=atime,delete=ctime"))
2122 (when (and package-build-verbose noninteractive)
2323+@@ -848,12 +848,11 @@ (defun package-build--build-multi-file-package (rcp version commit files source-
2424+ (package-build--desc-from-library
2525+ name version commit files 'tar)
2626+ (error "%s[-pkg].el matching package name is missing"
2727+- name))))
2828+- (mtime (package-build--get-commit-time rcp commit)))
2929++ name)))))
3030+ (package-build--copy-package-files files source-dir target)
3131+ (package-build--write-pkg-file desc target)
3232+ (package-build--generate-info-files files source-dir target)
3333+- (package-build--create-tar name version tmp-dir mtime)
3434++ (package-build--create-tar name version tmp-dir)
3535+ (package-build--write-pkg-readme name files source-dir)
3636+ (package-build--write-archive-entry desc))
3737+ (delete-directory tmp-dir t nil))))
3838+--
3939+2.37.2
4040+
···234234 });
235235236236in {
237237+ # intended version "policy":
238238+ # - 1.1 as long as some package exists, which does not build without it
239239+ # - latest 3.x LTS
240240+ # - latest 3.x non-LTS as preview/for development
241241+ #
242242+ # - other versions in between only when reasonable need is stated for some package
243243+ # - 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
237244238245 # If you do upgrade here, please update in pkgs/top-level/release.nix
239246 # the permitted insecure version to ensure it gets cached for our users
···279286 };
280287 };
281288282282- openssl_3_1 = common {
283283- version = "3.1.4";
284284- hash = "sha256-hAr1Nmq5tSK95SWCa+PvD7Cvgcap69hMqmAP6hcx7uM=";
289289+ openssl_3_2 = common {
290290+ version = "3.2.0";
291291+ hash = "sha256-FMgm8Hx+QzcG+1xp+p4l2rlWhIRLTJYqLPG/GD60aQ4=";
285292286293 patches = [
287294 ./3.0/nix-ssl-cert-file.patch
···291298 ./3.0/openssl-disable-kernel-detection.patch
292299293300 (if stdenv.hostPlatform.isDarwin
294294- then ./use-etc-ssl-certs-darwin.patch
295295- else ./use-etc-ssl-certs.patch)
301301+ then ./3.2/use-etc-ssl-certs-darwin.patch
302302+ else ./3.2/use-etc-ssl-certs.patch)
296303 ];
297304298305 withDocs = true;
···55}:
66crystal.buildCrystalPackage rec {
77 pname = "gi-crystal";
88- version = "0.19.0";
88+ version = "0.21.0";
991010 src = fetchFromGitHub {
1111 owner = "hugopl";
1212 repo = "gi-crystal";
1313 rev = "v${version}";
1414- hash = "sha256-SwBzGAgs0cBbBYXtaJSDWjORE+vrvI5aKG9kaC9VA4o=";
1414+ hash = "sha256-hL+4MvJn1z9UKCtyvU4zzIxOwRyYQ3Qt4qRb5F0J+sg=";
1515 };
16161717 # Make sure gi-crystal picks up the name of the so or dylib and not the leading nix store path
···8989 else null) null (lib.attrNames archLookupTable);
90909191 archLookupTable = table.${localSystem.libc}
9292- or (abort "unsupported libc for the pure Linux stdenv");
9292+ or (throw "unsupported libc for the pure Linux stdenv");
9393 files = archLookupTable.${localSystem.system} or (if getCompatibleTools != null then getCompatibleTools
9494- else (abort "unsupported platform for the pure Linux stdenv"));
9494+ else (throw "unsupported platform for the pure Linux stdenv"));
9595 in files
9696}:
9797
···6677 # ld will find the right path to load the library, including for 32-bit apps.
88 LD_PRELOAD="${GAMEMODEAUTO_NAME}${LD_PRELOAD:+:$LD_PRELOAD}"
99-+LD_LIBRARY_PATH="@libraryPath@${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH"
99++LD_LIBRARY_PATH="@libraryPath@${LD_LIBRARY_PATH:+:$LD_LIBRARY_PATH}"
10101111-exec env LD_PRELOAD="${LD_PRELOAD}" $GAMEMODERUNEXEC "$@"
1212+exec env LD_PRELOAD="${LD_PRELOAD}" LD_LIBRARY_PATH="${LD_LIBRARY_PATH}" $GAMEMODERUNEXEC "$@"
+1
pkgs/tools/misc/esphome/default.nix
···7575 # esptool is used in esphomeyaml/__main__.py
7676 # git is used in esphomeyaml/writer.py
7777 "--prefix PATH : ${lib.makeBinPath [ platformio esptool git ]}"
7878+ "--prefix PYTHONPATH : $PYTHONPATH" # will show better error messages
7879 "--set ESPHOME_USE_SUBPROCESS ''"
7980 ];
8081