diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-16 17:14:44 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-07-16 17:14:44 +0200 |
commit | 6d339e58638d87cfc2a5375d42ac3bb9b0342800 (patch) | |
tree | 04f39662bd8f2a40f6d8047bc8408f608bbfa797 /pkgs/top-level | |
parent | 2efc2ada846eb9db87a6fe6856b39899bd8f5f50 (diff) | |
parent | f001c81c1accfd3c3e9ca96f51a20be92875bc0d (diff) | |
download | nixlib-6d339e58638d87cfc2a5375d42ac3bb9b0342800.tar nixlib-6d339e58638d87cfc2a5375d42ac3bb9b0342800.tar.gz nixlib-6d339e58638d87cfc2a5375d42ac3bb9b0342800.tar.bz2 nixlib-6d339e58638d87cfc2a5375d42ac3bb9b0342800.tar.lz nixlib-6d339e58638d87cfc2a5375d42ac3bb9b0342800.tar.xz nixlib-6d339e58638d87cfc2a5375d42ac3bb9b0342800.tar.zst nixlib-6d339e58638d87cfc2a5375d42ac3bb9b0342800.zip |
Merge staging-next into staging
Diffstat (limited to 'pkgs/top-level')
-rw-r--r-- | pkgs/top-level/all-packages.nix | 29 | ||||
-rw-r--r-- | pkgs/top-level/haskell-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/php-packages.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 5 |
4 files changed, 32 insertions, 10 deletions
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 40e4b1a9f08f..e815305b539e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -429,6 +429,8 @@ with pkgs; portaudioSupport = config.aegisub.portaudioSupport or false; }; + aerospike = callPackage ../servers/nosql/aerospike { }; + aespipe = callPackage ../tools/security/aespipe { }; aescrypt = callPackage ../tools/misc/aescrypt { }; @@ -4917,6 +4919,8 @@ with pkgs; s3cmd = callPackage ../tools/networking/s3cmd { }; + s4cmd = callPackage ../tools/networking/s4cmd { }; + s3gof3r = callPackage ../tools/networking/s3gof3r { }; s6Dns = callPackage ../tools/networking/s6-dns { }; @@ -5245,6 +5249,8 @@ with pkgs; subsonic = callPackage ../servers/misc/subsonic { }; + subfinder = callPackage ../tools/networking/subfinder { }; + surfraw = callPackage ../tools/networking/surfraw { }; swagger-codegen = callPackage ../tools/networking/swagger-codegen { }; @@ -5904,6 +5910,8 @@ with pkgs; gccCross = pkgsCross.ben-nanonote.buildPackages.gccCrossStageStatic; }; + clipnotify = callPackage ../tools/misc/clipnotify { }; + xclip = callPackage ../tools/misc/xclip { }; xcwd = callPackage ../tools/X11/xcwd { }; @@ -10914,6 +10922,8 @@ with pkgs; mergerfs = callPackage ../tools/filesystems/mergerfs { }; + mergerfs-tools = callPackage ../tools/filesystems/mergerfs/tools.nix { }; + ## libGL/libGLU/Mesa stuff # Default libGL implementation, should provide headers and libGL.so/libEGL.so/... to link agains them @@ -11875,6 +11885,8 @@ with pkgs; libpcap = if stdenv.isLinux then libpcap else null; }; + stb = callPackage ../development/libraries/stb { }; + stxxl = callPackage ../development/libraries/stxxl { parallel = true; }; sqlite = lowPrio (callPackage ../development/libraries/sqlite { }); @@ -15464,6 +15476,8 @@ with pkgs; clipgrab = callPackage ../applications/video/clipgrab { }; + clipmenu = callPackage ../applications/misc/clipmenu { }; + clipit = callPackage ../applications/misc/clipit { }; cloud-print-connector = callPackage ../servers/cloud-print-connector { }; @@ -16479,6 +16493,8 @@ with pkgs; gmtp = callPackage ../applications/misc/gmtp {}; + gnomecast = callPackage ../applications/video/gnomecast { }; + gnome-mpv = callPackage ../applications/video/gnome-mpv { }; gollum = callPackage ../applications/misc/gollum { }; @@ -19135,11 +19151,7 @@ with pkgs; xmind = callPackage ../applications/misc/xmind { }; - xneur_0_13 = callPackage ../applications/misc/xneur { }; - - xneur_0_8 = callPackage ../applications/misc/xneur/0.8.nix { }; - - xneur = xneur_0_13; + xneur = callPackage ../applications/misc/xneur { }; gxneur = callPackage ../applications/misc/gxneur { inherit (gnome2) libglade GConf; @@ -20396,6 +20408,8 @@ with pkgs; flintqs = callPackage ../development/libraries/science/math/flintqs { }; + gurobi = callPackage ../applications/science/math/gurobi { }; + jags = callPackage ../applications/science/math/jags { }; @@ -21207,6 +21221,9 @@ with pkgs; lilypond-with-fonts = callPackage ../misc/lilypond/with-fonts.nix { lilypond = lilypond-unstable; }; + + lollypop-portal = callPackages ../misc/lollypop-portal { }; + openlilylib-fonts = callPackage ../misc/lilypond/fonts.nix { }; mailcore2 = callPackage ../development/libraries/mailcore2 { @@ -21869,7 +21886,7 @@ with pkgs; xrq = callPackage ../applications/misc/xrq { }; - nitrokey-app = callPackage ../tools/security/nitrokey-app { }; + nitrokey-app = libsForQt5.callPackage ../tools/security/nitrokey-app { }; nitrokey-udev-rules = callPackage ../tools/security/nitrokey-app/udev-rules.nix { }; fpm2 = callPackage ../tools/security/fpm2 { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cca0b7ba3460..5fef4872db21 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -84,7 +84,7 @@ in rec { buildLlvmPackages = buildPackages.llvmPackages_5; llvmPackages = pkgs.llvmPackages_5; }; - ghcjs = compiler.ghcjs82; + ghcjs = compiler.ghcjs84; ghcjs710 = packages.ghc7103.callPackage ../development/compilers/ghcjs { bootPkgs = packages.ghc7103; inherit (pkgs) cabal-install; @@ -166,7 +166,7 @@ in rec { ghc = bh.compiler.ghcHEAD; compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-head.nix { }; }; - ghcjs = packages.ghcjs82; + ghcjs = packages.ghcjs84; ghcjs710 = callPackage ../development/haskell-modules rec { buildHaskellPackages = ghc.bootPkgs; ghc = bh.compiler.ghcjs710; diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 7861b2a231d0..a1761e68631e 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -383,11 +383,11 @@ let php-cs-fixer = pkgs.stdenv.mkDerivation rec { name = "php-cs-fixer-${version}"; - version = "2.12.1"; + version = "2.12.2"; src = pkgs.fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "1ifwb30wddp5blqnrkdmf0x11dk7nbxj4z2v5403fn7wfhgvibd2"; + sha256 = "19cq04x1wi489259vyad15zy6y0k3qd7dj77pcf74gxqw92hgg5c"; }; phases = [ "installPhase" ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 152a23402c32..de4966ec9539 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -204,6 +204,8 @@ in { aws-xray-sdk = callPackage ../development/python-modules/aws-xray-sdk { }; + aws-adfs = callPackage ../development/python-modules/aws-adfs { }; + # packages defined elsewhere amazon_kclpy = callPackage ../development/python-modules/amazon_kclpy { }; @@ -10338,6 +10340,7 @@ in { }; }; + pycaption = callPackage ../development/python-modules/pycaption { }; pycdio = buildPythonPackage rec { name = "pycdio-2.0.0"; @@ -14527,6 +14530,8 @@ in { }; }; + vega_datasets = callPackage ../development/python-modules/vega_datasets { }; + virtkey = callPackage ../development/python-modules/virtkey { }; virtual-display = callPackage ../development/python-modules/virtual-display { }; |