diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-12 09:47:19 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-12 09:47:19 +0100 |
| commit | 960f062825d22e328828766f4910b702f81ddade (patch) | |
| tree | fa16e624b184fa3ee21681ac9a98eaf6fbef4ce3 /pkgs/top-level | |
| parent | 1a654573b0a29c5ac8bbe16169cd544c02e945a9 (diff) | |
| parent | e5672143d86ef0beb4b200105330e7da65c9d773 (diff) | |
| download | nixpkgs-960f062825d22e328828766f4910b702f81ddade.tar nixpkgs-960f062825d22e328828766f4910b702f81ddade.tar.gz nixpkgs-960f062825d22e328828766f4910b702f81ddade.tar.bz2 nixpkgs-960f062825d22e328828766f4910b702f81ddade.tar.lz nixpkgs-960f062825d22e328828766f4910b702f81ddade.tar.xz nixpkgs-960f062825d22e328828766f4910b702f81ddade.tar.zst nixpkgs-960f062825d22e328828766f4910b702f81ddade.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/top-level')
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/php-packages.nix | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35a2a68d2e1..f0b50eb987f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1862,6 +1862,8 @@ in jotta-cli = callPackage ../applications/misc/jotta-cli { }; + jwt-cli = callPackage ../tools/security/jwt-cli { }; + kapacitor = callPackage ../servers/monitoring/kapacitor { }; kisslicer = callPackage ../tools/misc/kisslicer { }; @@ -6886,6 +6888,8 @@ in ttylog = callPackage ../tools/misc/ttylog { }; + tuir = callPackage ../applications/misc/tuir { }; + turses = callPackage ../applications/networking/instant-messengers/turses { }; oysttyer = callPackage ../applications/networking/instant-messengers/oysttyer { }; @@ -20702,7 +20706,9 @@ in ffmpeg = ffmpeg_2; }; - pcsx2 = pkgsi686Linux.callPackage ../misc/emulators/pcsx2 { }; + pcsx2 = pkgsi686Linux.callPackage ../misc/emulators/pcsx2 { + wxGTK = pkgsi686Linux.wxGTK30; + }; pekwm = callPackage ../applications/window-managers/pekwm { }; @@ -20932,7 +20938,7 @@ in qmetro = callPackage ../applications/misc/qmetro { }; - qmidinet = callPackage ../applications/audio/qmidinet { }; + qmidinet = libsForQt5.callPackage ../applications/audio/qmidinet { }; qmidiroute = callPackage ../applications/audio/qmidiroute { }; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 6adc4c837d5..8a610392110 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -429,12 +429,12 @@ let }; phpstan = mkDerivation rec { - version = "0.12.3"; + version = "0.12.4"; pname = "phpstan"; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "08ya50qf75nq8ypyhb0vsqnj166kc27rc8iasxr3y7kssbfd95ai"; + sha256 = "1h386zsbfw9f1r00pjbvj749q1fg5q22sgrnx7rqjrnwmbl5mh36"; }; phases = [ "installPhase" ]; |