From ba6f1a1e829fb691e1577d630077db2ca3b611e2 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Fri, 17 May 2019 21:56:31 -0400 Subject: [PATCH 01/52] u-boot: 2018-09 -> 2019.04 --- pkgs/misc/uboot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index a17ddf440ed..875267885aa 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -4,7 +4,7 @@ }: let - buildUBoot = { version ? "2018.09" + buildUBoot = { version ? "2019.04" , filesToInstall , installDir ? "$out" , defconfig @@ -20,7 +20,7 @@ let src = fetchurl { url = "ftp://ftp.denx.de/pub/u-boot/u-boot-${version}.tar.bz2"; - sha256 = "0s122kyz1svvs2yjzj4j9qravl3ra4vn0fjqgski7rlczqyg56w3"; + sha256 = "1vwv4bgbl7fjcm073zrphn17hnz5h5h778f88ivdsgbb2lnpgdvn"; }; patches = [ From 6d961ec9225a44fa8ea447361a75dea377365046 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Fri, 17 May 2019 21:57:14 -0400 Subject: [PATCH 02/52] u-boot: Adds Pine64LTS The name of the board is indeed A64-LTS, but upstream U-Boot names it pine64-lts so let's keep the U-Boot moniker. This previously was supported using the SOPINE build. --- pkgs/misc/uboot/default.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 8 insertions(+) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 875267885aa..b9325db9d51 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -195,6 +195,13 @@ in rec { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootPine64LTS = buildUBoot rec { + defconfig = "pine64-lts_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; + filesToInstall = ["u-boot-sunxi-with-spl.bin"]; + }; + ubootQemuAarch64 = buildUBoot rec { defconfig = "qemu_arm64_defconfig"; extraMeta.platforms = ["aarch64-linux"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c923ff2d9b4..ba95e21298c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15881,6 +15881,7 @@ in ubootOrangePiZeroPlus2H5 ubootPcduino3Nano ubootPine64 + ubootPine64LTS ubootQemuAarch64 ubootQemuArm ubootRaspberryPi From 6663a888f24e608e00973fe7a6a1e4b55b1c26c9 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Fri, 17 May 2019 21:58:47 -0400 Subject: [PATCH 03/52] u-boot: Adds Pinebook --- pkgs/misc/uboot/default.nix | 7 +++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 8 insertions(+) diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index b9325db9d51..6fe1a2081d2 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -202,6 +202,13 @@ in rec { filesToInstall = ["u-boot-sunxi-with-spl.bin"]; }; + ubootPinebook = buildUBoot rec { + defconfig = "pinebook_defconfig"; + extraMeta.platforms = ["aarch64-linux"]; + BL31 = "${armTrustedFirmwareAllwinner}/bl31.bin"; + filesToInstall = ["u-boot-sunxi-with-spl.bin"]; + }; + ubootQemuAarch64 = buildUBoot rec { defconfig = "qemu_arm64_defconfig"; extraMeta.platforms = ["aarch64-linux"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ba95e21298c..219943b7c36 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15882,6 +15882,7 @@ in ubootPcduino3Nano ubootPine64 ubootPine64LTS + ubootPinebook ubootQemuAarch64 ubootQemuArm ubootRaspberryPi From b69c4744e3862216e6b2cb3ccc46fc098f3a470b Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sat, 18 May 2019 13:40:06 -0400 Subject: [PATCH 04/52] arm-trusted-firmware: 2.0 -> 2.1 --- pkgs/misc/arm-trusted-firmware/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 73e2a96d0cd..3dba308c09c 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -6,7 +6,7 @@ let , platform , extraMakeFlags ? [] , extraMeta ? {} - , version ? "2.0" + , version ? "2.1" , ... } @ args: stdenv.mkDerivation (rec { @@ -17,7 +17,7 @@ let owner = "ARM-software"; repo = "arm-trusted-firmware"; rev = "refs/tags/v${version}"; - sha256 = "087pkwa6slxff0aiz3v42gww007nww97bl1p96fvvs7rr1y14gjx"; + sha256 = "1gy5qskrjy8n3kxdcm1dx8b45l5b75n0pm8pq80wl6xic1ycy24r"; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; From b64a5cfc728d9f3639912c96bea2208510e62190 Mon Sep 17 00:00:00 2001 From: Samuel Dionne-Riel Date: Sat, 18 May 2019 13:40:16 -0400 Subject: [PATCH 05/52] arm-trusted-firmware: Switch Allwinner to upstream --- pkgs/misc/arm-trusted-firmware/default.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/pkgs/misc/arm-trusted-firmware/default.nix b/pkgs/misc/arm-trusted-firmware/default.nix index 3dba308c09c..01c35d99ae7 100644 --- a/pkgs/misc/arm-trusted-firmware/default.nix +++ b/pkgs/misc/arm-trusted-firmware/default.nix @@ -57,15 +57,7 @@ in rec { inherit buildArmTrustedFirmware; armTrustedFirmwareAllwinner = buildArmTrustedFirmware rec { - version = "1.0"; - src = fetchFromGitHub { - owner = "apritzel"; - repo = "arm-trusted-firmware"; - # Branch: `allwinner` - rev = "91f2402d941036a0db092d5375d0535c270b9121"; - sha256 = "0lbipkxb01w97r6ah8wdbwxir3013rp249fcqhlzh2gjwhp5l1ys"; - }; - platform = "sun50iw1p1"; + platform = "sun50i_a64"; extraMeta.platforms = ["aarch64-linux"]; filesToInstall = ["build/${platform}/release/bl31.bin"]; }; From fa341a95cecf1dbacb29b693a05be0a6eb9cac77 Mon Sep 17 00:00:00 2001 From: PsyanticY Date: Tue, 21 May 2019 16:54:13 +0100 Subject: [PATCH 06/52] pythonPackages.boto3: 1.9.96 -> 1.9.152 --- pkgs/development/python-modules/boto3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/boto3/default.nix b/pkgs/development/python-modules/boto3/default.nix index e62936a9288..c5d51e56fc6 100644 --- a/pkgs/development/python-modules/boto3/default.nix +++ b/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.9.96"; # N.B: if you change this, change botocore too + version = "1.9.152"; # N.B: if you change this, change botocore too src = fetchPypi { inherit pname version; - sha256 = "c103241394d396ee08548b03d5d1f0f89a7ad1dfa7ccca88a47131f329cca093"; + sha256 = "0qspp97rddshjfqmmnqbvrszr66wq0ag05j8lcfsb9rj6ymz5s5s"; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; From 4440b405cdf5cd16cf234aacb407d7416947030f Mon Sep 17 00:00:00 2001 From: PsyanticY Date: Tue, 21 May 2019 16:54:57 +0100 Subject: [PATCH 07/52] pythonPackages.botocore: 1.12.96 -> 1.12.152 --- pkgs/development/python-modules/botocore/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/botocore/default.nix b/pkgs/development/python-modules/botocore/default.nix index 801977a9620..77b28bc1260 100644 --- a/pkgs/development/python-modules/botocore/default.nix +++ b/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.12.96"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.12.152"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "55c1594041e6716847d5a8b38181e3cc44e245edbf4598ae2b99e3040073b2cf"; + sha256 = "1pj9k3x82f9cgr0flg0m5n6fh8rkxy3c0z1qgx5nqvyidswn793r"; }; propagatedBuildInputs = [ From 9ceb3e15fa4ca8913c9a7cdc4ee5a5b03b217c4e Mon Sep 17 00:00:00 2001 From: PsyanticY Date: Tue, 21 May 2019 16:55:40 +0100 Subject: [PATCH 08/52] awscli: 1.16.106 -> 1.16.162 --- pkgs/tools/admin/awscli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index e09833869d6..87805b25a1c 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -33,11 +33,11 @@ let in py.pkgs.buildPythonApplication rec { pname = "awscli"; - version = "1.16.106"; # N.B: if you change this, change botocore to a matching version too + version = "1.16.162"; # N.B: if you change this, change botocore to a matching version too src = py.pkgs.fetchPypi { inherit pname version; - sha256 = "169810cb895ac8608747e81480aebd2712f654ad2e49e1f1315f34d6052d5e2d"; + sha256 = "1v5n1klzkysshp73mhrminvkqqqw9mskdaw7xjhpqfrvcdnp60vv"; }; # No tests included From 4277fc5c02a553a5662e4bad9b177807ee80a243 Mon Sep 17 00:00:00 2001 From: Roman Kuznetsov Date: Mon, 27 May 2019 19:55:42 +0200 Subject: [PATCH 09/52] doctl: 1.16.0 -> 1.18.0 --- pkgs/development/tools/doctl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/doctl/default.nix b/pkgs/development/tools/doctl/default.nix index 7762dc2f372..d7604f4de9d 100644 --- a/pkgs/development/tools/doctl/default.nix +++ b/pkgs/development/tools/doctl/default.nix @@ -4,7 +4,7 @@ buildGoPackage rec { name = "doctl-${version}"; version = "${major}.${minor}.${patch}"; major = "1"; - minor = "16"; + minor = "18"; patch = "0"; goPackagePath = "github.com/digitalocean/doctl"; @@ -21,7 +21,7 @@ buildGoPackage rec { owner = "digitalocean"; repo = "doctl"; rev = "v${version}"; - sha256 = "041fqanlk8px4nhxaxxs27gbqh8571szxfrcp0zmihdbr4nc70dv"; + sha256 = "1p43q1iyjj597gr47hn589fv7n26mny9niq7yb9hlmslkplsrb0a"; }; meta = { From a5a3d6d60bd8ee24a411aae8341784e49ef1bd77 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Mon, 27 May 2019 21:41:38 +0200 Subject: [PATCH 10/52] uwsgi: enable on darwin --- pkgs/servers/uwsgi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/uwsgi/default.nix b/pkgs/servers/uwsgi/default.nix index 1deba4e12af..1e846487472 100644 --- a/pkgs/servers/uwsgi/default.nix +++ b/pkgs/servers/uwsgi/default.nix @@ -96,6 +96,6 @@ stdenv.mkDerivation rec { description = "A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C"; license = licenses.gpl2; maintainers = with maintainers; [ abbradar schneefux ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } From cb9b203068e7320437d99ae91a59ad1caed344e8 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Tue, 28 May 2019 10:51:28 +0800 Subject: [PATCH 11/52] cargo-make: 0.19.2 -> 0.19.3 --- pkgs/development/tools/rust/cargo-make/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 0a8810881f8..78eb0aa3e94 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.19.2"; + version = "0.19.3"; src = let @@ -10,11 +10,11 @@ rustPlatform.buildRustPackage rec { owner = "sagiegurari"; repo = pname; rev = version; - sha256 = "175cflcm9k81fpp2pxz4hcaf8v3i7jqc9gcr4flnsqxjrh22vymp"; + sha256 = "11mkfwvzsr86w9675zpq8gcq5avsfvwffca26h6gkc7ahqcsx3ac"; }; cargo-lock = fetchurl { - url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/f1e6360acfbe5ae573f8f31a82a5c881a6f0ed68/cargo-make-Cargo.lock"; - sha256 = "004dx4gyby5smpvawqv946mambcg59zq6n8h89hz61mxkh7frmh4"; + url = "https://gist.githubusercontent.com/xrelkd/e4c9c7738b21f284d97cb7b1d181317d/raw/3592410d14443cc6be675553a9c228401114fa5f/cargo-make-Cargo.lock"; + sha256 = "0m8m2pn8y7n1js1kkva4lxahz5j4d73lj7l45h8dd30lw2w4n3hg"; }; in runCommand "cargo-make-src" {} '' @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "1hmfg3x9p5a2vz2r3v8m5wgyabbybl5lcjvi930b9wi5cnfm756g"; + cargoSha256 = "00yvx87s8vngb97ldq2amdhdv3nn38liys7nilay73phx0xybx4p"; # Some tests fail because they need network access. # However, Travis ensures a proper build. From 9746fae5778754e5d7611a39b6d00fc3435debc5 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 26 May 2019 12:25:59 +0200 Subject: [PATCH 12/52] build-support/writers: actually run checks --- pkgs/build-support/writers/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/build-support/writers/default.nix b/pkgs/build-support/writers/default.nix index 29a4bbad703..ae7b42449fb 100644 --- a/pkgs/build-support/writers/default.nix +++ b/pkgs/build-support/writers/default.nix @@ -24,6 +24,9 @@ rec { }) '' echo "#! $interpreter" > $out cat "$contentPath" >> $out + ${optionalString (check != "") '' + ${check} $out + ''} chmod +x $out ${optionalString (types.path.check nameOrPath) '' mv $out tmp From 35494acff94698117561a243dc78d342910e12ed Mon Sep 17 00:00:00 2001 From: Utku Demir Date: Mon, 27 May 2019 14:45:23 +1200 Subject: [PATCH 13/52] srandrd: init at v0.6.0 --- pkgs/tools/X11/srandrd/default.nix | 31 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/X11/srandrd/default.nix diff --git a/pkgs/tools/X11/srandrd/default.nix b/pkgs/tools/X11/srandrd/default.nix new file mode 100644 index 00000000000..af9394a84fa --- /dev/null +++ b/pkgs/tools/X11/srandrd/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, fetchFromGitHub +, libX11 +, libXrandr +, libXinerama +}: + +stdenv.mkDerivation rec { + pname = "srandrd"; + version = "0.6.0"; + + src = fetchFromGitHub { + owner = "jceb"; + repo = pname; + rev = "v${version}"; + sha256 = "07r1ck2ijj30n19ylndgw75ly9k3815kj9inpxblfnjpwbbw6ic0"; + }; + + buildInputs = [ libX11 libXrandr libXinerama ]; + + makeFlags = "PREFIX=$(out)"; + + meta = with stdenv.lib; { + homepage = "https://github.com/jceb/srandrd"; + description = "Simple randr daemon"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.utdemir ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92f2658853b..bd8762afef1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8696,6 +8696,8 @@ in pharo-spur64 = assert stdenv.is64bit; pharo-vms.spur64; pharo-launcher = callPackage ../development/pharo/launcher { }; + srandrd = callPackage ../tools/X11/srandrd { }; + srecord = callPackage ../development/tools/misc/srecord { }; srelay = callPackage ../tools/networking/srelay { }; From f6a68410f8cf012779c6cb556d07e019df11b6f2 Mon Sep 17 00:00:00 2001 From: Garry Cairns Date: Mon, 27 May 2019 23:16:18 +0100 Subject: [PATCH 14/52] Adds Citrix workspace app package Citrix workspace is replacing Citrix receiver as per https://docs.citrix.com/en-us/citrix-workspace-app.html --- .../remote/citrix-workspace/default.nix | 214 ++++++++++++++++++ .../remote/citrix-workspace/wrapper.nix | 19 ++ pkgs/top-level/all-packages.nix | 10 + 3 files changed, 243 insertions(+) create mode 100644 pkgs/applications/networking/remote/citrix-workspace/default.nix create mode 100644 pkgs/applications/networking/remote/citrix-workspace/wrapper.nix diff --git a/pkgs/applications/networking/remote/citrix-workspace/default.nix b/pkgs/applications/networking/remote/citrix-workspace/default.nix new file mode 100644 index 00000000000..13a16a6e224 --- /dev/null +++ b/pkgs/applications/networking/remote/citrix-workspace/default.nix @@ -0,0 +1,214 @@ +{ stdenv +, lib +, fetchurl +, requireFile +, makeWrapper +, libredirect +, busybox +, file +, makeDesktopItem +, tzdata +, cacert +, glib +, gtk2 +, atk +, gdk_pixbuf +, cairo +, pango +, gnome3 +, xorg +, libpng12 +, freetype +, fontconfig +, gtk_engines +, alsaLib +, libidn +, zlib +, version ? "19.3.0" +}: + +let + # In 56e1bdc7f9c (libidn: 1.34 -> 1.35), libidn.so.11 became libidn.so.12. + # Citrix looks for the former so we build version 1.34 to please the binary + libidn_134 = libidn.overrideDerivation (_: rec { + name = "libidn-1.34"; + src = fetchurl { + url = "mirror://gnu/libidn/${name}.tar.gz"; + sha256 = "0g3fzypp0xjcgr90c5cyj57apx1cmy0c6y9lvw2qdcigbyby469p"; + }; + }); + + versionInfo = let + supportedVersions = { + "19.3.0" = { + major = "19"; + minor = "3"; + patch = "0"; + x64hash = "0mhpp29ca3dw9hx72i0qawdq35wcc7qzgxwzlx4aicwnm1gbil5c"; + x86hash = "1hxgj5lk5ghbpssbqjd404qr84gls967vwrh8ww5hg3pn86kyf8w"; + x64suffix = "5"; + x86suffix = "5"; + homepage = https://www.citrix.com/downloads/workspace-app/linux/workspace-app-for-linux-latest.html; + }; + }; + + # Copied this file largely from the citrix-receiver package + # Leaving this here even though there are no deprecations yet + # for ease of future maintenance + deprecatedVersions = let + versions = [ ]; + in + lib.listToAttrs + (lib.flip map versions + (v: lib.nameValuePair v (throw "Unsupported citrix_workspace version: ${v}"))); + in + deprecatedVersions // supportedVersions; + + citrixWorkspaceForVersion = { major, minor, patch, x64hash, x86hash, x64suffix, x86suffix, homepage }: + stdenv.mkDerivation rec { + name = "citrix-workspace-${version}"; + version = "${major}.${minor}.${patch}"; + inherit homepage; + + prefixWithBitness = if stdenv.is64bit then "linuxx64" else "linuxx86"; + + src = requireFile rec { + name = if stdenv.is64bit then "${prefixWithBitness}-${version}.${x64suffix}.tar.gz" else "${prefixWithBitness}-${version}.${x86suffix}.tar.gz"; + sha256 = if stdenv.is64bit then x64hash else x86hash; + message = '' + In order to use Citrix Workspace, you need to comply with the Citrix EULA and download + the ${if stdenv.is64bit then "64-bit" else "32-bit"} binaries, .tar.gz from: + + ${homepage} + + (if you do not find version ${version} there, try at + https://www.citrix.com/downloads/workspace-app/ + + Once you have downloaded the file, please use the following command and re-run the + installation: + + nix-prefetch-url file://\$PWD/${name} + ''; + }; + + dontBuild = true; + + sourceRoot = "."; + + buildInputs = [ + makeWrapper + busybox + file + gtk2 + gdk_pixbuf + ]; + + libPath = stdenv.lib.makeLibraryPath [ + glib + gtk2 + atk + gdk_pixbuf + cairo + pango + gnome3.dconf + xorg.libX11 + xorg.libXext + xorg.libXrender + xorg.libXinerama + xorg.libXfixes + libpng12 + libidn_134 + zlib + gtk_engines + freetype + fontconfig + alsaLib + stdenv.cc.cc # Fixes: Can not load [..]/opt/citrix-icaclient/lib/ctxh264_fb.so:(null) + ]; + + desktopItem = makeDesktopItem { + name = "wfica"; + desktopName = "Citrix Workspace"; + genericName = "Citrix Workspace"; + exec = "wfica"; + icon = "wfica"; + comment = "Connect to remote Citrix server"; + categories = "GTK;GNOME;X-GNOME-NetworkSettings;Network;"; + mimeType = "application/x-ica"; + }; + + installPhase = '' + runHook preInstall + + export ICAInstDir="$out/opt/citrix-icaclient" + + sed -i \ + -e 's,^main_install_menu$,install_ICA_client,g' \ + -e 's,^integrate_ICA_client(),alias integrate_ICA_client=true\nintegrate_ICA_client_old(),g' \ + -e 's,^ANSWER=""$,ANSWER="$INSTALLER_YES",' \ + -e 's,/bin/true,true,g' \ + ./${prefixWithBitness}/hinst + + # Run the installer... + bash ./${prefixWithBitness}/hinst CDROM "`pwd`" + + echo "Deleting broken links..." + for link in `find $ICAInstDir -type l ` + do + [ -f "$link" ] || rm -v "$link" + done + + echo "Expanding certificates..." + # As explained in https://wiki.archlinux.org/index.php/Citrix#Security_Certificates + pushd "$ICAInstDir/keystore/cacerts" + awk 'BEGIN {c=0;} /BEGIN CERT/{c++} { print > "cert." c ".pem"}' < ${cacert}/etc/ssl/certs/ca-bundle.crt + popd + + echo "Patching executables..." + find $ICAInstDir -type f -exec file {} \; | + grep 'ELF.*executable' | + cut -f 1 -d : | + grep -vi '\(.dll\|.so\)$' | # added as a workaround to https://github.com/NixOS/nixpkgs/issues/41729 + while read f + do + echo "Patching ELF intrepreter and rpath for $f" + chmod u+w "$f" + patchelf \ + --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "$ICAInstDir:$libPath" "$f" + done + + echo "Wrapping wfica..." + mkdir "$out/bin" + + makeWrapper "$ICAInstDir/wfica" "$out/bin/wfica" \ + --add-flags "-icaroot $ICAInstDir" \ + --set ICAROOT "$ICAInstDir" \ + --set GTK_PATH "${gtk2.out}/lib/gtk-2.0:${gnome3.gnome-themes-extra}/lib/gtk-2.0" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --set LD_PRELOAD "${libredirect}/lib/libredirect.so" \ + --set LD_LIBRARY_PATH "$libPath" \ + --set NIX_REDIRECTS "/usr/share/zoneinfo=${tzdata}/share/zoneinfo:/etc/zoneinfo=${tzdata}/share/zoneinfo:/etc/timezone=$ICAInstDir/timezone" + + echo "We arbitrarily set the timezone to UTC. No known consequences at this point." + echo UTC > "$ICAInstDir/timezone" + + echo "Installing desktop item..." + mkdir -p $out/share/applications + cp ${desktopItem}/share/applications/* $out/share/applications + + # We introduce a dependency on the source file so that it need not be redownloaded everytime + echo $src >> "$out/share/workspace_dependencies.pin" + + runHook postInstall + ''; + + meta = with stdenv.lib; { + license = stdenv.lib.licenses.unfree; + inherit homepage; + description = "Citrix Workspace"; + platforms = platforms.linux; + }; + }; + +in citrixWorkspaceForVersion (lib.getAttr version versionInfo) diff --git a/pkgs/applications/networking/remote/citrix-workspace/wrapper.nix b/pkgs/applications/networking/remote/citrix-workspace/wrapper.nix new file mode 100644 index 00000000000..ea475ae6dbc --- /dev/null +++ b/pkgs/applications/networking/remote/citrix-workspace/wrapper.nix @@ -0,0 +1,19 @@ +{ citrix_workspace, extraCerts ? [], symlinkJoin }: + +let + + mkCertCopy = certPath: + "cp ${certPath} $out/opt/citrix-icaclient/keystore/cacerts/"; + +in + +if builtins.length extraCerts == 0 then citrix_workspace else symlinkJoin { + name = "citrix-with-extra-certs-${citrix_workspace.version}"; + paths = [ citrix_workspace ]; + + postBuild = '' + ${builtins.concatStringsSep "\n" (map mkCertCopy extraCerts)} + + sed -i -E "s,-icaroot (.+citrix-icaclient),-icaroot $out/opt/citrix-icaclient," $out/bin/wfica + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bd8762afef1..8cd29f0cbd4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2093,6 +2093,16 @@ in citrix_receiver = citrix_receiver_unwrapped_13_8_0; }; + citrix_workspace_unwrapped = callPackage ../applications/networking/remote/citrix-workspace { }; + citrix_workspace_unwrapped_19_3_0 = citrix_workspace_unwrapped.override { version = "19.3.0"; }; + + citrix_workspace = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { + citrix_workspace = citrix_workspace_unwrapped; + }; + citrix_workspace_19_3_0 = callPackage ../applications/networking/remote/citrix-workspace/wrapper.nix { + citrix_workspace = citrix_workspace_unwrapped_19_3_0; + }; + citra = libsForQt5.callPackage ../misc/emulators/citra { }; cmst = libsForQt5.callPackage ../tools/networking/cmst { }; From 43fda1c96db7f3da85009c1ace154e03770b591d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Fri, 17 May 2019 05:36:46 +0200 Subject: [PATCH 15/52] openblas: 0.3.5 -> 0.3.6 --- pkgs/development/libraries/science/math/openblas/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 489883e644c..4090c28ca7e 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -86,12 +86,12 @@ let in stdenv.mkDerivation rec { name = "openblas-${version}"; - version = "0.3.5"; + version = "0.3.6"; src = fetchFromGitHub { owner = "xianyi"; repo = "OpenBLAS"; rev = "v${version}"; - sha256 = "0hwfplr6ciqjvfqkya5vz92z2rx8bhdg5mkh923z246ylhs6d94k"; + sha256 = "12vg0g3s4m49fr8z04j15yrgscqnaaflnkckjbffqxnrf90fcav1"; }; inherit blas64; From 8d5864eb4740abfdfd33d9517cbb7b666275ebe3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Fri, 17 May 2019 04:45:42 +0200 Subject: [PATCH 16/52] openblas: Add enableStatic flag --- pkgs/development/libraries/science/math/openblas/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 4090c28ca7e..8ec00f7e2b8 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -7,6 +7,7 @@ # Select a specific optimization target (other than the default) # See https://github.com/xianyi/OpenBLAS/blob/develop/TargetList.txt , target ? null +, enableStatic ? false }: with stdenv.lib; @@ -124,7 +125,7 @@ stdenv.mkDerivation rec { PREFIX = placeholder "out"; NUM_THREADS = 64; INTERFACE64 = blas64; - NO_STATIC = true; + NO_STATIC = !enableStatic; CROSS = stdenv.hostPlatform != stdenv.buildPlatform; HOSTCC = "cc"; # Makefile.system only checks defined status From 7031335fe3fdec32d95b6fbd91ae91455f9c19a8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Fri, 17 May 2019 05:42:40 +0200 Subject: [PATCH 17/52] pkgsStatic: Add openblas override --- pkgs/top-level/static.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/static.nix b/pkgs/top-level/static.nix index dea30fe7b59..ada3c2a5034 100644 --- a/pkgs/top-level/static.nix +++ b/pkgs/top-level/static.nix @@ -104,6 +104,7 @@ in { optipng = super.optipng.override { static = true; }; + openblas = super.openblas.override { enableStatic = true; }; openssl = super.openssl.override { static = true; From a12e61b0d7a4b2598da858a981c83b7c80fefd5f Mon Sep 17 00:00:00 2001 From: Dmitry Moskowski Date: Wed, 22 May 2019 14:19:30 +0000 Subject: [PATCH 18/52] insomnia: fixed crash when importing data from file --- pkgs/development/web/insomnia/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index e941f08c39c..73ee09feed1 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -1,6 +1,7 @@ { stdenv, makeWrapper, fetchurl, dpkg , alsaLib, atk, cairo, cups, dbus, expat, fontconfig, freetype -, gdk_pixbuf, glib, gnome2, nspr, nss, gtk3, gtk2, at-spi2-atk +, gdk_pixbuf, glib, gnome2, nspr, nss, gtk3, gtk2, at-spi2-atk +, gsettings-desktop-schemas, gobject-introspection, wrapGAppsHook , libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext , libXfixes, libXi, libXrandr, libXrender, libXtst, libxcb, nghttp2 , libudev0-shim, glibc, curl, openssl, autoPatchelfHook @@ -28,6 +29,7 @@ in stdenv.mkDerivation rec { autoPatchelfHook dpkg makeWrapper + gobject-introspection wrapGAppsHook ]; buildInputs = [ @@ -46,6 +48,7 @@ in stdenv.mkDerivation rec { gnome2.pango gtk2 gtk3 + gsettings-desktop-schemas libX11 libXScrnSaver libXcomposite From d839c6d1fa2d65cd2d205fe76fc65ee44eab0d99 Mon Sep 17 00:00:00 2001 From: Dmitry Moskowski Date: Wed, 22 May 2019 14:19:52 +0000 Subject: [PATCH 19/52] insomnia: 6.3.2 -> 6.5.3 --- pkgs/development/web/insomnia/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix index 73ee09feed1..264f77a7fd9 100644 --- a/pkgs/development/web/insomnia/default.nix +++ b/pkgs/development/web/insomnia/default.nix @@ -18,11 +18,11 @@ let ]; in stdenv.mkDerivation rec { name = "insomnia-${version}"; - version = "6.3.2"; + version = "6.5.3"; src = fetchurl { url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb"; - sha256 = "15zf5nmsmz3ajb4xmhm3gynn36qp0ark0gah8qd0hqq76n9jmjnp"; + sha256 = "0km7anw5xpcfr6j7pwqhv26pk7nxv1jywqlz0lpvgj6w85aafcm3"; }; nativeBuildInputs = [ From fc0d4e98ef44f2506283dc325f8e464d749c63c2 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Fri, 24 May 2019 01:41:11 -0700 Subject: [PATCH 20/52] samba: 4.10.2 -> 4.10.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/samba/versions --- pkgs/servers/samba/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 7d1289ffdea..3af332eed9e 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -20,11 +20,11 @@ with lib; stdenv.mkDerivation rec { name = "samba-${version}"; - version = "4.10.2"; + version = "4.10.3"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "112yizx9cpjhi8c7mh9znqg0c9dkj3383hwr8dhgpykl3g2zv347"; + sha256 = "0b5hmfrkj2ljkml4zggkqix02mh9x79ggq9kf1k4bjwh97v1gca5"; }; outputs = [ "out" "dev" "man" ]; From cf178af4f84090d22dd6c422ac5024c510b9a301 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Mon, 27 May 2019 13:48:24 +0200 Subject: [PATCH 21/52] samba: 4.10.3 -> 4.10.4 --- pkgs/servers/samba/4.x.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/samba/4.x.nix b/pkgs/servers/samba/4.x.nix index 3af332eed9e..0b8a63e63f6 100644 --- a/pkgs/servers/samba/4.x.nix +++ b/pkgs/servers/samba/4.x.nix @@ -20,11 +20,11 @@ with lib; stdenv.mkDerivation rec { name = "samba-${version}"; - version = "4.10.3"; + version = "4.10.4"; src = fetchurl { url = "mirror://samba/pub/samba/stable/${name}.tar.gz"; - sha256 = "0b5hmfrkj2ljkml4zggkqix02mh9x79ggq9kf1k4bjwh97v1gca5"; + sha256 = "0xhfbh42dihccc85ffx243lyhf3jnphhi6xfcsr3a6mhsm7w1p26"; }; outputs = [ "out" "dev" "man" ]; From 6dbd013c0e04261021f310b7fd078192b91dba9d Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Tue, 28 May 2019 12:03:29 +0300 Subject: [PATCH 22/52] nnn: 2.4 -> 2.5 --- pkgs/applications/misc/nnn/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index 5367ef53302..c38a27d55e6 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -3,14 +3,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "nnn-${version}"; - version = "2.4"; + pname = "nnn"; + version = "2.5"; src = fetchFromGitHub { owner = "jarun"; - repo = "nnn"; + repo = pname; rev = "v${version}"; - sha256 = "0y55h5pxd20qw2ajhz8fsk45aynx0xzgr9kfr545hyhmfkg2nc49"; + sha256 = "0hvb0q6jg2nmvb40q43jj7v45afkjgcq6q9ldmmrh5558d0n65cw"; }; configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf); From c22e43fe44b0071fe338b0038b75d9269c2bf75c Mon Sep 17 00:00:00 2001 From: GRBurst Date: Tue, 28 May 2019 12:19:11 +0200 Subject: [PATCH 23/52] protonmail bridge: 1.1.4 -> 1.1.5 --- pkgs/applications/networking/protonmail-bridge/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/protonmail-bridge/default.nix b/pkgs/applications/networking/protonmail-bridge/default.nix index 2e04ce856a8..2870f3158fb 100644 --- a/pkgs/applications/networking/protonmail-bridge/default.nix +++ b/pkgs/applications/networking/protonmail-bridge/default.nix @@ -2,7 +2,7 @@ libsecret, libGL, libpulseaudio, glib, makeWrapper, makeDesktopItem }: let - version = "1.1.4-1"; + version = "1.1.5-1"; description = '' An application that runs on your computer in the background and seamlessly encrypts @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://protonmail.com/download/protonmail-bridge_${version}_amd64.deb"; - sha256 = "16w3l81j10syl2pis08sl752yapbgjy531qs0n1ghmsx2d12n7kl"; + sha256 = "1y5mphrs60zd6km9z64vskk70q9zzw4g6js7qvgl572wv81w2l75"; }; nativeBuildInputs = [ makeWrapper ]; @@ -75,7 +75,7 @@ in stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - homepage = https://www.protonmail.com/bridge; + homepage = "https://www.protonmail.com/bridge"; license = licenses.mit; platforms = [ "x86_64-linux" ]; maintainers = with maintainers; [ lightdiscord ]; From 53b08beea6eebf82a488cb1c12d59cfbfbc5c5f2 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Tue, 28 May 2019 13:14:06 +0200 Subject: [PATCH 24/52] tridactyl-native: init at 1.14.9 (#61703) --- .../networking/browsers/firefox/wrapper.nix | 2 + .../networking/tridactyl-native/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 48 insertions(+) create mode 100644 pkgs/tools/networking/tridactyl-native/default.nix diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 61484478e4d..6982f82a816 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -8,6 +8,7 @@ , google_talk_plugin, fribid, gnome3/*.gnome-shell*/ , esteidfirefoxplugin , browserpass, chrome-gnome-shell, uget-integrator, plasma-browser-integration, bukubrow +, tridactyl-native , udev , kerberos }: @@ -67,6 +68,7 @@ let ([ ] ++ lib.optional (cfg.enableBrowserpass or false) (lib.getBin browserpass) ++ lib.optional (cfg.enableBukubrow or false) bukubrow + ++ lib.optional (cfg.enableTridactylNative or false) tridactyl-native ++ lib.optional (cfg.enableGnomeExtensions or false) chrome-gnome-shell ++ lib.optional (cfg.enableUgetIntegrator or false) uget-integrator ++ lib.optional (cfg.enablePlasmaBrowserIntegration or false) plasma-browser-integration diff --git a/pkgs/tools/networking/tridactyl-native/default.nix b/pkgs/tools/networking/tridactyl-native/default.nix new file mode 100644 index 00000000000..687dae2ea6f --- /dev/null +++ b/pkgs/tools/networking/tridactyl-native/default.nix @@ -0,0 +1,44 @@ +{ stdenv +, fetchFromGitHub +, python3 +}: + +stdenv.mkDerivation rec { + pname = "tridactyl-native"; + # this is actually the version of tridactyl itself; the native messenger will + # probably not change with every tridactyl version + version = "1.14.9"; + + src = fetchFromGitHub { + owner = "tridactyl"; + repo = "tridactyl"; + rev = version; + sha256 = "0d80c744qfv6jd03cmdp3p71xaj8lq8jzsa2m24jxv9q4ks2dcmj"; + }; + sourceRoot = "source/native"; + + nativeBuildInputs = [ + python3.pkgs.wrapPython + ]; + + buildPhase = '' + sed -i -e "s|REPLACE_ME_WITH_SED|$out/share/tridactyl/native_main.py|" "tridactyl.json" + ''; + + installPhase = '' + mkdir -p "$out/lib/mozilla/native-messaging-hosts" + cp tridactyl.json "$out/lib/mozilla/native-messaging-hosts/" + + mkdir -p "$out/share/tridactyl" + cp native_main.py "$out/share/tridactyl" + wrapPythonProgramsIn "$out/share/tridactyl" + ''; + + meta = with stdenv.lib; { + description = "Tridactyl native messaging host application"; + homepage = https://github.com/tridactyl/tridactyl; + license = licenses.asl20; + platforms = platforms.all; + maintainers = with maintainers; [ timokau ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8cd29f0cbd4..8000aea835b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2637,6 +2637,8 @@ in teamocil = callPackage ../tools/misc/teamocil { }; + tridactyl-native = callPackage ../tools/networking/tridactyl-native { }; + uudeview = callPackage ../tools/misc/uudeview { }; uutils-coreutils = callPackage ../tools/misc/uutils-coreutils { From eccb90a2d997d65dc514253b441e515d8e0241c3 Mon Sep 17 00:00:00 2001 From: Daniel Schaefer Date: Tue, 28 May 2019 13:37:14 +0200 Subject: [PATCH 25/52] compton: 0.1_beta2.5 -> 6.2 (#61681) * compton-git: 5.1-rc2 -> 6.2 vsync is now a boolean option, see: https://github.com/yshui/compton/pull/130 menu-opacity is deprecated and there's a warning that says: Please use the wintype option `opacity` of `popup_menu` and `dropdown_menu` instead. * nixos/compton: Keep vSync option backwards compatible The new upstream option tries to make the best choice for the user. Therefore the behaviour should stay the same with this backwards compatibility patch. * compton-git: Remove DRM option It's deprecated and shouldn't be used. https://github.com/yshui/compton/pull/130/files#r285505456 * compton-git: Remove new_backends option Was removed in "Let old/new backends co-exist" b0c5db9f5aa500dc3568cc6fe68493df98794d4d * compton: 0.1_beta2.5 -> 6.2 Drop the legacy, unmaintained version and use the fork for real. --- nixos/modules/services/x11/compton.nix | 32 ++-- .../window-managers/compton/default.nix | 145 ++++++------------ pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 75 insertions(+), 105 deletions(-) diff --git a/nixos/modules/services/x11/compton.nix b/nixos/modules/services/x11/compton.nix index cafd8d88ec4..11db0a133d6 100644 --- a/nixos/modules/services/x11/compton.nix +++ b/nixos/modules/services/x11/compton.nix @@ -37,7 +37,12 @@ let # opacity active-opacity = ${cfg.activeOpacity}; inactive-opacity = ${cfg.inactiveOpacity}; - menu-opacity = ${cfg.menuOpacity}; + + wintypes: + { + popup_menu = { opacity = ${cfg.menuOpacity}; } + dropdown_menu = { opacity = ${cfg.menuOpacity}; } + }; opacity-rule = [ ${opacityRules} @@ -45,7 +50,7 @@ let # other options backend = ${toJSON cfg.backend}; - vsync = ${toJSON cfg.vSync}; + vsync = ${lib.boolToString cfg.vSync}; refresh-rate = ${toString cfg.refreshRate}; '' + cfg.extraOptions); @@ -189,15 +194,22 @@ in { }; vSync = mkOption { - type = types.enum [ - "none" "drm" "opengl" - "opengl-oml" "opengl-swc" "opengl-mswc" - ]; - default = "none"; - example = "opengl-swc"; + type = with types; either bool + (enum [ "none" "drm" "opengl" "opengl-oml" "opengl-swc" "opengl-mswc" ]); + default = false; + apply = x: + let + res = x != "none"; + msg = "The type of services.compton.vSync has changed to bool:" + + " interpreting ${x} as ${lib.boolToString res}"; + in + if isBool x then x + else warn msg res; + description = '' - Enable vertical synchronization using the specified method. - See compton(1) man page an explanation. + Enable vertical synchronization. Chooses the best method + (drm, opengl, opengl-oml, opengl-swc, opengl-mswc) automatically. + The bool value should be used, the others are just for backwards compatibility. ''; }; diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix index 2c388c941e6..60607ea89d1 100644 --- a/pkgs/applications/window-managers/compton/default.nix +++ b/pkgs/applications/window-managers/compton/default.nix @@ -3,110 +3,67 @@ , xorgproto, libxcb ,xcbutilrenderutil, xcbutilimage, pixman, libev , dbus, libconfig, libdrm, libGL, pcre, libX11, libXcomposite, libXdamage , libXinerama, libXrandr, libXrender, libXext, xwininfo, libxdg_basedir }: +stdenv.mkDerivation rec { + pname = "compton"; + version = "6.2"; -let - common = source: stdenv.mkDerivation (source // rec { - name = "${source.pname}-${source.version}"; + COMPTON_VERSION = "v${version}"; - nativeBuildInputs = (source.nativeBuildInputs or []) ++ [ - pkgconfig - asciidoc - docbook_xml_dtd_45 - docbook_xsl - makeWrapper - ]; - - installFlags = [ "PREFIX=$(out)" ]; - - postInstall = '' - wrapProgram $out/bin/compton-trans \ - --prefix PATH : ${lib.makeBinPath [ xwininfo ]} - ''; - - meta = with lib; { - description = "A fork of XCompMgr, a sample compositing manager for X servers"; - longDescription = '' - A fork of XCompMgr, which is a sample compositing manager for X - servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE - extensions. It enables basic eye-candy effects. This fork adds - additional features, such as additional effects, and a fork at a - well-defined and proper place. - ''; - license = licenses.mit; - maintainers = with maintainers; [ ertes enzime twey ]; - platforms = platforms.linux; - }; - }); - - stableSource = rec { - pname = "compton"; - version = "0.1_beta2.5"; - - COMPTON_VERSION = version; - - buildInputs = [ - dbus libX11 libXcomposite libXdamage libXrender libXrandr libXext - libXinerama libdrm pcre libxml2 libxslt libconfig libGL - ]; - - src = fetchFromGitHub { - owner = "chjj"; - repo = "compton"; - rev = "b7f43ee67a1d2d08239a2eb67b7f50fe51a592a8"; - sha256 = "1p7ayzvm3c63q42na5frznq3rlr1lby2pdgbvzm1zl07wagqss18"; - }; - - meta = { - homepage = https://github.com/chjj/compton/; - }; + src = fetchFromGitHub { + owner = "yshui"; + repo = "compton"; + rev = COMPTON_VERSION; + sha256 = "03fi9q8zw2qrwpkmy1bnavgfh91ci9in5fdi17g4s5s0n2l7yil7"; }; - gitSource = rec { - pname = "compton-git"; - version = "5.1-rc2"; + nativeBuildInputs = [ + meson ninja + pkgconfig + asciidoc + docbook_xml_dtd_45 + docbook_xsl + makeWrapper + ]; - COMPTON_VERSION = "v${version}"; + buildInputs = [ + dbus libX11 libXext + xorgproto + libXinerama libdrm pcre libxml2 libxslt libconfig libGL + libxcb xcbutilrenderutil xcbutilimage + pixman libev + libxdg_basedir + ]; - nativeBuildInputs = [ meson ninja ]; + NIX_CFLAGS_COMPILE = [ "-fno-strict-aliasing" ]; - src = fetchFromGitHub { - owner = "yshui"; - repo = "compton"; - rev = COMPTON_VERSION; - sha256 = "1qpy76kkhz8gfby842ry7lanvxkjxh4ckclkcjk4xi2wsmbhyp08"; - }; + mesonFlags = [ + "-Dbuild_docs=true" + ]; - buildInputs = [ - dbus libX11 libXext - xorgproto - libXinerama libdrm pcre libxml2 libxslt libconfig libGL - # Removed: - # libXcomposite libXdamage libXrender libXrandr + preBuild = '' + git() { echo "v${version}"; } + export -f git + ''; - # New: - libxcb xcbutilrenderutil xcbutilimage - pixman libev - libxdg_basedir - ]; + installFlags = [ "PREFIX=$(out)" ]; - preBuild = '' - git() { echo "v${version}"; } - export -f git + postInstall = '' + wrapProgram $out/bin/compton-trans \ + --prefix PATH : ${lib.makeBinPath [ xwininfo ]} + ''; + + meta = with lib; { + description = "A fork of XCompMgr, a sample compositing manager for X servers"; + longDescription = '' + A fork of XCompMgr, which is a sample compositing manager for X + servers supporting the XFIXES, DAMAGE, RENDER, and COMPOSITE + extensions. It enables basic eye-candy effects. This fork adds + additional features, such as additional effects, and a fork at a + well-defined and proper place. ''; - - NIX_CFLAGS_COMPILE = [ "-fno-strict-aliasing" ]; - - mesonFlags = [ - "-Dvsync_drm=true" - "-Dnew_backends=true" - "-Dbuild_docs=true" - ]; - - meta = { - homepage = https://github.com/yshui/compton/; - }; + license = licenses.mit; + homepage = "https://github.com/yshui/compton"; + maintainers = with maintainers; [ ertes enzime twey ]; + platforms = platforms.linux; }; -in { - compton = common stableSource; - compton-git = common gitSource; } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 992f8a4d4c3..91286b4bc06 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -59,6 +59,7 @@ mapAliases ({ clawsMail = claws-mail; # added 2016-04-29 clutter_gtk = clutter-gtk; # added 2018-02-25 conkerorWrapper = conkeror; # added 2015-01 + compton-git = compton; # added 2019-05-20 conntrack_tools = conntrack-tools; # added 2018-05 cool-old-term = cool-retro-term; # added 2015-01-31 cupsBjnp = cups-bjnp; # added 2016-01-02 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8000aea835b..858b634681c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20953,7 +20953,7 @@ in inherit (xorg) xcompmgr; - inherit (callPackage ../applications/window-managers/compton {}) compton compton-git; + compton = callPackage ../applications/window-managers/compton {}; xdaliclock = callPackage ../tools/misc/xdaliclock {}; From 446ac90e055b40a38cda81987e4170d5b281b574 Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Tue, 28 May 2019 13:44:29 +0200 Subject: [PATCH 26/52] python.pkgs.pyglet: hardcode library paths Fixes failure to find certain libraries such as libc. --- .../python-modules/pyglet/default.nix | 58 ++++++++++++++++--- 1 file changed, 51 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pyglet/default.nix b/pkgs/development/python-modules/pyglet/default.nix index 4bc1cd0608c..1b00e1264ff 100644 --- a/pkgs/development/python-modules/pyglet/default.nix +++ b/pkgs/development/python-modules/pyglet/default.nix @@ -1,5 +1,14 @@ -{ stdenv, buildPythonPackage, fetchPypi -, libGLU_combined, xorg, freetype, fontconfig, future}: +{ stdenv +, buildPythonPackage +, fetchPypi +, libGLU_combined +, xorg +, future +, pytest +, glibc +, gtk2-x11 +, gdk_pixbuf +}: buildPythonPackage rec { version = "1.3.2"; @@ -10,15 +19,50 @@ buildPythonPackage rec { sha256 = "b00570e7cdf6971af8953b6ece50d83d13272afa5d1f1197c58c0f478dd17743"; }; + # find_library doesn't reliably work with nix (https://github.com/NixOS/nixpkgs/issues/7307). + # Even naively searching `LD_LIBRARY_PATH` won't work since `libc.so` is a linker script and + # ctypes.cdll.LoadLibrary cannot deal with those. Therefore, just hardcode the paths to the + # necessary libraries. postPatch = let - libs = [ libGLU_combined xorg.libX11 freetype fontconfig ]; - paths = builtins.concatStringsSep "," (map (l: "\"${l}/lib\"") libs); - in "sed -i -e 's|directories\.extend.*lib[^]]*|&,${paths}|' pyglet/lib.py"; - - doCheck = false; + ext = stdenv.hostPlatform.extensions.sharedLibrary; + in '' + cat > pyglet/lib.py < Date: Tue, 28 May 2019 14:00:17 +0200 Subject: [PATCH 27/52] python.pkgs.roboschool: disable for python2 This has never worked. --- pkgs/development/python-modules/roboschool/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/python-modules/roboschool/default.nix b/pkgs/development/python-modules/roboschool/default.nix index 8aa45966bd2..a86e17e921b 100644 --- a/pkgs/development/python-modules/roboschool/default.nix +++ b/pkgs/development/python-modules/roboschool/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, isPy3k , python , fetchFromGitHub , fetchpatch @@ -23,6 +24,9 @@ buildPythonPackage rec { sha256 = "1s7rp5bbiglnrfm33wf7x7kqj0ks3b21bqyz18c5g6vx39rxbrmh"; }; + # fails to find boost_python for some reason + disabled = !isPy3k; + propagatedBuildInputs = [ gym ]; From 4c267a9fde6e8aa66c518dbe4054ddd7b9edaf24 Mon Sep 17 00:00:00 2001 From: sonercirit Date: Tue, 28 May 2019 15:17:38 +0300 Subject: [PATCH 28/52] jetbrains.webstorm: 2019.1.2 -> 2019.1.3 (#62146) --- 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 7bc25ceed7f..d4a65e083a6 100644 --- a/pkgs/applications/editors/jetbrains/default.nix +++ b/pkgs/applications/editors/jetbrains/default.nix @@ -380,12 +380,12 @@ in webstorm = buildWebStorm rec { name = "webstorm-${version}"; - version = "2019.1.2"; /* updated by script */ + version = "2019.1.3"; /* updated by script */ description = "Professional IDE for Web and JavaScript development"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "https://download.jetbrains.com/webstorm/WebStorm-${version}.tar.gz"; - sha256 = "198rbvhqjaix6qw36rlfafbv5aj0i6zr93adzgkilrn2l9v1jf07"; /* updated by script */ + sha256 = "1bhx2p40r15zvfr6q10bj5y8jaa3i9x9adchczp0irkd3w2jgvy3"; /* updated by script */ }; wmClass = "jetbrains-webstorm"; update-channel = "WebStorm RELEASE"; From c0c947814de666edd2771bdef7adca4e5d3f51e2 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 28 May 2019 08:44:42 -0400 Subject: [PATCH 29/52] oh-my-zsh: 2019-05-26 -> 2019-05-27 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 5de27309891..6046e9c24bd 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2019-05-26"; + version = "2019-05-27"; name = "oh-my-zsh-${version}"; - rev = "1343ab67edd8a81b75aceca77ddb526be87a20c1"; + rev = "7f66a070a4be1ae797151e761f9eaaf3ef8549a8"; src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - sha256 = "1932vwzbxd0i76hsjxn6ww3ydpwyk0w1k51xsps5m1q86m19jn5b"; + sha256 = "1k2yfyl7cpcnl0z2zay3i6ahfj90km9km4srsprkyy6fg00gfcgs"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From bd64cb2b433ab2fe0bebdd9563ccbe928d3ce914 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 28 May 2019 08:49:13 -0400 Subject: [PATCH 30/52] linux: 5.2-rc1 -> 5.2-rc2 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index e9cc370f4e7..1ebc7240d20 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, libelf, utillinux, ... } @ args: buildLinux (args // rec { - version = "5.2-rc1"; - modDirVersion = "5.2.0-rc1"; + version = "5.2-rc2"; + modDirVersion = "5.2.0-rc2"; extraMeta.branch = "5.2"; src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "169gjmciijgmwwfyz3n7pvf2x18pmfvgdk73s8jlx30ggwzgac1l"; + sha256 = "0fd6z6zx9a3ax5jyvxm7gmfzain26la5gf18fccxip7bfn72bj4f"; }; # Should the testing kernels ever be built on Hydra? From 02781acc38060cfddced1fc2468e936ab3560660 Mon Sep 17 00:00:00 2001 From: Renaud Date: Tue, 28 May 2019 14:54:17 +0200 Subject: [PATCH 31/52] gtk-gnutella: 1.1.9 -> 1.1.14 (#62151) and fix build -- previously failing on Hydra --- .../networking/p2p/gtk-gnutella/default.nix | 54 +++++++++++++------ 1 file changed, 38 insertions(+), 16 deletions(-) diff --git a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix index f63c1d474c0..fe9a5695a4b 100644 --- a/pkgs/tools/networking/p2p/gtk-gnutella/default.nix +++ b/pkgs/tools/networking/p2p/gtk-gnutella/default.nix @@ -1,29 +1,51 @@ -{ stdenv, fetchurl, bison, pkgconfig -, glib, gtk2, libxml2, gettext, zlib, binutils, gnutls }: +{ stdenv, fetchurl, fetchpatch, bison, pkgconfig, gettext, desktop-file-utils +, glib, gtk2, libxml2, libbfd, zlib, binutils, gnutls +}: -let - name = "gtk-gnutella"; - version = "1.1.9"; -in -stdenv.mkDerivation { - name = "${name}-${version}"; +stdenv.mkDerivation rec { + pname = "gtk-gnutella"; + version = "1.1.14"; src = fetchurl { - url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2"; - sha256 = "1zvadgsskmpm82id9mbj24a2lyq38qv768ixv7nmfjl3d4wr2biv"; + url = "mirror://sourceforge/${pname}/${version}/${pname}-${version}.tar.xz"; + sha256 = "0sljjha4anfz1r1xq1c6qnnkjv62ld56p7xgj4bsi6lqmq1azvii"; }; - nativeBuildInputs = [ bison gettext pkgconfig ]; - buildInputs = [ binutils glib gnutls gtk2 libxml2 zlib ]; + patches = [ + (fetchpatch { + # Avoid namespace conflict with glibc 2.28 'statx' struct / remove after v1.1.14 + url = "https://github.com/gtk-gnutella/gtk-gnutella/commit/e4205a082eb32161e28de81f5cba8095eea8ecc7.patch"; + sha256 = "0ffkw2cw2b2yhydii8jm40vd40p4xl224l8jvhimg02lgs3zfbca"; + }) + (fetchpatch { + url = "https://src.fedoraproject.org/rpms/gtk-gnutella/raw/f30/f/gtk-gnutella-1.1.14-endian.patch"; + sha256 = "19q4lq8msknfz4mkbjdqmmgld16p30j2yx371p8spmr19q5i0sfn"; + }) + ]; + + postPatch = '' + substituteInPlace Makefile.SH --replace "@exit 0" "@echo done" + ''; + + nativeBuildInputs = [ bison desktop-file-utils gettext pkgconfig ]; + buildInputs = [ binutils glib gnutls gtk2 libbfd libxml2 zlib ]; + + configureScript = "./build.sh"; + configureFlags = [ "--configure-only" ]; hardeningDisable = [ "bindnow" "fortify" "pic" "relro" ]; - configureScript = "./build.sh --configure-only"; + enableParallelBuilding = true; + + postInstall = '' + install -Dm0444 src/${pname}.man $out/share/man/man1/${pname}.1 + ''; meta = with stdenv.lib; { - homepage = http://gtk-gnutella.sourceforge.net/; - description = "Server/client for Gnutella"; - license = licenses.gpl2; + description = "A GTK+ Gnutella client, optimized for speed and scalability"; + homepage = "http://gtk-gnutella.sourceforge.net/"; # Code: https://github.com/gtk-gnutella/gtk-gnutella + changelog = "https://raw.githubusercontent.com/gtk-gnutella/gtk-gnutella/v${version}/ChangeLog"; + license = licenses.gpl2Plus; platforms = platforms.unix; }; } From 45e517b1009a3b52561856d754bb5685899ccec4 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Tue, 28 May 2019 01:02:56 +0300 Subject: [PATCH 32/52] reaverwps-t6x: 1.6.3 -> 1.6.5 --- pkgs/tools/networking/reaver-wps-t6x/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/networking/reaver-wps-t6x/default.nix b/pkgs/tools/networking/reaver-wps-t6x/default.nix index dd834771731..2d239180a93 100644 --- a/pkgs/tools/networking/reaver-wps-t6x/default.nix +++ b/pkgs/tools/networking/reaver-wps-t6x/default.nix @@ -1,25 +1,20 @@ { stdenv, fetchFromGitHub, libpcap, pixiewps, makeWrapper }: stdenv.mkDerivation rec { - version = "1.6.3"; - name = "reaver-wps-t6x-${version}"; + pname = "reaver-wps-t6x"; + version = "1.6.5"; src = fetchFromGitHub { owner = "t6x"; repo = "reaver-wps-fork-t6x"; rev = "v${version}"; - sha256 = "1bccwp67q1q0h5m38gqxn9imq5rb75jbmv7fjr2n38v10jcga2pb"; + sha256 = "03v5jyb4if74rpg0mcd8700snb120b6w2gnsa3aqdgj5676ic5dn"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ libpcap pixiewps ]; - preConfigure = "cd src"; - - installPhase = '' - mkdir -p $out/bin - cp reaver wash $out/bin/ - ''; + sourceRoot = "source/src"; meta = with stdenv.lib; { description = "Online and offline brute force attack against WPS"; From fbc46ae2caf38cb5a94e6040b63822961011997c Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Tue, 28 May 2019 12:09:20 -0400 Subject: [PATCH 33/52] Package the qView image viewer A fast, unobtrusive Qt-based image viewer. --- pkgs/applications/graphics/qview/default.nix | 22 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/applications/graphics/qview/default.nix diff --git a/pkgs/applications/graphics/qview/default.nix b/pkgs/applications/graphics/qview/default.nix new file mode 100644 index 00000000000..7e8ec9a3898 --- /dev/null +++ b/pkgs/applications/graphics/qview/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchFromGitHub, qmake}: +stdenv.mkDerivation rec { + name = "qview-${version}"; + version = "2.0"; + src = fetchFromGitHub { + owner = "jurplel"; + repo = "qView"; + rev = "${version}"; + sha256 = "1s29hz44rb5dwzq8d4i4bfg77dr0v3ywpvidpa6xzg7hnnv3mhi5"; + }; + nativeBuildInputs = [ qmake ]; + patchPhase = '' + sed "s|/usr/|$out/|g" -i qView.pro + ''; + meta = with stdenv.lib; { + description = "Practical and minimal image viewer"; + homepage = https://interversehq.com/qview/; + license = licenses.gpl3; + maintainers = with maintainers; [ acowley ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6dcede063b8..c407c454bd5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5456,6 +5456,8 @@ in quota = if stdenv.isLinux then linuxquota else unixtools.quota; + qview = libsForQt5.callPackage ../applications/graphics/qview {}; + wiggle = callPackage ../development/tools/wiggle { }; radamsa = callPackage ../tools/security/radamsa { }; From 7af3d2198f73387b8e0024e2f02aaace2991a6a0 Mon Sep 17 00:00:00 2001 From: derped Date: Sat, 18 May 2019 04:22:02 +0200 Subject: [PATCH 34/52] krita: fixed missing python path --- pkgs/applications/graphics/krita/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 507cee548e0..c08bd52c989 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, stdenv, fetchurl, cmake, extra-cmake-modules +{ mkDerivation, lib, stdenv, makeWrapper, fetchurl, cmake, extra-cmake-modules , karchive, kconfig, kwidgetsaddons, kcompletion, kcoreaddons , kguiaddons, ki18n, kitemmodels, kitemviews, kwindowsystem , kio, kcrash @@ -25,7 +25,7 @@ mkDerivation rec { sha256 = "0h2rplc76r82b8smk61zci1ijj9xkjmf20pdqa8fc2lz4zicjxh4"; }; - nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip ]; + nativeBuildInputs = [ cmake extra-cmake-modules python3Packages.sip makeWrapper ]; buildInputs = [ karchive kconfig kwidgetsaddons kcompletion kcoreaddons kguiaddons @@ -44,6 +44,12 @@ mkDerivation rec { "-DCMAKE_BUILD_TYPE=RelWithDebInfo" ]; + postInstall = '' + for i in $out/bin/*; do + wrapProgram $i --prefix PYTHONPATH : "$PYTHONPATH" + done + ''; + meta = with lib; { description = "A free and open source painting application"; homepage = https://krita.org/; From 91d18c0f4b4510e041193f2b09246ae5cd76861a Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 28 May 2019 20:45:56 +0200 Subject: [PATCH 35/52] python3Packages.dynd: Fix build --- pkgs/development/python-modules/dynd/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/dynd/default.nix b/pkgs/development/python-modules/dynd/default.nix index 8d8fbf7a7ce..337763afbd4 100644 --- a/pkgs/development/python-modules/dynd/default.nix +++ b/pkgs/development/python-modules/dynd/default.nix @@ -30,7 +30,8 @@ buildPythonPackage rec { # Python 3 works but has a broken import test that I couldn't # figure out. doCheck = !isPy3k; - buildInputs = [ pkgs.cmake pkgs.libdynd.dev cython ]; + nativeBuildInputs = [ pkgs.cmake ]; + buildInputs = [ pkgs.libdynd.dev cython ]; propagatedBuildInputs = [ numpy pkgs.libdynd ]; meta = with stdenv.lib; { From bb57a1056e6594b194612f05f76c885963f3617f Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Tue, 28 May 2019 21:46:47 +0200 Subject: [PATCH 36/52] spectacle: fix qdbus path in desktop shortcut --- pkgs/applications/kde/spectacle.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/kde/spectacle.nix b/pkgs/applications/kde/spectacle.nix index f036e8cf632..58eb288f6cc 100644 --- a/pkgs/applications/kde/spectacle.nix +++ b/pkgs/applications/kde/spectacle.nix @@ -4,7 +4,7 @@ ki18n, xcb-util-cursor, kconfig, kcoreaddons, kdbusaddons, kdeclarative, kio, kipi-plugins, knotifications, kscreen, kwidgetsaddons, kwindowsystem, kxmlgui, libkipi, - qtx11extras, knewstuff + qtx11extras, knewstuff, qttools }: mkDerivation { @@ -16,5 +16,9 @@ mkDerivation { kscreen kwidgetsaddons kwindowsystem kxmlgui libkipi qtx11extras xcb-util-cursor knewstuff ]; + postPatch = '' + substituteInPlace desktop/org.kde.spectacle.desktop \ + --replace "Exec=qdbus" "Exec=${lib.getBin qttools}/bin/qdbus" + ''; propagatedUserEnvPkgs = [ kipi-plugins libkipi ]; } From 6f07f1598f15169a96dcc0e91ecdb1cb79c13282 Mon Sep 17 00:00:00 2001 From: Anthony Cowley Date: Tue, 28 May 2019 16:12:38 -0400 Subject: [PATCH 37/52] Address comments by @aanderse --- pkgs/applications/graphics/qview/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/qview/default.nix b/pkgs/applications/graphics/qview/default.nix index 7e8ec9a3898..0595ab2963c 100644 --- a/pkgs/applications/graphics/qview/default.nix +++ b/pkgs/applications/graphics/qview/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchFromGitHub, qmake}: stdenv.mkDerivation rec { - name = "qview-${version}"; + pname = "qview"; version = "2.0"; src = fetchFromGitHub { owner = "jurplel"; repo = "qView"; - rev = "${version}"; + rev = version; sha256 = "1s29hz44rb5dwzq8d4i4bfg77dr0v3ywpvidpa6xzg7hnnv3mhi5"; }; nativeBuildInputs = [ qmake ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { description = "Practical and minimal image viewer"; - homepage = https://interversehq.com/qview/; + homepage = "https://interversehq.com/qview/"; license = licenses.gpl3; maintainers = with maintainers; [ acowley ]; platforms = platforms.all; From 4b46acd49882b462b3e3b5fcf7a16e9d2ce1ca76 Mon Sep 17 00:00:00 2001 From: Alex Ameen Date: Mon, 27 May 2019 00:46:05 -0500 Subject: [PATCH 38/52] genymotion: refactor src from requireFile to fetchurl The old src url was updated by the host, making the required file inaccessible. The new url links directly to the required file. This direct link allows us to use fetchurl rather than requireFile. genymotion: refactor src url Fixed revisions: 1) Uses `pname`. 2) URL uses version variable in path. Data type for `url` was changed from path to string. genymotion: refactor src url Removed redundant `name` definition. fixed typo in URL changed requireFile to fetchurl --- pkgs/development/mobile/genymotion/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index 37834eff947..ba498ce0953 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon +{ stdenv, fetchurl, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon , xdg_utils # For glewinfo , libXmu, libXi, libXext }: @@ -10,10 +10,10 @@ let libPath = "${stdenv.lib.makeLibraryPath packages}"; in stdenv.mkDerivation rec { - name = "genymotion-${version}"; + pname = "genymotion"; version = "2.8.0"; - src = requireFile { - url = https://www.genymotion.com/download/; + src = fetchurl { + url = "https://dl.genymotion.com/releases/genymotion-${version}/genymotion-${version}-linux_x64.bin"; name = "genymotion-${version}-linux_x64.bin"; sha256 = "0lvfdlpmmsyq2i9gs4mf6a8fxkfimdr4rhyihqnfhjij3fzxz4lk"; }; @@ -24,12 +24,12 @@ stdenv.mkDerivation rec { mkdir -p phony-home $out/share/applications export HOME=$TMP/phony-home - mkdir ${name} - echo "y" | sh $src -d ${name} - sourceRoot=${name} + mkdir ${pname} + echo "y" | sh $src -d ${pname} + sourceRoot=${pname} substitute phony-home/.local/share/applications/genymobile-genymotion.desktop \ - $out/share/applications/genymobile-genymotion.desktop --replace "$TMP/${name}" "$out/libexec" + $out/share/applications/genymobile-genymotion.desktop --replace "$TMP/${pname}" "$out/libexec" ''; installPhase = '' From a1ed58d6a8e7b37a696d140aedcd533035f95989 Mon Sep 17 00:00:00 2001 From: Silvan Mosberger Date: Tue, 28 May 2019 23:18:58 +0200 Subject: [PATCH 39/52] pingus: Fix build --- pkgs/games/pingus/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix index e8bac9571f8..6beb68b97ab 100644 --- a/pkgs/games/pingus/default.nix +++ b/pkgs/games/pingus/default.nix @@ -25,7 +25,8 @@ stdenv.mkDerivation rec { sha256 = "0nqyhznnnvpgfa6rfv8rapjfpw99b67n97jfqp9r3hpib1b3ja6p"; }) ]; - makeFlags = '' PREFIX="$(out)" ''; + makeFlags = "PREFIX=${placeholder "out"}"; + dontUseSconsInstall = true; meta = { inherit (s) version; description = ''A puzzle game with mechanics similar to Lemmings''; From d8aee48e778a7d63d3782d389d4c67ba4a9187fb Mon Sep 17 00:00:00 2001 From: Peter Romfeld Date: Mon, 20 May 2019 12:05:06 +0800 Subject: [PATCH 40/52] elasticmq-server-bin: init at 0.14.6 --- pkgs/servers/elasticmq-server-bin/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/servers/elasticmq-server-bin/default.nix diff --git a/pkgs/servers/elasticmq-server-bin/default.nix b/pkgs/servers/elasticmq-server-bin/default.nix new file mode 100644 index 00000000000..d52fdd14301 --- /dev/null +++ b/pkgs/servers/elasticmq-server-bin/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, jdk, jre, makeWrapper }: + +stdenv.mkDerivation rec { + pname = "elasticmq-server"; + version = "0.14.6"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "https://s3-eu-west-1.amazonaws.com/softwaremill-public/${name}.jar"; + sha256 = "1cp2pmkc6gx7gr6109jlcphlky5rr6s1wj528r6hyhzdc01sjhhz"; + }; + + # don't do anything? + unpackPhase = "${jdk}/bin/jar xf $src favicon.png"; + + nativeBuildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin $out/share/elasticmq-server + + cp $src $out/share/elasticmq-server/elasticmq-server.jar + + # TODO: how to add extraArgs? current workaround is to use JAVA_TOOL_OPTIONS environment to specify properties + makeWrapper ${jre}/bin/java $out/bin/elasticmq-server \ + --add-flags "-jar $out/share/elasticmq-server/elasticmq-server.jar" + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/softwaremill/elasticmq"; + description = "Message queueing system with Java, Scala and Amazon SQS-compatible interfaces"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = with maintainers; [ peterromfeldhk ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 858b634681c..86a023fb8c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14162,6 +14162,8 @@ in elasticmq = callPackage ../servers/elasticmq { }; + elasticmq-server-bin = callPackage ../servers/elasticmq-server-bin { }; + eventstore = callPackage ../servers/nosql/eventstore { Nuget = dotnetPackages.Nuget; }; From ddfb687d5e164c83aee2a55194fc1eac2898f2a2 Mon Sep 17 00:00:00 2001 From: lassulus Date: Sun, 26 May 2019 09:20:12 +0200 Subject: [PATCH 41/52] nixos/syncthing: better examples for declarative options --- nixos/modules/services/networking/syncthing.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/networking/syncthing.nix b/nixos/modules/services/networking/syncthing.nix index d495703fc53..e011172ffa7 100644 --- a/nixos/modules/services/networking/syncthing.nix +++ b/nixos/modules/services/networking/syncthing.nix @@ -105,13 +105,12 @@ in { description = '' Peers/devices which syncthing should communicate with. ''; - example = [ - { - name = "bigbox"; + example = { + bigbox = { id = "7CFNTQM-IMTJBHJ-3UWRDIU-ZGQJFR6-VCXZ3NB-XUH3KZO-N52ITXR-LAIYUAU"; addresses = [ "tcp://192.168.0.10:51820" ]; - } - ]; + }; + }; type = types.attrsOf (types.submodule ({ config, ... }: { options = { @@ -169,6 +168,12 @@ in { description = '' folders which should be shared by syncthing. ''; + example = { + "/home/user/sync" = { + id = "syncme"; + devices = [ "bigbox" ]; + }; + }; type = types.attrsOf (types.submodule ({ config, ... }: { options = { From 90267ba813b50b998a6598221ce958cb1beff28e Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Tue, 28 May 2019 17:58:04 -0400 Subject: [PATCH 42/52] oh-my-zsh: 2019-05-27 -> 2019-05-28 --- pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/oh-my-zsh/default.nix b/pkgs/shells/zsh/oh-my-zsh/default.nix index 6046e9c24bd..0b8f69c349a 100644 --- a/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -4,13 +4,13 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - version = "2019-05-27"; + version = "2019-05-28"; name = "oh-my-zsh-${version}"; - rev = "7f66a070a4be1ae797151e761f9eaaf3ef8549a8"; + rev = "9930dd6e49df5630ac23c68b85465f0bb801d17f"; src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - sha256 = "1k2yfyl7cpcnl0z2zay3i6ahfj90km9km4srsprkyy6fg00gfcgs"; + sha256 = "1gncl7irz0drlg7rrnb9iqzslflhrpfgsjg7kmdkchp8gj7750hl"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From 3b3824778159a232767a1328c05523d607e21841 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 29 May 2019 00:27:39 +0200 Subject: [PATCH 43/52] gns3Packages.{server,gui}Stable: 2.1.18 -> 2.1.19 --- pkgs/applications/networking/gns3/default.nix | 6 +++--- pkgs/applications/networking/gns3/server.nix | 6 ++---- 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index 6ef4465cd92..6a7a4a9d8cd 100644 --- a/pkgs/applications/networking/gns3/default.nix +++ b/pkgs/applications/networking/gns3/default.nix @@ -1,7 +1,7 @@ { callPackage, stdenv }: let - stableVersion = "2.1.18"; + stableVersion = "2.1.19"; previewVersion = "2.2.0b1"; addVersion = args: let version = if args.stable then stableVersion else previewVersion; @@ -9,8 +9,8 @@ let in args // { inherit version branch; }; mkGui = args: callPackage (import ./gui.nix (addVersion args)) { }; mkServer = args: callPackage (import ./server.nix (addVersion args)) { }; - guiSrcHash = "00hcri32vakz17ywbqd9lycxdai490ds0g1v8znm75ddvszfbv7i"; - serverSrcHash = "0f28f5f4dsr8h4q592dh9i1z0gp836gdgm8clwrkb7i01df0rrlf"; + guiSrcHash = "0bn0qry0djw17zwa16cc69273crnfzppik07f9w20hhr8kjiyvnx"; + serverSrcHash = "1af6pnmr24syx23pqvwchgwy74263k3ccrv7barxi71wsskjlw5a"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index dcad3027e96..0c57a52ee6b 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -22,10 +22,10 @@ let doCheck = false; }); aiohttp-cors = super.aiohttp-cors.overridePythonAttrs (oldAttrs: rec { - version = "0.5.3"; + version = "0.6.0"; src = oldAttrs.src.override { inherit version; - sha256 = "11b51mhr7wjfiikvj3nc5s8c7miin2zdhl3yrzcga4mbpkj892in"; + sha256 = "1r0mb4dw0dc1lpi54dk5vxqs06nyhvagp76lyrvk7rd94z5mjkd4"; }; propagatedBuildInputs = with self; [ aiohttp ] ++ stdenv.lib.optional (pythonOlder "3.5") typing; @@ -45,8 +45,6 @@ in python.pkgs.buildPythonPackage { }; postPatch = '' - # "typing" is only required for Python 3.4 and breaks Python 3.7: - sed -iE "s/.*typing.*//" requirements.txt # Only 2.x is problematic: sed -iE "s/prompt-toolkit==1.0.15/prompt-toolkit<2.0.0/" requirements.txt ''; From 769b7ee861f5697cc8965af340652f453a13d238 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 29 May 2019 00:35:48 +0200 Subject: [PATCH 44/52] androidStudioPackages.beta: 3.5.0.14 -> 3.5.0.15 --- pkgs/applications/editors/android-studio/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 880b5443f8b..2f90699014c 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -13,9 +13,9 @@ let sha256Hash = "0y4l9d1yrvv1csx6vl4jnqgqy96y44rl6p8hcxrnbvrg61iqnj30"; }; betaVersion = { - version = "3.5.0.14"; # "Android Studio 3.5 Beta 2" - build = "191.5549111"; - sha256Hash = "1zy2x0m1nsx3yy64cp1jvgb9aqkribwm64mv50g9355sdz7qjhcf"; + version = "3.5.0.15"; # "Android Studio 3.5 Beta 3" + build = "191.5585527"; + sha256Hash = "0b9yj3rf3nk8y9qfmf5kjh8rwn73v7ghym1bhz864r079h7lwr53"; }; latestVersion = { # canary & dev version = "3.6.0.1"; # "Android Studio 3.6 Canary 1" From 368f87021970d43399b6ac68eae129c711bf4d2f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 28 May 2019 18:25:05 -0500 Subject: [PATCH 45/52] libqalculate,qalculate-gtk: 3.1.0 -> 3.2.0 --- pkgs/applications/science/math/qalculate-gtk/default.nix | 4 ++-- pkgs/development/libraries/libqalculate/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/math/qalculate-gtk/default.nix b/pkgs/applications/science/math/qalculate-gtk/default.nix index 0e0df9d72fe..4da3a3f3d7b 100644 --- a/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "1ayhzsxf2qgs4j1j0xl942ysfy3zl2z1fp7l2s5nh5awr41mhnqc"; + sha256 = "1yhhfqcxi1b7dfrl8qh16l9iwgzvw1p0hhl7nnjpxhdwxz880sv0"; }; patchPhase = '' diff --git a/pkgs/development/libraries/libqalculate/default.nix b/pkgs/development/libraries/libqalculate/default.nix index 5127bd65c09..49490e1f785 100644 --- a/pkgs/development/libraries/libqalculate/default.nix +++ b/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.1.0"; + version = "3.2.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "1r0l0aik3fiyskpdgw93gxqgw109g6pa27y983rirhl6rricp3wf"; + sha256 = "0f82jss3kjxsk8znvrg1vfh756nnc15sbzr34ww1dvvrxipi7sns"; }; outputs = [ "out" "dev" "doc" ]; From 984cc997bc6f958f6b59e012acfcf65afbc728f4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Tue, 28 May 2019 17:53:09 -0500 Subject: [PATCH 46/52] yubikey-manager: 2.1.0 -> 2.1.1 --- pkgs/tools/misc/yubikey-manager/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index 294e613a1bb..e8588c14bba 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -3,11 +3,11 @@ python3Packages.buildPythonPackage rec { pname = "yubikey-manager"; - version = "2.1.0"; + version = "2.1.1"; srcs = fetchurl { url = "https://developers.yubico.com/${pname}/Releases/${pname}-${version}.tar.gz"; - sha256 = "11rsmcaj60k3y5m5gdhr2nbbz0w5dm3m04klyxz0fh5hnpcmr7fm"; + sha256 = "1jmczk6r6609kzbq4ixispkm4qpvw94wdyfps7q3r96x75si1p1s"; }; propagatedBuildInputs = From 8fc3b6a7fa3de0c6a699615ff0f698240a293cf6 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Sat, 25 May 2019 13:39:33 -0500 Subject: [PATCH 47/52] xonsh: 0.9.0 -> 0.9.4 --- pkgs/shells/xonsh/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/xonsh/default.nix b/pkgs/shells/xonsh/default.nix index c7609a5f124..acce319ce26 100644 --- a/pkgs/shells/xonsh/default.nix +++ b/pkgs/shells/xonsh/default.nix @@ -2,14 +2,14 @@ python3Packages.buildPythonApplication rec { pname = "xonsh"; - version = "0.9.0"; + version = "0.9.4"; # fetch from github because the pypi package ships incomplete tests src = fetchFromGitHub { owner = "scopatz"; repo = "xonsh"; rev = "refs/tags/${version}"; - sha256 = "1833xqw5y65cv3c71skqix1xh3qqgv1kps1500cczpyrc8daka23"; + sha256 = "1gxshi6k030a48bw4nr7rn9fh3cc0nmrkqjpxfrdxyq472d61477"; }; LC_ALL = "en_US.UTF-8"; From 5e0cab80c58efca024654a120f9deaa56a862aac Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 28 May 2019 20:53:40 -0500 Subject: [PATCH 48/52] foundationdb: default to 6.1.8 (from 6.0.18) Signed-off-by: Austin Seipp --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 86a023fb8c6..2587ca1988b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3067,7 +3067,7 @@ in foundationdb61 ; - foundationdb = foundationdb60; + foundationdb = foundationdb61; fuse-7z-ng = callPackage ../tools/filesystems/fuse-7z-ng { }; From 63ff37f27805675cd35dc6fed8d0649d84b85be8 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Tue, 28 May 2019 21:42:40 -0500 Subject: [PATCH 49/52] liburing: 1.0.0pre118_2e719820 -> 1.0.0pre131_b422aa11cc Signed-off-by: Austin Seipp --- .../libraries/liburing/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/liburing/default.nix b/pkgs/development/libraries/liburing/default.nix index b7dd2c8ae17..c0d1201c165 100644 --- a/pkgs/development/libraries/liburing/default.nix +++ b/pkgs/development/libraries/liburing/default.nix @@ -3,24 +3,25 @@ stdenv.mkDerivation rec { name = "liburing-${version}"; - version = "1.0.0pre118_${builtins.substring 0 7 src.rev}"; + version = "1.0.0pre131_${builtins.substring 0 7 src.rev}"; src = fetchgit { url = "http://git.kernel.dk/liburing"; - rev = "2e719820d47cdb48308265f95547d2c9458bbfe7"; - sha256 = "0sm2k5f15ad9b9wh928kmbb399f5f7frfh96bi865pklavpcckf5"; + rev = "b422aa11cc58e9786fa1e343aa2bfa6d7a394445"; + sha256 = "0afm0kfhi025m5r0bri8if59m85rwg6kxlkx075lbwg9pw1n75w0"; }; enableParallelBuilding = true; outputs = [ "out" "lib" "dev" "man" ]; - installFlags = - [ "prefix=$(out)" - "includedir=$(dev)/include" - "libdir=$(lib)/lib" - "mandir=$(man)/share/man" - ]; + configurePhase = '' + ./configure \ + --prefix=$out \ + --includedir=$dev/include \ + --libdir=$lib/lib \ + --mandir=$man/share/man \ + ''; # Copy the examples into $out. postInstall = '' From 3ca7fc10e851602fd8360446bbece868e4a4a167 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 21 May 2019 22:17:57 +0200 Subject: [PATCH 50/52] ocamlPackages.earley: 1.0.2 -> 2.0.0 --- .../ocaml-modules/earley/default.nix | 31 +++++++------------ .../ocaml-modules/earley_ocaml/default.nix | 30 ------------------ pkgs/top-level/ocaml-packages.nix | 2 -- 3 files changed, 11 insertions(+), 52 deletions(-) delete mode 100644 pkgs/development/ocaml-modules/earley_ocaml/default.nix diff --git a/pkgs/development/ocaml-modules/earley/default.nix b/pkgs/development/ocaml-modules/earley/default.nix index 576d9b2528f..ab3011361e1 100644 --- a/pkgs/development/ocaml-modules/earley/default.nix +++ b/pkgs/development/ocaml-modules/earley/default.nix @@ -1,28 +1,19 @@ -{ stdenv, fetchFromGitHub, which, ocaml, findlib, ocamlbuild }: +{ lib, fetchurl, buildDunePackage }: -if !stdenv.lib.versionAtLeast ocaml.version "4.03" -then throw "earley is not available for OCaml ${ocaml.version}" -else - -stdenv.mkDerivation rec { - version = "1.0.2"; - name = "ocaml${ocaml.version}-earley-${version}"; - src = fetchFromGitHub { - owner = "rlepigre"; - repo = "ocaml-earley"; - rev = "ocaml-earley_${version}"; - sha256 = "110njakmx1hyq42hyr6gx6qhaxly860whfhd6r0vks4yfp68qvcx"; +buildDunePackage rec { + version = "2.0.0"; + pname = "earley"; + src = fetchurl { + url = "https://github.com/rlepigre/ocaml-earley/releases/download/${version}/earley-${version}.tbz"; + sha256 = "1kjr0wh3lji7f493kf48rphxnlv3sygj5a8rmx9z3xkpbd7aqyyw"; }; - buildInputs = [ which ocaml findlib ocamlbuild ]; - - createFindlibDestdir = true; + minimumOCamlVersion = "4.03"; meta = { description = "Parser combinators based on Earley Algorithm"; - license = stdenv.lib.licenses.cecill-b; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; - inherit (src.meta) homepage; + license = lib.licenses.cecill-b; + maintainers = [ lib.maintainers.vbgl ]; + homepage = "https://github.com/rlepigre/ocaml-earley"; }; } diff --git a/pkgs/development/ocaml-modules/earley_ocaml/default.nix b/pkgs/development/ocaml-modules/earley_ocaml/default.nix deleted file mode 100644 index 92a1eb1e5c8..00000000000 --- a/pkgs/development/ocaml-modules/earley_ocaml/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchFromGitHub, which, ocaml, findlib, ocamlbuild, earley }: - -stdenv.mkDerivation rec { - version = "1.0.2"; - name = "ocaml${ocaml.version}-earley_ocaml-${version}"; - src = fetchFromGitHub { - owner = "rlepigre"; - repo = "ocaml-earley-ocaml"; - rev = "ocaml-earley-ocaml_${version}"; - sha256 = "0f8kr49r2xfs7cbzps4r9i92ckhwssaiydam846jrky3z5djn2jc"; - }; - - buildInputs = [ which ocaml findlib ocamlbuild ]; - - propagatedBuildInputs = [ earley ]; - - preBuild = "make"; - - createFindlibDestdir = true; - - installFlags = [ "BINDIR=$(out)/bin" ]; - - meta = { - description = "Extensible OCaml parser to be used with Earley"; - license = stdenv.lib.licenses.cecill-b; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - inherit (ocaml.meta) platforms; - inherit (src.meta) homepage; - }; -} diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 8886647420c..651cfa47e1a 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -217,8 +217,6 @@ let earley = callPackage ../development/ocaml-modules/earley { }; - earley_ocaml = callPackage ../development/ocaml-modules/earley_ocaml { }; - easy-format = callPackage ../development/ocaml-modules/easy-format { }; elina = callPackage ../development/ocaml-modules/elina { }; From 1540c0e120cad9a434af9f362378063c41e8987e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 23 May 2019 20:51:40 -0500 Subject: [PATCH 51/52] wireshark: 3.0.1 -> 3.0.2 --- pkgs/applications/networking/sniffers/wireshark/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 35d60497ba8..401e4964801 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -10,7 +10,7 @@ assert withQt -> qt5 != null; with stdenv.lib; let - version = "3.0.1"; + version = "3.0.2"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "13605bpnnbqsdr8ybqnscbz9g422zmyymn4q5aci28vc1wylr1l6"; + sha256 = "0fz5lbyiw4a27fqc4ndi1w20bpcb6wi9k7vjv29l9fhd99kca7ky"; }; cmakeFlags = [ From 101b2ff117ceca82ca400e675404f1b28cf5e3ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 28 May 2019 11:58:35 +0100 Subject: [PATCH 52/52] sysdig: 0.25 -> 0.26.1 (cherry picked from commit 16ea5a8ca3b90d48a246a926b624ff0b92724249) --- pkgs/os-specific/linux/sysdig/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 87cc4db640e..3001c8f07c5 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "sysdig-${version}"; - version = "0.25"; + version = "0.26.1"; src = fetchFromGitHub { owner = "draios"; repo = "sysdig"; rev = version; - sha256 = "1591jz4fmgk5r3q410h771nzhv6wfqpnr7pn34kpc5rl0vhky37m"; + sha256 = "0mvm14s5lyxddf6fcfwrv7vd8r8vfw9z4447jl5mcvji2rnyywqz"; }; nativeBuildInputs = [ cmake perl ]; @@ -33,6 +33,8 @@ stdenv.mkDerivation rec { ]; preConfigure = '' + cmakeFlagsArray+=(-DCMAKE_EXE_LINKER_FLAGS="-ltbb -lcurl") + export INSTALL_MOD_PATH="$out" '' + optionalString (kernel != null) '' export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"