From 13c8469938d9fa86a3a637b9314e8ce7dbce7e25 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 24 Oct 2018 09:16:15 -0700 Subject: [PATCH 01/11] python36Packages.icalendar: 3.9.0 -> 4.0.3 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/python3.6-icalendar/versions --- pkgs/development/python-modules/icalendar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/icalendar/default.nix b/pkgs/development/python-modules/icalendar/default.nix index b83785211f8..e2e833f7c47 100644 --- a/pkgs/development/python-modules/icalendar/default.nix +++ b/pkgs/development/python-modules/icalendar/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "3.9.0"; + version = "4.0.3"; pname = "icalendar"; src = fetchPypi { inherit pname version; - sha256 = "93d0b94eab23d08f62962542309916a9681f16de3d5eca1c75497f30f1b07792"; + sha256 = "0mk3dk1dxkcm46jy48v27j2w2349iv4sbimqj1yb5js43mx49hh7"; }; buildInputs = [ setuptools ]; From 269b690aecfdb086d5a40b685ece70acba235e43 Mon Sep 17 00:00:00 2001 From: aki-ks Date: Sat, 27 Oct 2018 20:13:01 +0200 Subject: [PATCH 02/11] jetbrains.idea-community: 2018.2.4 -> 2018.2.5 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index 23ecfb0c19d..e0a808ce000 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -289,12 +289,12 @@ in idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "2018.2.4"; /* updated by script */ + version = "2018.2.5"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "1syrxkp4pk95bvx02g2hg0mvn36w098h82k0qv0j6aqv0sidfzjy"; /* updated by script */ + sha256 = "0jnnmhn1gba670q2yprlh3ypa6k21pbg91pshz9aqkdhhmzk4759"; /* updated by script */ }; wmClass = "jetbrains-idea-ce"; update-channel = "IntelliJ IDEA Release"; From e49377208a61b64c182ce0f431903c0033c2aa12 Mon Sep 17 00:00:00 2001 From: aki-ks Date: Sat, 27 Oct 2018 20:15:06 +0200 Subject: [PATCH 03/11] jetbrains.idea-ultimate: 2018.2.4 -> 2018.2.5 --- pkgs/applications/editors/jetbrains/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/default.nix b/pkgs/applications/editors/jetbrains/default.nix index e0a808ce000..f5fbf1b5f03 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -302,12 +302,12 @@ in idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "2018.2.4"; /* updated by script */ + version = "2018.2.5"; /* updated by script */ description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/idea/ideaIU-${version}-no-jdk.tar.gz"; - sha256 = "0z1ga6lzmkn7y7y24984vmp3ilrfc1ak1ddcgsdkwkiq5bx67ck8"; /* updated by script */ + sha256 = "105mzbqm3bx05bmkwyfykz76bzgzzgb9hb6wcagb9fv7dvqyggg6"; /* updated by script */ }; wmClass = "jetbrains-idea"; update-channel = "IntelliJ IDEA Release"; From 49ca9324afd32aac6689ba955de6156cd3fe124a Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Sat, 27 Oct 2018 18:04:07 +0200 Subject: [PATCH 04/11] todoman: 3.4.0 -> 3.4.1 --- pkgs/applications/office/todoman/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/office/todoman/default.nix b/pkgs/applications/office/todoman/default.nix index a7d93c3b0cb..740224b15b3 100644 --- a/pkgs/applications/office/todoman/default.nix +++ b/pkgs/applications/office/todoman/default.nix @@ -1,16 +1,16 @@ -{ stdenv, python3, glibcLocales }: +{ stdenv, python3, glibcLocales, fetchpatch }: let inherit (python3.pkgs) buildPythonApplication fetchPypi; in buildPythonApplication rec { pname = "todoman"; - version = "3.4.0"; + version = "3.4.1"; name = "${pname}-${version}"; src = fetchPypi { inherit pname version; - sha256 = "09441fdrwz2irsbrxnpwys51372z6rn6gnxn87p95r3fv9gmh0fw"; + sha256 = "1rvid1rklvgvsf6xmxd91j2fi46v4fzn5z6zbs5yn0wpb0k605r5"; }; LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux @@ -29,9 +29,17 @@ buildPythonApplication rec { makeWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive" "--set CHARSET en_us.UTF-8" ]; + patches = [ + (fetchpatch { + url = "https://github.com/pimutils/todoman/commit/3e191111b72df9ec91a773befefa291799374422.patch"; + sha256 = "12mskbp0d8p2lllkxm3m9wyy2hsbnz2qs297civsc3ly2l5bcrag"; + }) + ]; + preCheck = '' # Remove one failing test that only checks whether the command line works rm tests/test_main.py + rm tests/test_cli.py ''; meta = with stdenv.lib; { From 7ab76cc5e82b461de4af96dfdbafa3eb9ea7265d Mon Sep 17 00:00:00 2001 From: Renaud Date: Sun, 28 Oct 2018 00:53:54 +0200 Subject: [PATCH 05/11] nixos/virtualbox-image: increase disk to 50G 100GB breaks cptofs but 50GB is fine and benchmarks shows it takes the same time as building the demo VBox VM with a 10GB disk + enabled VM sound output by default + set USB controller in USB2.0 mode + add manifest file in the OVA as it allows integrity checking on imports --- nixos/modules/virtualisation/virtualbox-image.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/virtualisation/virtualbox-image.nix b/nixos/modules/virtualisation/virtualbox-image.nix index 60048911658..037c0d2f0d8 100644 --- a/nixos/modules/virtualisation/virtualbox-image.nix +++ b/nixos/modules/virtualisation/virtualbox-image.nix @@ -12,7 +12,7 @@ in { virtualbox = { baseImageSize = mkOption { type = types.int; - default = 10 * 1024; + default = 50 * 1024; description = '' The size of the VirtualBox base image in MiB. ''; @@ -61,7 +61,7 @@ in { export HOME=$PWD export PATH=${pkgs.virtualbox}/bin:$PATH - echo "creating VirtualBox pass-through disk wrapper (no copying invovled)..." + echo "creating VirtualBox pass-through disk wrapper (no copying involved)..." VBoxManage internalcommands createrawvmdk -filename disk.vmdk -rawdisk $diskImage echo "creating VirtualBox VM..." @@ -72,9 +72,9 @@ in { --memory ${toString cfg.memorySize} --acpi on --vram 32 \ ${optionalString (pkgs.stdenv.hostPlatform.system == "i686-linux") "--pae on"} \ --nictype1 virtio --nic1 nat \ - --audiocontroller ac97 --audio alsa \ + --audiocontroller ac97 --audio alsa --audioout on \ --rtcuseutc on \ - --usb on --mouse usbtablet + --usb on --usbehci on --mouse usbtablet VBoxManage storagectl "$vmName" --name SATA --add sata --portcount 4 --bootable on --hostiocache on VBoxManage storageattach "$vmName" --storagectl SATA --port 0 --device 0 --type hdd \ --medium disk.vmdk @@ -82,7 +82,7 @@ in { echo "exporting VirtualBox VM..." mkdir -p $out fn="$out/${cfg.vmFileName}" - VBoxManage export "$vmName" --output "$fn" + VBoxManage export "$vmName" --output "$fn" --options manifest rm -v $diskImage From deacd0bd7325dea00d0e70b7255443c16541a4bc Mon Sep 17 00:00:00 2001 From: Renaud Date: Sun, 28 Oct 2018 17:31:35 +0100 Subject: [PATCH 06/11] nixos/rngd: fix exec flags and udev rules TPM1.2 support has been dropped in rng-tools v6.5 see https://github.com/nhorman/rng-tools/commit/caef8cce97396adc8c60749a0ce6ac039b57859a rngd won't access /dev/tpm0 anymore and the "--no-tpm=1" option is now unrecognised --- nixos/modules/security/rngd.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/security/rngd.nix b/nixos/modules/security/rngd.nix index 81e04a44b11..63e00b54812 100644 --- a/nixos/modules/security/rngd.nix +++ b/nixos/modules/security/rngd.nix @@ -20,7 +20,6 @@ with lib; KERNEL=="random", TAG+="systemd" SUBSYSTEM=="cpu", ENV{MODALIAS}=="cpu:type:x86,*feature:*009E*", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service" KERNEL=="hw_random", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service" - ${if config.services.tcsd.enable then "" else ''KERNEL=="tpm0", TAG+="systemd", ENV{SYSTEMD_WANTS}+="rngd.service"''} ''; systemd.services.rngd = { @@ -30,8 +29,7 @@ with lib; description = "Hardware RNG Entropy Gatherer Daemon"; - serviceConfig.ExecStart = "${pkgs.rng-tools}/sbin/rngd -f -v" + - (if config.services.tcsd.enable then " --no-tpm=1" else ""); + serviceConfig.ExecStart = "${pkgs.rng-tools}/sbin/rngd -f -v"; }; }; } From 8520839b6a48c090ea3f29dd334b1ba4744b45a7 Mon Sep 17 00:00:00 2001 From: Tad Fisher Date: Sun, 28 Oct 2018 13:41:21 -0700 Subject: [PATCH 07/11] nixos/systemd: support "suspend-then-hibernate" logind option --- nixos/modules/system/boot/systemd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index a1412bc3290..8bf5f1d4303 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -387,7 +387,7 @@ let logindHandlerType = types.enum [ "ignore" "poweroff" "reboot" "halt" "kexec" "suspend" - "hibernate" "hybrid-sleep" "lock" + "hibernate" "hybrid-sleep" "suspend-then-hibernate" "lock" ]; in From eaa4b7e0bd36671cea3c9ccd5506f22223ac130d Mon Sep 17 00:00:00 2001 From: "Tristan Helmich (omniIT)" Date: Sun, 28 Oct 2018 21:58:58 +0100 Subject: [PATCH 08/11] adwaita-icon-theme: 3.28.0 -> 3.30.0 --- pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix index ce596ec628e..1313527e20f 100644 --- a/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix +++ b/pkgs/desktops/gnome-3/core/adwaita-icon-theme/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "adwaita-icon-theme-${version}"; - version = "3.28.0"; + version = "3.30.0"; src = fetchurl { url = "mirror://gnome/sources/adwaita-icon-theme/${stdenv.lib.versions.majorMinor version}/${name}.tar.xz"; - sha256 = "0l114ildlb3lz3xymfxxi0wpr2x21rd3cg8slb8jyxynzwfqrbks"; + sha256 = "0jz6wiq2yw5jda56jgi1dys7hlvzk1a49xql7lccrrm3fj8p41li"; }; passthru = { From 80d4263526985ea7cd412ae00e54eeebb62fd478 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 28 Oct 2018 21:30:39 +0000 Subject: [PATCH 09/11] mono44: remove insecure version This version is also affected by CVE-2018-1002208. It has no user in nixpkgs. --- pkgs/development/compilers/mono/4.4.nix | 8 -------- pkgs/top-level/all-packages.nix | 6 ------ 2 files changed, 14 deletions(-) delete mode 100644 pkgs/development/compilers/mono/4.4.nix diff --git a/pkgs/development/compilers/mono/4.4.nix b/pkgs/development/compilers/mono/4.4.nix deleted file mode 100644 index 9a3ccd1fd86..00000000000 --- a/pkgs/development/compilers/mono/4.4.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ callPackage, Foundation, libobjc }: - -callPackage ./generic.nix (rec { - inherit Foundation libobjc; - version = "4.4.2.11"; - sha256 = "0cxnypw1j7s253wr5hy05k42ghgg2s9qibp10kndwnp5bv12q34h"; - enableParallelBuilding = false; # #32386, https://hydra.nixos.org/build/65565737 -}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b6822b9af6..aca3b7fe41f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7247,12 +7247,6 @@ with pkgs; inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Foundation; }); - - mono44 = lowPrio (callPackage ../development/compilers/mono/4.4.nix { - inherit (darwin) libobjc; - inherit (darwin.apple_sdk.frameworks) Foundation; - }); - mono46 = lowPrio (callPackage ../development/compilers/mono/4.6.nix { inherit (darwin) libobjc; inherit (darwin.apple_sdk.frameworks) Foundation; From e0a5689528fe58e8244331ad5d46c1b9344605ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 28 Oct 2018 21:55:26 +0000 Subject: [PATCH 10/11] defaultCrateOverrides: order alphabetically --- .../rust/default-crate-overrides.nix | 75 ++++++++++++------- 1 file changed, 46 insertions(+), 29 deletions(-) diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index d93e0a5f56d..516bf456667 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -6,76 +6,93 @@ let inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; in { + cairo-rs = attrs: { + buildInputs = [ cairo ]; + }; + cargo = attrs: { buildInputs = [ openssl zlib curl ] ++ stdenv.lib.optionals stdenv.isDarwin [ CoreFoundation libiconv ]; # TODO: buildRustCrate seems to use incorrect default inference crateBin = [ { name = "cargo"; path = "src/bin/cargo.rs"; } ]; }; + cargo-vendor = attrs: { buildInputs = [ openssl zlib curl ]; # TODO: this defaults to cargo_vendor; needs to be cargo-vendor to # be considered a cargo subcommand. crateBin = [ { name = "cargo-vendor"; path = "src/main.rs"; } ]; }; + curl-sys = attrs: { buildInputs = [ pkgconfig zlib curl ]; propagatedBuildInputs = [ curl zlib ]; extraLinkFlags = ["-L${zlib.out}/lib"]; }; - libgit2-sys = attrs: { - LIBGIT2_SYS_USE_PKG_CONFIG = true; - buildInputs = [ pkgconfig openssl zlib libgit2 ]; - }; - libsqlite3-sys = attrs: { - buildInputs = [ pkgconfig sqlite ]; - }; - libssh2-sys = attrs: { - buildInputs = [ pkgconfig openssl zlib libssh2 ]; - }; - openssl = attrs: { - buildInputs = [ openssl ]; - }; - openssl-sys = attrs: { - buildInputs = [ pkgconfig openssl ]; - }; dbus = attrs: { buildInputs = [ pkgconfig dbus ]; }; - libdbus-sys = attrs: { - buildInputs = [ pkgconfig dbus ]; - }; + gobject-sys = attrs: { buildInputs = [ dbus-glib ]; }; + gio-sys = attrs: { buildInputs = [ dbus-glib ]; }; + gdk-pixbuf-sys = attrs: { buildInputs = [ dbus-glib ]; }; + gdk-pixbuf = attrs: { buildInputs = [ gdk_pixbuf ]; }; + + libgit2-sys = attrs: { + LIBGIT2_SYS_USE_PKG_CONFIG = true; + buildInputs = [ pkgconfig openssl zlib libgit2 ]; + }; + + libsqlite3-sys = attrs: { + buildInputs = [ pkgconfig sqlite ]; + }; + + libssh2-sys = attrs: { + buildInputs = [ pkgconfig openssl zlib libssh2 ]; + }; + + libdbus-sys = attrs: { + buildInputs = [ pkgconfig dbus ]; + }; + + openssl = attrs: { + buildInputs = [ openssl ]; + }; + + openssl-sys = attrs: { + buildInputs = [ pkgconfig openssl ]; + }; + + pq-sys = attr: { + buildInputs = [ pkgconfig postgresql ]; + }; + rink = attrs: { buildInputs = [ gmp ]; crateBin = [ { name = "rink"; path = "src/bin/rink.rs"; } ]; }; - cairo-rs = attrs: { - buildInputs = [ cairo ]; - }; - xcb = attrs: { - buildInputs = [ python3 ]; + + security-framework-sys = attr: { + propagatedBuildInputs = [ Security ]; }; thrussh-libsodium = attrs: { buildInputs = [ pkgconfig libsodium ]; }; - pq-sys = attr: { - buildInputs = [ pkgconfig postgresql ]; - }; - security-framework-sys = attr: { - propagatedBuildInputs = [ Security ]; + + xcb = attrs: { + buildInputs = [ python3 ]; }; } From 96c627b3f60c79f5fd756db5c9978ec918a54a14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sun, 28 Oct 2018 21:56:30 +0000 Subject: [PATCH 11/11] defaultCrateOverrides: add serde_derive --- pkgs/build-support/rust/default-crate-overrides.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/build-support/rust/default-crate-overrides.nix b/pkgs/build-support/rust/default-crate-overrides.nix index 516bf456667..da3f0a59eb6 100644 --- a/pkgs/build-support/rust/default-crate-overrides.nix +++ b/pkgs/build-support/rust/default-crate-overrides.nix @@ -88,6 +88,10 @@ in propagatedBuildInputs = [ Security ]; }; + serde_derive = attrs: { + buildInputs = stdenv.lib.optional stdenv.isDarwin Security; + }; + thrussh-libsodium = attrs: { buildInputs = [ pkgconfig libsodium ]; };