Skip to content
This repository was archived by the owner on Apr 12, 2021. It is now read-only.
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-channels
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 72ad1ebda9e0
Choose a base ref
...
head repository: NixOS/nixpkgs-channels
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: d3634b0facaa
Choose a head ref
  • 4 commits
  • 3 files changed
  • 3 contributors

Commits on Mar 29, 2019

  1. nixos/nextcloud: fix escapings and ocm-provider 

    (cherry picked from commit 415b927)
    @bachp @flokli
    bachp authored and flokli committed Mar 29, 2019
    Copy the full SHA
    df8fa2c View commit details

  2. Merge pull request #58539 from herrwiese/nc-backport-ocm-fix 

    nixos/nextcloud: Cherry-pick nginx recommendations to 19.03
    @flokli
    flokli authored Mar 29, 2019

    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
    d11c540 View commit details

  3. clblas: turn of gtest, fix build 

    clblas does not work anymore with gmock 1.8.1.
Turning off the test suite fixes the build.

(cherry picked from commit 4c74ee9)
    @markuskowa @infinisil
    markuskowa authored and infinisil committed Mar 29, 2019

    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
    5141dca View commit details

  4. libgpuarray: fix build 

    move cmake into nativeBuildInputs

(cherry picked from commit ad1e7b0)
    @markuskowa @infinisil
    markuskowa authored and infinisil committed Mar 29, 2019

    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
    d3634b0 View commit details
10 changes: 5 additions & 5 deletions nixos/modules/services/web-apps/nextcloud.nix
View file
Original file line number Diff line number Diff line change
@@ -427,19 +427,19 @@ in {
priority = 210;
extraConfig = "return 301 $scheme://$host/remote.php/dav;";
};
"~ ^/(?:build|tests|config|lib|3rdparty|templates|data)/" = {
"~ ^\\/(?:build|tests|config|lib|3rdparty|templates|data)\\/" = {
priority = 300;
extraConfig = "deny all;";
};
"~ ^/(?:\\.|autotest|occ|issue|indie|db_|console)" = {
"~ ^\\/(?:\\.|autotest|occ|issue|indie|db_|console)" = {
priority = 300;
extraConfig = "deny all;";
};
"~ ^/(?:index|remote|public|cron|core/ajax/update|status|ocs/v[12]|updater/.+|ocs-provider/.+)\\.php(?:$|/)" = {
"~ ^\\/(?:index|remote|public|cron|core/ajax\\/update|status|ocs\\/v[12]|updater\\/.+|ocs-provider\\/.+|ocm-provider\\/.+)\\.php(?:$|\\/)" = {
priority = 500;
extraConfig = ''
include ${config.services.nginx.package}/conf/fastcgi.conf;
fastcgi_split_path_info ^(.+\.php)(/.*)$;
fastcgi_split_path_info ^(.+\.php)(\\/.*)$;
fastcgi_param PATH_INFO $fastcgi_path_info;
fastcgi_param HTTPS ${if cfg.https then "on" else "off"};
fastcgi_param modHeadersAvailable true;
@@ -450,7 +450,7 @@ in {
fastcgi_read_timeout 120s;
'';
};
"~ ^/(?:updater|ocs-provider|ocm-provider)(?:$|\/)".extraConfig = ''
"~ ^\\/(?:updater|ocs-provider|ocm-provider)(?:$|\\/)".extraConfig = ''
try_files $uri/ =404;
index index.php;
'';
14 changes: 6 additions & 8 deletions pkgs/development/libraries/science/math/clblas/default.nix
View file
Original file line number Diff line number Diff line change
@@ -8,21 +8,20 @@
, ocl-icd
, opencl-headers
, Accelerate, CoreGraphics, CoreVideo, OpenCL
, gtest
}:

stdenv.mkDerivation rec {
name = "clblas-${version}";
name = "clblas-${version}";
version = "2.12";

src = fetchFromGitHub {
owner = "clMathLibraries";
owner = "clMathLibraries";
repo = "clBLAS";
rev = "v${version}";
sha256 = "154mz52r5hm0jrp5fqrirzzbki14c1jkacj75flplnykbl36ibjs";
};
};

patches = [ ./platform.patch ];
patches = [ ./platform.patch ];

postPatch = ''
sed -i -re 's/(set\(\s*Boost_USE_STATIC_LIBS\s+).*/\1OFF\ \)/g' src/CMakeLists.txt
@@ -33,7 +32,7 @@ stdenv.mkDerivation rec {
'';

cmakeFlags = [
"-DUSE_SYSTEM_GTEST=ON"
"-DBUILD_TEST=OFF"
];

buildInputs = [
@@ -42,7 +41,6 @@ stdenv.mkDerivation rec {
blas
python
boost
gtest
] ++ stdenv.lib.optionals (!stdenv.isDarwin) [
ocl-icd
opencl-headers
@@ -61,7 +59,7 @@ stdenv.mkDerivation rec {
homepage = "https://github.com/clMathLibraries/clBLAS";
description = "A software library containing BLAS functions written in OpenCL";
longDescription = ''
This package contains a library of BLAS functions on top of OpenCL.
This package contains a library of BLAS functions on top of OpenCL.
'';
license = licenses.asl20;
maintainers = with maintainers; [ artuuge ];
3 changes: 2 additions & 1 deletion pkgs/development/python-modules/libgpuarray/default.nix
View file
Original file line number Diff line number Diff line change
@@ -66,8 +66,9 @@ buildPythonPackage rec {

enableParallelBuilding = true;

nativeBuildInputs = [ cmake ];

buildInputs = [
cmake
cython
nose
];