diff options
-rw-r--r-- | lib/systems/default.nix | 7 | ||||
-rw-r--r-- | lib/systems/parse.nix | 12 | ||||
-rw-r--r-- | nixos/release-combined.nix | 4 | ||||
-rw-r--r-- | nixos/tests/plotinus.nix | 10 | ||||
-rw-r--r-- | pkgs/applications/misc/pytrainer/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/pytrainer/fix-test-tz.patch | 11 | ||||
-rw-r--r-- | pkgs/development/python-modules/pysensors/default.nix | 32 | ||||
-rw-r--r-- | pkgs/misc/themes/jade1/default.nix | 28 | ||||
-rw-r--r-- | pkgs/tools/misc/graylog/default.nix | 10 | ||||
-rw-r--r-- | pkgs/tools/text/gnused/default.nix | 9 | ||||
-rw-r--r-- | pkgs/top-level/all-packages.nix | 6 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 2 |
12 files changed, 110 insertions, 25 deletions
diff --git a/lib/systems/default.nix b/lib/systems/default.nix index 0e1a10c1f64b..ee4c29660a55 100644 --- a/lib/systems/default.nix +++ b/lib/systems/default.nix @@ -50,5 +50,12 @@ rec { } // mapAttrs (n: v: v final.parsed) inspect.predicates // args; in assert final.useAndroidPrebuilt -> final.isAndroid; + assert lib.foldl + (pass: { assertion, message }: + if assertion final + then pass + else throw message) + true + (final.parsed.abi.assertions or []); final; } diff --git a/lib/systems/parse.nix b/lib/systems/parse.nix index 16d657a5435a..08f2fb445de3 100644 --- a/lib/systems/parse.nix +++ b/lib/systems/parse.nix @@ -192,7 +192,15 @@ rec { abis = setTypes types.openAbi { android = {}; cygnus = {}; - gnu = {}; + gnu = { + assertions = [ + { assertion = platform: !platform.isAarch32; + message = '' + The "gnu" ABI is ambiguous on 32-bit ARM. Use "gnueabi" or "gnueabihf" instead. + ''; + } + ]; + }; msvc = {}; eabi = {}; androideabi = {}; @@ -270,7 +278,7 @@ rec { kernel = getKernel args.kernel; abi = /**/ if args ? abi then getAbi args.abi - else if isLinux parsed then abis.gnu + else if isLinux parsed then (if isAarch32 parsed then abis.gnueabi else abis.gnu) else if isWindows parsed then abis.gnu else abis.unknown; }; diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index e010b532a688..deb28835968d 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -58,6 +58,8 @@ in rec { nixos.ova.x86_64-linux or [] #(all nixos.tests.containers) + (all nixos.tests.containers-imperative) + (all nixos.tests.containers-ipv4) nixos.tests.chromium.x86_64-linux or [] (all nixos.tests.firefox) (all nixos.tests.firewall) @@ -98,6 +100,7 @@ in rec { (all nixos.tests.misc) (all nixos.tests.mutableUsers) (all nixos.tests.nat.firewall) + (all nixos.tests.nat.firewall-conntrack) (all nixos.tests.nat.standalone) (all nixos.tests.networking.scripted.loopback) (all nixos.tests.networking.scripted.static) @@ -112,6 +115,7 @@ in rec { (all nixos.tests.nfs4) (all nixos.tests.openssh) (all nixos.tests.php-pcre) + (all nixos.tests.predictable-interface-names) (all nixos.tests.printing) (all nixos.tests.proxy) (all nixos.tests.sddm.default) diff --git a/nixos/tests/plotinus.nix b/nixos/tests/plotinus.nix index 557d65f7960a..9058c59c92de 100644 --- a/nixos/tests/plotinus.nix +++ b/nixos/tests/plotinus.nix @@ -15,11 +15,11 @@ import ./make-test.nix ({ pkgs, ... }: { testScript = '' $machine->waitForX; - $machine->execute("xterm -e 'gnome-calculator' &"); - $machine->waitForWindow(qr/Calculator/); - $machine->execute("xdotool key ctrl+shift+p"); - $machine->sleep(1); # wait for the popup - $machine->execute("xdotool key p r e f e r e n c e s Return"); + $machine->succeed("gnome-calculator &"); + $machine->waitForWindow(qr/gnome-calculator/); + $machine->succeed("xdotool search --sync --onlyvisible --class gnome-calculator windowfocus --sync key ctrl+shift+p"); + $machine->sleep(5); # wait for the popup + $machine->succeed("xdotool key --delay 100 p r e f e r e n c e s Return"); $machine->waitForWindow(qr/Preferences/); $machine->screenshot("screen"); ''; diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index dcbd14198f76..cdeca96568df 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -14,13 +14,13 @@ in python.pkgs.buildPythonApplication rec { name = "pytrainer-${version}"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "pytrainer"; repo = "pytrainer"; rev = "v${version}"; - sha256 = "09pfddjaqdpy3r27h21xvsvh04sb8hppinskxlahdqb3vjzkr581"; + sha256 = "0rzf8kks96qzlknh6g3b9pjq04j7qk6rmz58scp7sck8xz9rjbwx"; }; namePrefix = ""; diff --git a/pkgs/applications/misc/pytrainer/fix-test-tz.patch b/pkgs/applications/misc/pytrainer/fix-test-tz.patch index 761064077a98..ca4875769013 100644 --- a/pkgs/applications/misc/pytrainer/fix-test-tz.patch +++ b/pkgs/applications/misc/pytrainer/fix-test-tz.patch @@ -30,13 +30,16 @@ diff -Nurp source.orig/pytrainer/test/imports/test_garmintcxv2.py source/pytrain + summary = [(0, True, '2012-10-14T10:02:42', '10.12', '00:39:51', 'Running')] activity = Activity(date_time_utc='2012-10-14T10:02:42Z', sport_id='1') self.ddbb.session.add(activity) - self.ddbb.session.commit() + self.ddbb.session.commit( diff -Nurp source.orig/pytrainer/test/lib/test_date.py source/pytrainer/test/lib/test_date.py ---- source.orig/pytrainer/test/lib/test_date.py 2018-02-27 22:15:32.079243364 +0100 -+++ source/pytrainer/test/lib/test_date.py 2018-02-27 22:16:33.936867052 +0100 -@@ -45,4 +45,4 @@ class DateFunctionTest(unittest.TestCase +--- source.orig/pytrainer/test/lib/test_date.py 2018-05-10 21:15:22.196275555 +0200 ++++ source/pytrainer/test/lib/test_date.py 2018-05-10 21:22:43.647870401 +0200 +@@ -47,7 +47,7 @@ class DateFunctionTest(unittest.TestCase def test_getDateTime(self): utctime, localtime = getDateTime('Tue Nov 24 17:29:05 UTC 2015') self.assertEqual(datetime.datetime(2015, 11, 24, 17, 29, 5, tzinfo=tzutc()), utctime) - self.assertEqual(datetime.datetime(2015, 11, 24, 19, 29, 5, tzinfo=tzlocal()), localtime) + self.assertEqual(datetime.datetime(2015, 11, 24, 17, 29, 5, tzinfo=tzlocal()), localtime) + + class DateRangeTest(unittest.TestCase): + diff --git a/pkgs/development/python-modules/pysensors/default.nix b/pkgs/development/python-modules/pysensors/default.nix new file mode 100644 index 000000000000..c891140827ee --- /dev/null +++ b/pkgs/development/python-modules/pysensors/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildPythonPackage, python, fetchFromGitHub, lm_sensors }: +buildPythonPackage rec { + version = "2017-07-13"; + pname = "pysensors"; + + # note that https://pypi.org/project/PySensors/ is a different project + src = fetchFromGitHub { + owner = "bastienleonard"; + repo = "pysensors"; + rev = "ef46fc8eb181ecb8ad09b3d80bc002d23d9e26b3"; + sha256 = "1xvbxnkz55fk5fpr514263c7s7s9r8hgrw4ybfaj5a0mligmmrfm"; + }; + + buildInputs = [ lm_sensors ]; + + # Tests are disable because they fail on `aarch64-linux`, probably + # due to sandboxing + doCheck = false; + + checkPhase = '' + cd tests + ${python.interpreter} -m unittest discover + ''; + + meta = with stdenv.lib; { + maintainers = with maintainers; [ guibou ]; + description = "Easy hardware health monitoring in Python for Linux systems"; + homepage = http://pysensors.readthedocs.org; + license = licenses.bsd2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/themes/jade1/default.nix b/pkgs/misc/themes/jade1/default.nix new file mode 100644 index 000000000000..9870b3fefebb --- /dev/null +++ b/pkgs/misc/themes/jade1/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchFromGitHub, gtk-engine-murrine }: + +stdenv.mkDerivation rec { + name = "theme-jade1-${version}"; + version = "3.2"; + + src = fetchFromGitHub { + owner = "madmaxms"; + repo = "theme-jade-1"; + rev = "v${version}"; + sha256 = "0lf8cawn2s2x1b9af0cznhqzx3dsr8h18srcwjz7af3y5daxf311"; + }; + + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + + installPhase = '' + mkdir -p $out/share/themes + cp -a Jade-1 $out/share/themes + ''; + + meta = with stdenv.lib; { + description = "A fork of the original Linux Mint theme with dark menus, more intensive green and some other modifications"; + homepage = https://github.com/madmaxms/theme-jade-1; + license = with licenses; [ gpl3 ]; + platforms = platforms.linux; + maintainers = [ maintainers.romildo ]; + }; +} diff --git a/pkgs/tools/misc/graylog/default.nix b/pkgs/tools/misc/graylog/default.nix index b9945a3afd38..f79be961378b 100644 --- a/pkgs/tools/misc/graylog/default.nix +++ b/pkgs/tools/misc/graylog/default.nix @@ -1,20 +1,24 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, makeWrapper, jre_headless }: stdenv.mkDerivation rec { - version = "2.4.3"; + version = "2.4.4"; name = "graylog-${version}"; src = fetchurl { url = "https://packages.graylog2.org/releases/graylog/graylog-${version}.tgz"; - sha256 = "0kwgg9m9sqzl4y2ri69fpi7w9961psbmfdq3avjsbgbs60ly1hn6"; + sha256 = "0wiqwwsy306hr7zn57f5hvh8wvcc2q46x0hdlabi0n9m44wk993i"; }; dontBuild = true; dontStrip = true; + buildInputs = [ makeWrapper ]; + makeWrapperArgs = [ "--prefix" "PATH" ":" "${jre_headless}/bin" ]; + installPhase = '' mkdir -p $out cp -r {graylog.jar,lib,bin,plugin,data} $out + wrapProgram $out/bin/graylogctl $makeWrapperArgs ''; meta = with stdenv.lib; { diff --git a/pkgs/tools/text/gnused/default.nix b/pkgs/tools/text/gnused/default.nix index 47193e61615d..af3db54e96d5 100644 --- a/pkgs/tools/text/gnused/default.nix +++ b/pkgs/tools/text/gnused/default.nix @@ -14,13 +14,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl ]; preConfigure = "patchShebangs ./build-aux/help2man"; - crossAttrs = { - # The tarball ships with a fine prebuilt manpage, but the make rules try to rebuild it, - # which won't work when cross compiling as help2man needs to execute the binaries. - postConfigure = '' - sed -i Makefile -e 's|doc/sed\.1:|dummy:|' - ''; - }; + # Prevents attempts of running 'help2man' on cross-built binaries. + PERL = if stdenv.hostPlatform == stdenv.buildPlatform then null else "missing"; meta = { homepage = http://www.gnu.org/software/sed/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32ecd467b6e7..a3a71edbb6bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19654,10 +19654,12 @@ with pkgs; numix-sx-gtk-theme = callPackage ../misc/themes/numix-sx { }; - theme-obsidian2 = callPackage ../misc/themes/obsidian2 { }; - onestepback = callPackage ../misc/themes/onestepback { }; + theme-jade1 = callPackage ../misc/themes/jade1 { }; + + theme-obsidian2 = callPackage ../misc/themes/obsidian2 { }; + theme-vertex = callPackage ../misc/themes/vertex { }; rox-filer = callPackage ../desktops/rox/rox-filer { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d713253b5e2c..de67df6d595c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -18206,6 +18206,8 @@ EOF pyspark = callPackage ../development/python-modules/pyspark { }; + pysensors = callPackage ../development/python-modules/pysensors { }; + sseclient = callPackage ../development/python-modules/sseclient { }; warrant = callPackage ../development/python-modules/warrant { }; |