Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 2f5037444ea1
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 63bc270f1b98
Choose a head ref
  • 2 commits
  • 1 file changed
  • 2 contributors

Commits on Jan 2, 2021

  1. adminer: Clean up 

    - Drop unused arguments.
- Do not use both php and phpPackages since those can have different PHP versions.
- Do not use with statement just for a single composer package.
- Add phase hooks so that one can easily customize the derivation.
- Clarify license to gpl-2.0-only.
- Add jtojnar to maintainers.
    @jtojnar
    jtojnar committed Jan 2, 2021
    Copy the full SHA
    3af8f7c View commit details

Commits on Jan 3, 2021

  1. Merge pull request #108230 from jtojnar/adminer-cleanup 

    adminer: Clean up
    @SuperSandro2000
    SuperSandro2000 authored Jan 3, 2021

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    63bc270 View commit details
Showing with 18 additions and 4 deletions.
  1. +18 −4 pkgs/servers/adminer/default.nix
22 changes: 18 additions & 4 deletions pkgs/servers/adminer/default.nix
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
{ stdenv, libbsd, fetchurl, phpPackages, php }:
{ stdenv, fetchurl, php }:

stdenv.mkDerivation rec {
version = "4.7.8";
@@ -10,22 +10,36 @@ stdenv.mkDerivation rec {
sha256 = "0k794agvd8pa3mwl0076i7753fzxd41lhr23aih4l2lbdgnzi68z";
};

nativeBuildInputs = with phpPackages; [ php composer ];
nativeBuildInputs = [
php
php.packages.composer
];

buildPhase = ''
runHook preBuild
composer --no-cache run compile
runHook postBuild
'';

installPhase = ''
runHook preInstall
mkdir $out
cp adminer-${version}.php $out/adminer.php
runHook postInstall
'';

meta = with stdenv.lib; {
description = "Database management in a single PHP file";
homepage = "https://www.adminer.org";
license = with licenses; [ asl20 gpl2 ];
maintainers = with maintainers; [ sstef ];
license = with licenses; [ asl20 gpl2Only ];
maintainers = with maintainers; [
jtojnar
sstef
];
platforms = platforms.all;
};
}