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: 38070d58f49f
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 3596c4c53ce6
Choose a head ref
  • 6 commits
  • 3 files changed
  • 3 contributors

Commits on Oct 7, 2019

  1. scylladb: fix build access to /etc/os-release 

    Co-authored-by: Justin Humm <justin.humm@posteo.de>
    @workflow @erictapen
    workflow and erictapen committed Oct 7, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    b932511 View commit details

  2. scylladb: patch shebangs in further input file

    @workflow
    workflow committed Oct 7, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    7a4f480 View commit details

  3. scylladb: fix spacing in default.nix

    @workflow
    workflow committed Oct 7, 2019

    Unverified

    This commit is not signed, but one or more authors requires that any commit attributed to them is signed.
    Learn about vigilant mode
    Copy the full SHA
    bbaaefd View commit details

Commits on Oct 9, 2019

  1. Merge branch 'master'

    @vcunat
    vcunat committed Oct 9, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    d16545f View commit details

  2. scylladb: remove the "broken" mark, add "big-parallel" 

    The build is really CPU-intensive, and requires around
2 * --cores GiB RAM.
    @vcunat
    vcunat committed Oct 9, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    de51368 View commit details

Commits on Oct 10, 2019

  1. Merge #70576: scylladb: fix build under sandboxing

    @vcunat
    vcunat committed Oct 10, 2019

    Verified

    This commit was signed with the committer’s verified signature.
    vcunat Vladimír Čunát
    GPG key ID: E747DF1F9575A3AA
    Verified
    Learn about vigilant mode
    Copy the full SHA
    3596c4c View commit details
Showing with 35 additions and 4 deletions.
  1. +28 −0 pkgs/servers/scylladb/configure-etc-osrelease.patch
  2. +5 −2 pkgs/servers/scylladb/default.nix
  3. +2 −2 pkgs/top-level/all-packages.nix
28 changes: 28 additions & 0 deletions pkgs/servers/scylladb/configure-etc-osrelease.patch
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
diff --git a/configure.py b/configure.py
index 25ca951ac..454140420 100755
--- a/configure.py
+++ b/configure.py
@@ -36,13 +36,16 @@ tempfile.tempdir = "./build/tmp"

configure_args = str.join(' ', [shlex.quote(x) for x in sys.argv[1:]])

-for line in open('/etc/os-release'):
- key, _, value = line.partition('=')
- value = value.strip().strip('"')
- if key == 'ID':
- os_ids = [value]
- if key == 'ID_LIKE':
- os_ids += value.split(' ')
+try:
+ for line in open('/etc/os-release'):
+ key, _, value = line.partition('=')
+ value = value.strip().strip('"')
+ if key == 'ID':
+ os_ids = [value]
+ if key == 'ID_LIKE':
+ os_ids += value.split(' ')
+except FileNotFoundError:
+ os_ids = ["linux"]


# distribution "internationalization", converting package names.
7 changes: 5 additions & 2 deletions pkgs/servers/scylladb/default.nix
View file
Original file line number Diff line number Diff line change
@@ -41,7 +41,7 @@ gcc8Stdenv.mkDerivation {
fetchSubmodules = true;
};

patches = [ ./seastar-configure-script-paths.patch ];
patches = [ ./seastar-configure-script-paths.patch ./configure-etc-osrelease.patch ];

nativeBuildInputs = [
pkgconfig
@@ -77,21 +77,24 @@ gcc8Stdenv.mkDerivation {

postPatch = ''
patchShebangs ./configure.py
patchShebangs seastar/json/json2code.py
'';

configurePhase = ''
./configure.py --mode=release
'';

installPhase = ''
mkdir $out
cp -r * $out/
'';

meta = with stdenv.lib; {
description = "NoSQL data store using the seastar framework, compatible with Apache Cassandra";
homepage = "https://scylladb.com";
license = licenses.agpl3;
platforms = stdenv.lib.platforms.linux;
maintainers = [ stdenv.lib.maintainers.farlion ];
broken = true;
requiredSystemFeatures = [ "big-parallel" ];
};
}
4 changes: 2 additions & 2 deletions pkgs/top-level/all-packages.nix
View file
Original file line number Diff line number Diff line change
@@ -24498,8 +24498,8 @@ in
sct = callPackage ../tools/X11/sct {};

scylladb = callPackage ../servers/scylladb {
thrift = thrift-0_10;
};
thrift = thrift-0_10;
};

seafile-shared = callPackage ../misc/seafile-shared { };