Unverified Commit 681d5b9e authored by Adam C. Stephens's avatar Adam C. Stephens Committed by GitHub
Browse files

guix: 1.4.0-unstable-2025-06-24 -> 1.5.0 (#483127)

parents 055fdf03 61c6ed24

pkgs/by-name/gu/guile-git/package.nix

+16 −0
Original line number Diff line number Diff line
@@ -2,6 +2,7 @@ 
  lib,

  stdenv,

  fetchFromGitLab,

  fetchpatch,

  guile,

  libgit2,

  scheme-bytestructures,
@@ -21,6 +22,21 @@ stdenv.mkDerivation (finalAttrs: { 
    hash = "sha256-ihKpEnng6Uemrguecbd25vElEhIu2Efb86aM8679TAc=";

  };



  patches = [

    # remove > 0.10.0

    (fetchpatch {

      name = "catch-git-error-guile";

      url = "https://gitlab.com/guile-git/guile-git/-/commit/9c76c6b31e217c470c8576172b123be9c373dc9b.diff";

      hash = "sha256-H0s7Ebl+HNL8Zak58kJmFETWZJcNq+Z5gTGRqU9gj58=";

    })

    # remove > 0.10.0

    (fetchpatch {

      name = "test-typo";

      url = "https://gitlab.com/guile-git/guile-git/-/commit/4451c0808fbdf8cd13d486a18b03881f998f6e88.diff";

      hash = "sha256-K2f67WXUBLI/09eF8Xg3JMX7gkISFTZK3yHu0VDVQ4E=";

    })

  ];



  strictDeps = true;

  nativeBuildInputs = [

    autoreconfHook

pkgs/by-name/gu/guix/package.nix

+10 −10
Original line number Diff line number Diff line
@@ -38,17 +38,14 @@ 
  storeDir ? "/gnu/store",

  confDir ? "/etc",

}:

let

  rev = "30a5d140aa5a789a362749d057754783fea83dde";

in

stdenv.mkDerivation rec {

stdenv.mkDerivation (finalAttrs: {

  pname = "guix";

  version = "1.4.0-unstable-2025-06-24";

  version = "1.5.0";



  src = fetchgit {

    url = "https://codeberg.org/guix/guix.git";

    inherit rev;

    hash = "sha256-QsOYApnwA2hb1keSv6p3EpMT09xCs9uyoSeIdXzftF0=";

    tag = "v${finalAttrs.version}";

    hash = "sha256-/g8JMUGM5GaZjtPLnl4vlrBNYMxSTjsHUDdhKLtHaQA=";

  };



  patches = [
@@ -124,10 +121,13 @@ stdenv.mkDerivation rec { 
    "--localstatedir=${stateDir}"

    "--sysconfdir=${confDir}"

    "--with-bash-completion-dir=$(out)/etc/bash_completion.d"

    "--with-zsh-completion-dir=$(out)/share/zsh/site-functions"

    "--with-fish-completion-dir=$(out)/share/fish/vendor_completions.d"

    "--with-apparmor-profile-dir=$(out)/etc/apparmor.d"

  ];



  preAutoreconf = ''

    echo ${version} > .tarball-version

    echo ${finalAttrs.version} > .tarball-version

    ./bootstrap

  '';
@@ -161,7 +161,7 @@ stdenv.mkDerivation rec { 
      Guix is based on the Nix package manager.

    '';

    homepage = "https://guix.gnu.org/";

    changelog = "https://codeberg.org/guix/guix/raw/commit/${rev}/NEWS";

    changelog = "https://codeberg.org/guix/guix/raw/tag/v${finalAttrs.version}/NEWS";

    license = lib.licenses.gpl3Plus;

    mainProgram = "guix";

    maintainers = with lib.maintainers; [
@@ -170,4 +170,4 @@ stdenv.mkDerivation rec { 
    ];

    platforms = lib.platforms.linux;

  };

}
 
})