Unverified Commit 3b8189b7 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #263820 from wegank/disarchive-rename 

disarchive: rename from guile-disarchive, fix program
parents af17a284 f128c2a5

pkgs/by-name/gu/guile-disarchive/package.nix→pkgs/by-name/di/disarchive/package.nix

+15 −3
Original line number Diff line number Diff line
@@ -6,12 +6,13 @@ 
, guile-gcrypt

, guile-lzma

, guile-quickcheck

, makeWrapper

, pkg-config

, zlib

}:



stdenv.mkDerivation rec {

  pname = "guile-disarchive";

  pname = "disarchive";

  version = "0.5.0";



  src = fetchurl {
@@ -24,7 +25,9 @@ stdenv.mkDerivation rec { 
  nativeBuildInputs = [

    autoreconfHook

    guile

    guile-gcrypt

    guile-lzma

    makeWrapper

    pkg-config

  ];
@@ -38,14 +41,23 @@ stdenv.mkDerivation rec { 
    guile-lzma

  ];



  nativeCheckInputs = [ guile-quickcheck ];



  doCheck = !stdenv.isDarwin;



  nativeCheckInputs = [

    guile-quickcheck

  ];



  postInstall = ''

    wrapProgram $out/bin/disarchive \

      --prefix GUILE_LOAD_PATH : "$out/${guile.siteDir}:$GUILE_LOAD_PATH" \

      --prefix GUILE_LOAD_COMPILED_PATH : "$out/${guile.siteCcacheDir}:$GUILE_LOAD_COMPILED_PATH"

  '';



  meta = with lib; {

    description = "Disassemble software into data and metadata";

    homepage = "https://ngyro.com/software/disarchive.html";

    license = licenses.gpl3Plus;

    mainProgram = "disarchive";

    maintainers = with maintainers; [ foo-dogsquared ];

    platforms = guile.meta.platforms;

  };

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

+3 −3
Original line number Diff line number Diff line
@@ -2,11 +2,11 @@ 
, stdenv

, fetchurl

, autoreconfHook

, disarchive

, git

, glibcLocales

, guile

, guile-avahi

, guile-disarchive

, guile-gcrypt

, guile-git

, guile-gnutls
@@ -49,11 +49,11 @@ stdenv.mkDerivation rec { 


  nativeBuildInputs = [

    autoreconfHook

    disarchive

    git

    glibcLocales

    guile

    guile-avahi

    guile-disarchive

    guile-gcrypt

    guile-git

    guile-gnutls
@@ -82,8 +82,8 @@ stdenv.mkDerivation rec { 
  ];



  propagatedBuildInputs = [

    disarchive

    guile-avahi

    guile-disarchive

    guile-gcrypt

    guile-git

    guile-gnutls

pkgs/top-level/aliases.nix

+1 −0
Original line number Diff line number Diff line
@@ -339,6 +339,7 @@ mapAliases ({ 
  gr-rds = throw "'gr-rds' has been renamed to/replaced by 'gnuradio3_7.pkgs.rds'"; # Converted to throw 2023-09-10

  grub2_full = grub2; # Added 2022-11-18

  grub = throw "grub1 was removed after not being maintained upstream for a decade. Please switch to another bootloader"; # Added 2023-04-11

  guile-disarchive = disarchive; # Added 2023-10-27

  guile-lint = throw "'guile-lint' has been removed, please use 'guild lint' instead"; # Added 2023-10-16



  ### H ###