Unverified Commit 7198fdca authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

nix-serve: 2024-09-18 -> 2024-09-20 (#433594)

parents ae14de49 67656c9d

pkgs/by-name/ni/nix-serve/package.nix

+11 −22
Original line number Diff line number Diff line
@@ -3,17 +3,14 @@ 
  stdenv,

  fetchFromGitHub,

  bzip2,

  nixVersions,

  nix,

  makeWrapper,

  nixosTests,

  fetchpatch,

}:



let

  rev = "77ffa33d83d2c7c6551c5e420e938e92d72fec24";

  sha256 = "sha256-MJRdVO2pt7wjOu5Hk0eVeNbk5bK5+Uo/Gh9XfO4OlMY=";

  nix = nixVersions.nix_2_24;

  inherit (nix.perl-bindings) perl;

  rev = "a7e046db4b29d422fc9aac60ea6b82b31399951a";

  sha256 = "sha256-6ZQ0OLijq6UtOtUqRdFC19+helhU0Av6MvGCZf6XmcQ=";

in



stdenv.mkDerivation {
@@ -26,14 +23,6 @@ stdenv.mkDerivation { 
    inherit rev sha256;

  };



  patches = [

    # Part of https://github.com/edolstra/nix-serve/pull/61

    (fetchpatch {

      url = "https://github.com/edolstra/nix-serve/commit/9e434fff4486afeb3cc3f631f6dc56492b204704.patch";

      sha256 = "sha256-TxQ6q6UApTKsYIMdr/RyrkKSA3k47stV63bTbxchNTU=";

    })

  ];



  nativeBuildInputs = [ makeWrapper ];



  dontBuild = true;
@@ -42,7 +31,7 @@ stdenv.mkDerivation { 
    install -Dm0755 nix-serve.psgi $out/libexec/nix-serve/nix-serve.psgi



    makeWrapper ${

      perl.withPackages (p: [

      nix.perl-bindings.perl.withPackages (p: [

        p.DBDSQLite

        p.Plack

        p.Starman