diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-12 09:47:43 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-12 09:47:43 +0100 |
| commit | b3245241d8c630aa2b9435a7e31c50fdfba2a0a0 (patch) | |
| tree | 7c5a9f88f7bd0f47d43a262d7a547779752bda24 /pkgs/top-level | |
| parent | cd827f2209b35c4c3bdd5492c3e9a9d351e3e3b3 (diff) | |
| parent | 960f062825d22e328828766f4910b702f81ddade (diff) | |
| download | nixlib-b3245241d8c630aa2b9435a7e31c50fdfba2a0a0.tar nixlib-b3245241d8c630aa2b9435a7e31c50fdfba2a0a0.tar.gz nixlib-b3245241d8c630aa2b9435a7e31c50fdfba2a0a0.tar.bz2 nixlib-b3245241d8c630aa2b9435a7e31c50fdfba2a0a0.tar.lz nixlib-b3245241d8c630aa2b9435a7e31c50fdfba2a0a0.tar.xz nixlib-b3245241d8c630aa2b9435a7e31c50fdfba2a0a0.tar.zst nixlib-b3245241d8c630aa2b9435a7e31c50fdfba2a0a0.zip | |
Merge staging-next into staging
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 e43ad8c16640..75235a6a4083 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 6adc4c837d59..8a610392110d 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" ]; |