From 517c29935b6e4dec12571e7d101e2b0da220263d Mon Sep 17 00:00:00 2001 From: Michael Gough Date: Thu, 12 Jul 2018 16:03:05 +0000 Subject: [PATCH 01/91] libcsptr: init at 2.0.4 --- maintainers/maintainer-list.nix | 5 ++++ .../libraries/libcsptr/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 30 insertions(+) create mode 100644 pkgs/development/libraries/libcsptr/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 16bd5795b24..a477b4802dc 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -97,6 +97,11 @@ github = "FireyFly"; name = "Jonas Höglund"; }; + fragamus = { + email = "innovative.engineer@gmail.com"; + github = "fragamus"; + name = "Michael Gough"; + }; Fresheyeball = { email = "fresheyeball@gmail.com"; github = "fresheyeball"; diff --git a/pkgs/development/libraries/libcsptr/default.nix b/pkgs/development/libraries/libcsptr/default.nix new file mode 100644 index 00000000000..d7638dd2059 --- /dev/null +++ b/pkgs/development/libraries/libcsptr/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake, git }: + +stdenv.mkDerivation rec { + name = "libcsptr-${version}"; + version = "2.0.4"; + + src = fetchFromGitHub { + owner = "Snaipe"; + repo = "libcsptr"; + rev = "v${version}"; + sha256 = "0i1498h2i6zq3fn3zf3iw7glv6brn597165hnibgwccqa8sh3ich"; + }; + + nativeBuildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "Smart pointer constructs for the (GNU) C programming language"; + homepage = https://github.com/Snaipe/libcsptr; + license = licenses.mit; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = [ maintainers.fragamus ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b1219690d7..e492a5d5634 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3372,6 +3372,8 @@ with pkgs; libcpuid = callPackage ../tools/misc/libcpuid { }; + libcsptr = callPackage ../development/libraries/libcsptr { }; + libscrypt = callPackage ../development/libraries/libscrypt { }; libcloudproviders = callPackage ../development/libraries/libcloudproviders { }; From ba54c9659355248c0ae495c1e315a8f0af37a0ce Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Wed, 3 Apr 2019 04:22:24 -0700 Subject: [PATCH 02/91] yandex-disk: 0.1.5.978 -> 0.1.5.1010 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/yandex-disk/versions --- pkgs/tools/filesystems/yandex-disk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 6acb034d75b..15c61513d9a 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -4,7 +4,7 @@ let p = if stdenv.is64bit then { arch = "x86_64"; gcclib = "${stdenv.cc.cc.lib}/lib64"; - sha256 = "1skbzmrcjbw00a3jnbl2llqwz3ahsgvq74mjav68s2hw1wjidvk6"; + sha256 = "1hxsizk3hm1465wkxwdbbcffgi3r64y3r0zsfzsvhvnzx4y5dadm"; } else { arch = "i386"; @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { name = "yandex-disk-${version}"; - version = "0.1.5.978"; + version = "0.1.5.1010"; src = fetchurl { url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${name}-1.fedora.${p.arch}.rpm"; From 4c5dc1fa30f382b3a3ac78dcc83341e5cf895e19 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Wed, 8 May 2019 17:01:05 +0200 Subject: [PATCH 03/91] memtest86+: 5.01+coreboot-20180113 -> 5.01-coreboot-002 Latest stable stag of the coreboot fork --- pkgs/tools/misc/memtest86+/default.nix | 24 +++++++----------------- 1 file changed, 7 insertions(+), 17 deletions(-) diff --git a/pkgs/tools/misc/memtest86+/default.nix b/pkgs/tools/misc/memtest86+/default.nix index 7bebc26d7ec..b1d1971c75c 100644 --- a/pkgs/tools/misc/memtest86+/default.nix +++ b/pkgs/tools/misc/memtest86+/default.nix @@ -1,23 +1,15 @@ { stdenv, fetchgit }: stdenv.mkDerivation rec { - name = "memtest86+-5.01+coreboot-20180113"; + pname = "memtest86+"; + version = "5.01-coreboot-002"; src = fetchgit { - url = "https://review.coreboot.org/memtest86plus"; - rev = "5ca4eb9544e51254254d09ae6e70f93403469ec3"; - sha256 = "08m4rjr0chhhb1whgggknz926zv9hm8bisnxqp8lffqiwhb55rgk"; + url = "https://review.coreboot.org/memtest86plus.git"; + rev = "v002"; + sha256 = "0cwx20yja24bfknqh1rjb5rl2c0kwnppzsisg1dibbak0l8mxchk"; }; - preBuild = '' - # Really dirty hack to get Memtest to build without needing a Glibc - # with 32-bit libraries and headers. - if test "$system" = x86_64-linux; then - mkdir gnu - touch gnu/stubs-32.h - fi - ''; - NIX_CFLAGS_COMPILE = "-I. -std=gnu90"; hardeningDisable = [ "all" ]; @@ -27,13 +19,11 @@ stdenv.mkDerivation rec { doCheck = false; # fails installPhase = '' - mkdir -p $out - chmod -x memtest.bin - cp memtest.bin $out/ + install -Dm0444 -t $out/ memtest.bin ''; meta = { - homepage = http://www.memtest.org/; + homepage = "http://www.memtest.org/"; description = "A tool to detect memory errors"; license = stdenv.lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; From e6b2fbeb70142d696858432d0b7b6337813a1353 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Wed, 8 May 2019 17:10:17 +0200 Subject: [PATCH 04/91] memtest86: remove and alias to memtest86plus Legacy memtest86 was broken since NixOS 16.09 + we've already been using memtest86+ fork through 'boot.loader.grub.memtest86.enable' --- pkgs/tools/misc/memtest86/default.nix | 32 --------------------------- pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 1 insertion(+), 34 deletions(-) delete mode 100644 pkgs/tools/misc/memtest86/default.nix diff --git a/pkgs/tools/misc/memtest86/default.nix b/pkgs/tools/misc/memtest86/default.nix deleted file mode 100644 index 2e364e33fc6..00000000000 --- a/pkgs/tools/misc/memtest86/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation { - name = "memtest86-4.3.6"; - - src = fetchurl { - url = https://www.memtest86.com/downloads/memtest86-4.3.6-src.tar.gz; - sha256 = "0qbksyl2hmkm12n7zbmf2m2n3q811skhykxx6a9a7y6r7k8y5qmv"; - }; - - preBuild = '' - # Really dirty hack to get Memtest to build without needing a Glibc - # with 32-bit libraries and headers. - if test "$system" = x86_64-linux; then - mkdir gnu - touch gnu/stubs-32.h - fi - ''; - - NIX_CFLAGS_COMPILE = "-I."; - - installPhase = '' - mkdir -p $out - cp memtest.bin $out/ - ''; - - meta = { - homepage = http://memtest86.com/; - description = "A tool to detect memory errors, to be run from a bootloader"; - broken = true; - }; -} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index a4bea8b8033..52464121ee5 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -181,6 +181,7 @@ mapAliases ({ m3d-linux = m33-linux; # added 2016-08-13 man_db = man-db; # added 2016-05 manpages = man-pages; # added 2015-12-06 + memtest86 = memtest86plus; # added 2019-05-08 midoriWrapper = midori; # added 2015-01 mlt-qt5 = libsForQt5.mlt; # added 2015-12-19 mobile_broadband_provider_info = mobile-broadband-provider-info; # added 2018-02-25 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 409e6f10731..d57eef25f92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4390,8 +4390,6 @@ in memtier-benchmark = callPackage ../tools/networking/memtier-benchmark { }; - memtest86 = callPackage ../tools/misc/memtest86 { }; - memtest86-efi = callPackage ../tools/misc/memtest86-efi { }; memtest86plus = callPackage ../tools/misc/memtest86+ { }; From 5c921ba498ad3fbf565ba80b40275b7ae8cb476c Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Wed, 8 May 2019 22:05:41 -0400 Subject: [PATCH 05/91] linux_testing_bcachefs: 5.0.2019.04.04 -> 5.0.2019.05.08 --- pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix index 144ac0e07cb..45e55e03c81 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing-bcachefs.nix @@ -1,13 +1,13 @@ { stdenv, buildPackages, fetchgit, fetchpatch, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "5.0.2019.04.04"; + version = "5.0.2019.05.08"; modDirVersion = "5.0.0"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs.git"; - rev = "d83b992f653d9f742f3f8567dbcfd1f4f72e858f"; - sha256 = "17xipjhkl4arshyj3riwq4pgl2qqcnlfhaga77a430wy22s7plh2"; + rev = "454bd4f82d85bb42a86b8eb0172b13e86e5788a7"; + sha256 = "1k11yz464lr02yncy231p06ja7w72w9l1nr7cihyiyj1ynzwpdls"; }; extraConfig = "BCACHEFS_FS m"; From 09c7ba418338752dc75a8fafbe50338a7e6e6fe1 Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Wed, 8 May 2019 22:05:54 -0400 Subject: [PATCH 06/91] bcachefs-tools: 2019-04-04 -> 2019-05-08 --- pkgs/tools/filesystems/bcachefs-tools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/filesystems/bcachefs-tools/default.nix b/pkgs/tools/filesystems/bcachefs-tools/default.nix index c33ae4e8304..72e514fff6b 100644 --- a/pkgs/tools/filesystems/bcachefs-tools/default.nix +++ b/pkgs/tools/filesystems/bcachefs-tools/default.nix @@ -3,12 +3,12 @@ stdenv.mkDerivation rec { pname = "bcachefs-tools"; - version = "2019-04-04"; + version = "2019-05-08"; src = fetchgit { url = "https://evilpiepirate.org/git/bcachefs-tools.git"; - rev = "d13bbb2955f899f10be4ab315ad229d2951fdcda"; - sha256 = "0cjy12qjd572sbg8h4i18fn001p6a6ahc4ljwids58nv83q99ll3"; + rev = "93bdfcb2105afe7a45d512984b855ce97937cfc1"; + sha256 = "125kjf66h9m31xvsanail1i10h4xld4fpv9gs9liqq91hdh0myyj"; }; enableParallelBuilding = true; From f8043fc41a4b3880621d3c8a1c4c2526da3134ac Mon Sep 17 00:00:00 2001 From: Sebastian Graf Date: Fri, 10 May 2019 10:09:20 +0200 Subject: [PATCH 07/91] Add sgraf as a maintainer --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 8bc92ff08d8..40720d92f49 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -4454,6 +4454,11 @@ github = "sfrijters"; name = "Stefan Frijters"; }; + sgraf = { + email = "sgraf1337@gmail.com"; + github = "sgraf812"; + name = "Sebastian Graf"; + }; shanemikel = { email = "shanemikel1@gmail.com"; github = "shanemikel"; From c63db92967c71ebce8da6269087ed955714a86e3 Mon Sep 17 00:00:00 2001 From: Sebastian Graf Date: Fri, 10 May 2019 09:57:37 +0200 Subject: [PATCH 08/91] alttab: init at 1.4.0 [`alttab`](https://github.com/sagb/alttab) is a window switcher for X11, designed for minimalistic window managers or a standalone X11 session. --- pkgs/tools/X11/alttab/default.nix | 45 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/tools/X11/alttab/default.nix diff --git a/pkgs/tools/X11/alttab/default.nix b/pkgs/tools/X11/alttab/default.nix new file mode 100644 index 00000000000..4efd86ca63f --- /dev/null +++ b/pkgs/tools/X11/alttab/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, pkgconfig, ronn, libpng, uthash +, xorg }: + +stdenv.mkDerivation rec { + version = "1.4.0"; + + pname = "alttab"; + + src = fetchFromGitHub { + owner = "sagb"; + repo = pname; + rev = "v${version}"; + sha256 = "028ifp54yl3xq5mj2ww9baga8p56nmrx4ypvj8k35akcaxdpyga9"; + }; + + nativeBuildInputs = [ + autoconf + automake + pkgconfig + ronn + ]; + + preConfigure = "./bootstrap.sh"; + + buildInputs = [ + libpng + uthash + xorg.libX11 + xorg.libXft + xorg.libXmu + xorg.libXpm + xorg.libXrandr + xorg.libXrender + ]; + + enableParallelBuild = true; + + meta = with stdenv.lib; { + homepage = https://github.com/sagb/alttab; + description = "X11 window switcher designed for minimalistic window managers or standalone X11 session"; + license = licenses.gpl3; + platforms = platforms.all; + maintainers = [ maintainers.sgraf ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4feeebeb0fd..665e7d8d5d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -645,6 +645,8 @@ in altermime = callPackage ../tools/networking/altermime {}; + alttab = callPackage ../tools/X11/alttab { }; + amule = callPackage ../tools/networking/p2p/amule { }; amuleDaemon = appendToName "daemon" (amule.override { From 6845f0ed9d4f332a3e174cf1e1e535552b7eaec8 Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Sat, 11 May 2019 09:12:19 +0200 Subject: [PATCH 09/91] pythonPackages.block-io: 1.1.9 -> 1.1.10 --- .../python-modules/block-io/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/development/python-modules/block-io/default.nix b/pkgs/development/python-modules/block-io/default.nix index 03a1181a014..f90f3f9af75 100644 --- a/pkgs/development/python-modules/block-io/default.nix +++ b/pkgs/development/python-modules/block-io/default.nix @@ -1,21 +1,14 @@ -{ stdenv, fetchPypi, fetchpatch, buildPythonPackage, base58, ecdsa, pycryptodome, requests, six }: +{ stdenv, fetchPypi, buildPythonPackage, base58, ecdsa, pycryptodome, requests, six }: buildPythonPackage rec { pname = "block-io"; - version = "1.1.9"; + version = "1.1.10"; src = fetchPypi { inherit pname version; - sha256 = "4909d58b32ab7f93d3cd83fa4bbe4edef42ab7566f016bdb6a405a0d8b1907c9"; + sha256 = "ba2e750085d9da4d1567932f3f719974fdc3f02649ee0d5c2f85fce592208723"; }; - patches = [ - (fetchpatch { - url = "https://github.com/BlockIo/block_io-python/commit/8ec0a0cd1afcfcb439d6dc306d8497dd9e4a0993.patch"; - sha256 = "1i6c153wvkr5ncm3cpn34faxvavz534x5kndwn4adlaxlzq30snn"; - }) - ]; - propagatedBuildInputs = [ base58 ecdsa @@ -24,6 +17,11 @@ buildPythonPackage rec { six ]; + preConfigure = '' + substituteInPlace setup.py \ + --replace "ecdsa==0.13" "ecdsa>=0.13" + ''; + # Tests needs a BlockIO API key to run properly # https://github.com/BlockIo/block_io-python/blob/79006bc8974544b70a2d8e9f19c759941d32648e/test.py#L18 doCheck = false; From b02120fb9e14bceea0620c0f07a6491fe3ca4a4d Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 May 2019 06:35:34 -0700 Subject: [PATCH 10/91] gdcm: 2.8.9 -> 3.0.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/gdcm/versions --- pkgs/development/libraries/gdcm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index a1d623c7b98..fca567d683d 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, cmake, vtk }: stdenv.mkDerivation rec { - version = "2.8.9"; + version = "3.0.0"; name = "gdcm-${version}"; src = fetchurl { url = "mirror://sourceforge/gdcm/${name}.tar.bz2"; - sha256 = "1za252d1chv40d78bkjngrg1p2yx0vya8y9q3vqmz66ip2zilvx7"; + sha256 = "1rhblnl0q4bl3hmanz4ckv5kzdrzdiqp9xlcqh8df3rfrgk4d81x"; }; dontUseCmakeBuildDir = true; From f0b267331214bbab602ff2b04339fb2d09c94cb9 Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Sat, 11 May 2019 15:37:44 +0200 Subject: [PATCH 11/91] buildah: 1.7.3 -> 1.8.1 Signed-off-by: Vincent Demeester --- pkgs/development/tools/buildah/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildah/default.nix b/pkgs/development/tools/buildah/default.nix index 47db8c9fea6..002d90e3f1f 100644 --- a/pkgs/development/tools/buildah/default.nix +++ b/pkgs/development/tools/buildah/default.nix @@ -3,13 +3,13 @@ , go-md2man }: let - version = "1.7.3"; + version = "1.8.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "buildah"; - sha256 = "154zjkccinf6nvbz5a8rdlkgy7fi6yz11wi100jn9cmsjydspax8"; + sha256 = "1w8w10pw5mpr3lc78z2dx3vck40cl7s3zsizsxhs0a9kxnfp01j9"; }; goPackagePath = "github.com/containers/buildah"; From 10aa9a6b05e363555a8226974ddebc7d488548bf Mon Sep 17 00:00:00 2001 From: Vincent Demeester Date: Sat, 11 May 2019 15:56:37 +0200 Subject: [PATCH 12/91] skaffold: 0.28.0 -> 0.29.0 Signed-off-by: Vincent Demeester --- pkgs/development/tools/skaffold/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/skaffold/default.nix b/pkgs/development/tools/skaffold/default.nix index 417f0a749c9..cf31d0ad934 100644 --- a/pkgs/development/tools/skaffold/default.nix +++ b/pkgs/development/tools/skaffold/default.nix @@ -2,9 +2,9 @@ buildGoPackage rec { name = "skaffold-${version}"; - version = "0.28.0"; - # rev is the 0.28.0 commit, mainly for skaffold version command output - rev = "2b6143bb6d185de9b9fbf2eaa981c8e7acff7339"; + version = "0.29.0"; + # rev is the 0.29.0 commit, mainly for skaffold version command output + rev = "1bbf9a3f13094e58c90399a4bd7e07250e0d2da5"; goPackagePath = "github.com/GoogleContainerTools/skaffold"; subPackages = ["cmd/skaffold"]; @@ -20,7 +20,7 @@ buildGoPackage rec { owner = "GoogleContainerTools"; repo = "skaffold"; rev = "v${version}"; - sha256 = "1j7wf2a5xmrk944nc0b9634qa9al3cln3lrij8383avylbx68prw"; + sha256 = "1rf23f7cwmmsycwdyk09wsrsq20vbzg2pi44r3516qsaz7x98mf1"; }; meta = { From 5866296ee53535ca755c08f1e4a4aa2c04bed32a Mon Sep 17 00:00:00 2001 From: Bignaux Ronan Date: Fri, 10 May 2019 15:48:54 +0200 Subject: [PATCH 13/91] idsk: unstable-2018-02-11 -> 0.19 --- pkgs/tools/filesystems/idsk/default.nix | 27 ++++++++++++------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/filesystems/idsk/default.nix b/pkgs/tools/filesystems/idsk/default.nix index 617457f55b6..72ed4f0ee1b 100644 --- a/pkgs/tools/filesystems/idsk/default.nix +++ b/pkgs/tools/filesystems/idsk/default.nix @@ -2,23 +2,14 @@ stdenv.mkDerivation rec { - repo = "idsk"; - version = "unstable-2018-02-11"; - rev = "1846729ac3432aa8c2c0525be45cfff8a513e007"; - name = "${repo}-${version}"; - - meta = with stdenv.lib; { - description = "Manipulating CPC dsk images and files"; - homepage = https://github.com/cpcsdk/idsk ; - license = "unknown"; - maintainers = [ maintainers.genesis ]; - platforms = platforms.linux; - }; + pname = "idsk"; + version = "0.19"; src = fetchFromGitHub { - inherit rev repo; + repo = "idsk"; owner = "cpcsdk"; - sha256 = "0d891lvf2nc8bys8kyf69k54rf3jlwqrcczbff8xi0w4wsiy5ckv"; + rev = "v${version}"; + sha256 = "0b4my5cz5kbzh4n65jr721piha6zixaxmfiss2zidip978k9rb6f"; }; nativeBuildInputs = [ cmake ]; @@ -27,4 +18,12 @@ stdenv.mkDerivation rec { mkdir -p $out/bin cp iDSK $out/bin ''; + + meta = with stdenv.lib; { + description = "Manipulating CPC dsk images and files"; + homepage = "https://github.com/cpcsdk/idsk" ; + license = licenses.mit; + maintainers = [ maintainers.genesis ]; + platforms = platforms.linux; + }; } From 3561ede7f6628385f2c66ef0be815d76ed92f7cd Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sat, 11 May 2019 20:55:46 -0700 Subject: [PATCH 14/91] mergerfs: 2.25.1 -> 2.26.0 Semi-automatic update generated by https://github.com/ryantm/nixpkgs-update tools. This update was made based on information from https://repology.org/metapackage/mergerfs/versions --- pkgs/tools/filesystems/mergerfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index 3a8d1d646be..a0981de42b0 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "mergerfs-${version}"; - version = "2.25.1"; + version = "2.26.0"; src = fetchFromGitHub { owner = "trapexit"; repo = "mergerfs"; rev = version; - sha256 = "1xrd18spp3wj25dd8513bah856w44gw8hilk190v13g6yafx64n6"; + sha256 = "1arq09rn1lmvv7gj3ymwdiygm620zdcx1jh2qpa1dxrdg8xrwqa9"; }; nativeBuildInputs = [ From e74e2e838d9fb331fb8e93daebb5b520e4d7a4f4 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 12 May 2019 14:31:19 +0200 Subject: [PATCH 15/91] gimpPlugins.resynthesizer: drop It breaks resynthesiser2 and there is actually no reason to keep the ancient version. https://github.com/bootchk/resynthesizer/issues/63#issuecomment-491591082 --- .../graphics/gimp/plugins/default.nix | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 714a1f921d6..16b6a0ccd8c 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -90,26 +90,6 @@ rec { meta.broken = true; }; - resynthesizer = pluginDerivation { - /* menu: - Filters/Map/Resynthesize - Filters/Enhance/Smart enlarge - Filters/Enhance/Smart sharpen - Filters/Enhance/Smart remove selection - */ - name = "resynthesizer-0.16"; - buildInputs = with pkgs; [ fftw ]; - src = fetchurl { - url = http://www.logarithmic.net/pfh-files/resynthesizer/resynthesizer-0.16.tar.gz; - sha256 = "1k90a1jzswxmajn56rdxa4r60v9v34fmqsiwfdxqcvx3yf4yq96x"; - }; - - installPhase = " - installPlugins resynth - installScripts smart-{enlarge,remove}.scm - "; - }; - resynthesizer2 = pluginDerivation rec { /* menu: Filters/Map/Resynthesize From d5dfc1cd8b3158548f8ffcc050d37f22d85fe39d Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 12 May 2019 14:40:30 +0200 Subject: [PATCH 16/91] gimpPlugins: use makeScope --- pkgs/applications/graphics/gimp/plugins/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index 16b6a0ccd8c..ac68e377696 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -35,7 +35,8 @@ let }; in -rec { + +stdenv.lib.makeScope pkgs.newScope (self: with self; { gap = pluginDerivation { /* menu: Video @@ -223,4 +224,4 @@ rec { }; */ -} +}) From 2d68295beac21fd974948a7ce1c1f6bd20f39ff7 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 12 May 2019 14:41:35 +0200 Subject: [PATCH 17/91] gimpPlugins.resynthesizer: rename from resynthesizer2 --- pkgs/applications/graphics/gimp/plugins/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index ac68e377696..f090ad30ae4 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -3,7 +3,7 @@ # preferences -> Folders -> Plug-ins # same applies for the scripts -{ pkgs, gimp }: +{ config, pkgs, gimp }: let inherit (pkgs) stdenv fetchurl pkgconfig intltool glib fetchFromGitHub; inherit (gimp) targetPluginDir targetScriptDir; @@ -91,7 +91,7 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { meta.broken = true; }; - resynthesizer2 = pluginDerivation rec { + resynthesizer = pluginDerivation rec { /* menu: Filters/Map/Resynthesize Filters/Enhance/Smart enlarge @@ -224,4 +224,8 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { }; */ +} // stdenv.lib.optionalAttrs (config.allowAliases or true) { + + resynthesizer2 = resynthesizer; + }) From 0fe311844e1c9975e2349098ebf68a973daeb107 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sun, 12 May 2019 14:58:16 +0200 Subject: [PATCH 18/91] gimpPlugins.resynthesizer: update menu comment --- pkgs/applications/graphics/gimp/plugins/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/graphics/gimp/plugins/default.nix b/pkgs/applications/graphics/gimp/plugins/default.nix index f090ad30ae4..1787b1d9e7f 100644 --- a/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/pkgs/applications/graphics/gimp/plugins/default.nix @@ -93,10 +93,13 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { resynthesizer = pluginDerivation rec { /* menu: - Filters/Map/Resynthesize - Filters/Enhance/Smart enlarge - Filters/Enhance/Smart sharpen - Filters/Enhance/Smart remove selection + Edit/Fill with pattern seamless... + Filters/Enhance/Heal selection... + Filters/Enhance/Heal transparency... + Filters/Enhance/Sharpen by synthesis... + Filters/Enhance/Uncrop... + Filters/Map/Style... + Filters/Render/Texture... */ pname = "resynthesizer"; version = "2.0.3"; From 5cb32ada4381113ffcdbadc80d88d96aae2f5220 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Sun, 12 May 2019 09:20:56 -0700 Subject: [PATCH 19/91] python37Packages.pamqp: 2.1.0 -> 2.3.0 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.7-pamqp/versions --- pkgs/development/python-modules/pamqp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pamqp/default.nix b/pkgs/development/python-modules/pamqp/default.nix index 844a66392c6..07eab3b7bc9 100644 --- a/pkgs/development/python-modules/pamqp/default.nix +++ b/pkgs/development/python-modules/pamqp/default.nix @@ -9,12 +9,12 @@ }: buildPythonPackage rec { - version = "2.1.0"; + version = "2.3.0"; pname = "pamqp"; src = fetchPypi { inherit pname version; - sha256 = "e1fa1107a195993fca6e04f1eb7286b60e223c958944d7808a501258ccc0ef8c"; + sha256 = "1s4lwbsiikz3czqad7jarb7k303q0wamla0rirghvwl9bslgbl2w"; }; buildInputs = [ mock nose pep8 pylint mccabe ]; From 4d5ebf6fc8e9c4dee1d7d1d3ffef9ff2fc3311d5 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Mon, 13 May 2019 19:02:41 +0300 Subject: [PATCH 20/91] wf-recorder: unstable-2019-04-21 -> 0.1 --- pkgs/applications/video/wf-recorder/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/applications/video/wf-recorder/default.nix index 6a15132fd24..d52a4a6ab9b 100644 --- a/pkgs/applications/video/wf-recorder/default.nix +++ b/pkgs/applications/video/wf-recorder/default.nix @@ -1,14 +1,16 @@ -{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, wayland, wayland-protocols, ffmpeg, x264, libpulseaudio }: +{ stdenv, fetchFromGitHub, meson, ninja, pkgconfig, wayland, wayland-protocols +, ffmpeg, x264, libpulseaudio +}: stdenv.mkDerivation rec { pname = "wf-recorder"; - version = "unstable-2019-04-21"; + version = "0.1"; src = fetchFromGitHub { owner = "ammen99"; repo = pname; - rev = "ddb96690556371007e316577ed1b14f0cb62e13c"; - sha256 = "04amfd1kyklcj6nmmmf21dz333ykglvhxb3cbzak06v2fxlrp2w3"; + rev = "v${version}"; + sha256 = "1rl75r87ijja9mfyrwrsz8r4zvjnhm0103qmgyhq2phlrdpkks5d"; }; nativeBuildInputs = [ meson ninja pkgconfig ]; From c7ab2b94994a05cb9a2abd768b5ffda6710ecc73 Mon Sep 17 00:00:00 2001 From: Millian Poquet Date: Mon, 13 May 2019 18:58:27 +0200 Subject: [PATCH 21/91] simgrid: 3.21 -> 3.22.2 - GitHub -> Framagit (SimGrid main repo has moved) - Test binaries must now be explicitly compiled (`make tests`) - Fix broken documentation link --- .../science/misc/simgrid/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 0b663b2fb63..e04b8da980b 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, perl, python3, boost, valgrind +{ stdenv, fetchgit, cmake, perl, python3, boost, valgrind # Optional requirements # Lua 5.3 needed and not available now #, luaSupport ? false, lua5 @@ -18,13 +18,12 @@ in stdenv.mkDerivation rec { name = "simgrid-${version}"; - version = "3.21"; + version = "3.22.2"; - src = fetchFromGitHub { - owner = "simgrid"; - repo = "simgrid"; - rev = "v${replaceChars ["."] ["_"] version}"; - sha256 = "1v0dwlww2wl56ms8lvg5zwffzbmz3sjzpkqc73f714mrc9g02bxs"; + src = fetchgit { + url = "https://framagit.org/simgrid/simgrid.git"; + rev = "v${version}"; + sha256 = "13gm9c66dvlnz3dnzv688h1063ngz96d3pflj102x38kz4akbhms"; }; nativeBuildInputs = [ cmake perl python3 boost valgrind ] @@ -52,7 +51,7 @@ stdenv.mkDerivation rec { # - lua53: for enable_lua # # For more information see: - # http://simgrid.gforge.inria.fr/simgrid/latest/doc/install.html#install_cmake_list + # https://simgrid.org/doc/3.22/Installing_SimGrid.html#simgrid-compilation-options) cmakeFlags= '' -Denable_documentation=${optionOnOff buildDocumentation} -Denable_java=${optionOnOff buildJavaBindings} @@ -87,6 +86,7 @@ stdenv.mkDerivation rec { checkPhase = '' runHook preCheck + make tests -j $NIX_BUILD_CORES ctest -j $NIX_BUILD_CORES --output-on-failure -E smpi-replay-multiple runHook postCheck From aa29b79e8a2c8ff7b51fb3ae801f4f19ff159d48 Mon Sep 17 00:00:00 2001 From: Millian Poquet Date: Mon, 13 May 2019 21:26:09 +0200 Subject: [PATCH 22/91] simgrid: fetchgit -> fetchFromGitLab --- pkgs/applications/science/misc/simgrid/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index e04b8da980b..43b6f294cdc 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, perl, python3, boost, valgrind +{ stdenv, fetchFromGitLab, cmake, perl, python3, boost, valgrind # Optional requirements # Lua 5.3 needed and not available now #, luaSupport ? false, lua5 @@ -17,13 +17,16 @@ let in stdenv.mkDerivation rec { - name = "simgrid-${version}"; + pname = "simgrid"; version = "3.22.2"; + name = "${pname}-${version}"; - src = fetchgit { - url = "https://framagit.org/simgrid/simgrid.git"; + src = fetchFromGitLab { + domain = "framagit.org"; + owner = pname; + repo = pname; rev = "v${version}"; - sha256 = "13gm9c66dvlnz3dnzv688h1063ngz96d3pflj102x38kz4akbhms"; + sha256 = "02zzivp3k7n2yvlr79p9kapzxpxq9x4x7jf2vrkpkwnssv4f9b4p"; }; nativeBuildInputs = [ cmake perl python3 boost valgrind ] From c2f715370050fb5c73ea4cf3f2f7fe7bbbede0a9 Mon Sep 17 00:00:00 2001 From: Patrick Hilhorst Date: Mon, 13 May 2019 23:38:43 +0200 Subject: [PATCH 23/91] doc/stdenv.xml: fix typo --- doc/stdenv.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/stdenv.xml b/doc/stdenv.xml index 63e6450860a..003cd5d25af 100644 --- a/doc/stdenv.xml +++ b/doc/stdenv.xml @@ -1579,7 +1579,7 @@ installTargets = "install-bin install-doc"; - Like dontStripHost, but only affects the + Like dontStrip, but only affects the strip command targetting the package's host platform. Useful when supporting cross compilation, but otherwise feel free to ignore. @@ -1592,7 +1592,7 @@ installTargets = "install-bin install-doc"; - Like dontStripHost, but only affects the + Like dontStrip, but only affects the strip command targetting the packages' target platform. Useful when supporting cross compilation, but otherwise feel free to ignore. From 80a10b1a5f2d8d0773ce1e2c91344fb8e737989c Mon Sep 17 00:00:00 2001 From: Lars Jellema Date: Tue, 14 May 2019 01:58:10 +0200 Subject: [PATCH 24/91] anbox: unstable-2019-03-07 -> unstable-2019-05-03 This fixes a build issue with protobuf that was seemingly resolved upstream. --- pkgs/os-specific/linux/anbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/anbox/default.nix b/pkgs/os-specific/linux/anbox/default.nix index a21a0bb58bd..9d3f7c34b0f 100644 --- a/pkgs/os-specific/linux/anbox/default.nix +++ b/pkgs/os-specific/linux/anbox/default.nix @@ -45,13 +45,13 @@ in stdenv.mkDerivation rec { pname = "anbox"; - version = "unstable-2019-03-07"; + version = "unstable-2019-05-03"; src = fetchFromGitHub { owner = pname; repo = pname; - rev = "d521e282965462e82465045ab95d4ae1c4619685"; - sha256 = "1wfx4bsyxvrjl16dq5pqgial8rnnsnxzbak2ap0waddz847czxwz"; + rev = "ea2b7a3dea34a6803134f4adc16c276f4c2479eb"; + sha256 = "00x772nbrbx7ma0scr24m65g50pmi4v6d6q3cwbbi55r8qiy2yz7"; }; nativeBuildInputs = [ From 758050e411086d9ae0654cbc52f58122034768b8 Mon Sep 17 00:00:00 2001 From: Brian Hicks Date: Mon, 13 May 2019 19:34:15 -0500 Subject: [PATCH 25/91] maintainers: add brianhicks --- maintainers/maintainer-list.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 73858c179b7..7a1d61a85cf 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -762,6 +762,11 @@ github = "brian-dawn"; name = "Brian Dawn"; }; + brianhicks = { + email = "brian@brianthicks.com"; + github = "BrianHicks"; + name = "Brian Hicks"; + }; bricewge = { email = "bricewge@gmail.com"; github = "bricewge"; From 9bf8f183682a708f9f283898abddf1a28619cb45 Mon Sep 17 00:00:00 2001 From: Brian Hicks Date: Mon, 13 May 2019 15:43:05 -0500 Subject: [PATCH 26/91] devd: init at 0.9 devd is a local development server designed to be used with modd (already in nixpkgs.) --- pkgs/development/tools/devd/default.nix | 22 +++ pkgs/development/tools/devd/deps.nix | 201 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 225 insertions(+) create mode 100644 pkgs/development/tools/devd/default.nix create mode 100644 pkgs/development/tools/devd/deps.nix diff --git a/pkgs/development/tools/devd/default.nix b/pkgs/development/tools/devd/default.nix new file mode 100644 index 00000000000..f3e63c53789 --- /dev/null +++ b/pkgs/development/tools/devd/default.nix @@ -0,0 +1,22 @@ +{ buildGoPackage, fetchFromGitHub, stdenv }: + +buildGoPackage rec { + pname = "devd"; + version = "0.9"; + src = fetchFromGitHub { + owner = "cortesi"; + repo = "devd"; + rev = "v${version}"; + sha256 = "1b02fj821k68q7xl48wc194iinqw9jiavzfl136hlzvg4m07p1wf"; + }; + goPackagePath = "github.com/cortesi/devd"; + subPackages = [ "cmd/devd" ]; + goDeps = ./deps.nix; + meta = with stdenv.lib; { + description = "A local webserver for developers"; + homepage = https://github.com/cortesi/devd; + license = licenses.mit; + maintainers = with maintainers; [ brianhicks ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/tools/devd/deps.nix b/pkgs/development/tools/devd/deps.nix new file mode 100644 index 00000000000..2cf6dd7eb23 --- /dev/null +++ b/pkgs/development/tools/devd/deps.nix @@ -0,0 +1,201 @@ +# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) +[ + { + goPackagePath = "github.com/GeertJohan/go.rice"; + fetch = { + type = "git"; + url = "https://github.com/GeertJohan/go.rice"; + rev = "c02ca9a983da5807ddf7d796784928f5be4afd09"; + sha256 = "1wzi3fprizg29dd4b4bmwz49x154k8cry9d7c08441y1i8w895yw"; + }; + } + { + goPackagePath = "github.com/alecthomas/template"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/template"; + rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; + sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; + }; + } + { + goPackagePath = "github.com/alecthomas/units"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/units"; + rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; + sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; + }; + } + { + goPackagePath = "github.com/bmatcuk/doublestar"; + fetch = { + type = "git"; + url = "https://github.com/bmatcuk/doublestar"; + rev = "85a78806aa1b4707d1dbace9be592cf1ece91ab3"; + sha256 = "01fd5j142pgsj5gfba43646aa6vd09fzvjhhik2r30nj4lsyy3z8"; + }; + } + { + goPackagePath = "github.com/cortesi/moddwatch"; + fetch = { + type = "git"; + url = "https://github.com/cortesi/moddwatch"; + rev = "0a1e0881aa8823d4dbec04c5b65a32a33f467e46"; + sha256 = "0f9gi2vvrhsbbvfqzlx2dcgn389qj1h77rvh2iffqhnsn3cxf5fr"; + }; + } + { + goPackagePath = "github.com/cortesi/termlog"; + fetch = { + type = "git"; + url = "https://github.com/cortesi/termlog"; + rev = "87cefd5ac843f65364f70a1fd2477bb6437690e8"; + sha256 = "1mygv1bv6dkm5p1wsvzrsyq771k6apdcxlyfqdp5ay8vl75jxvmb"; + }; + } + { + goPackagePath = "github.com/daaku/go.zipexe"; + fetch = { + type = "git"; + url = "https://github.com/daaku/go.zipexe"; + rev = "a5fe2436ffcb3236e175e5149162b41cd28bd27d"; + sha256 = "0vi5pskhifb6zw78w2j97qbhs09zmrlk4b48mybgk5b3sswp6510"; + }; + } + { + goPackagePath = "github.com/dustin/go-humanize"; + fetch = { + type = "git"; + url = "https://github.com/dustin/go-humanize"; + rev = "9f541cc9db5d55bce703bd99987c9d5cb8eea45e"; + sha256 = "1kqf1kavdyvjk7f8kx62pnm7fbypn9z1vbf8v2qdh3y7z7a0cbl3"; + }; + } + { + goPackagePath = "github.com/fatih/color"; + fetch = { + type = "git"; + url = "https://github.com/fatih/color"; + rev = "3f9d52f7176a6927daacff70a3e8d1dc2025c53e"; + sha256 = "165ww24x6ba47ji4j14mp3f006ksnmi53ws9280pgd2zcw91nbn8"; + }; + } + { + goPackagePath = "github.com/goji/httpauth"; + fetch = { + type = "git"; + url = "https://github.com/goji/httpauth"; + rev = "2da839ab0f4df05a6db5eb277995589dadbd4fb9"; + sha256 = "0rcz1qxdbc2gw0gaj81kag94k98izs9vmhcp5mzs7979s7q4kym1"; + }; + } + { + goPackagePath = "github.com/gorilla/websocket"; + fetch = { + type = "git"; + url = "https://github.com/gorilla/websocket"; + rev = "66b9c49e59c6c48f0ffce28c2d8b8a5678502c6d"; + sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; + }; + } + { + goPackagePath = "github.com/juju/ratelimit"; + fetch = { + type = "git"; + url = "https://github.com/juju/ratelimit"; + rev = "59fac5042749a5afb9af70e813da1dd5474f0167"; + sha256 = "0ppwvwbh9jdpdk4f9924vw373cpfz5g5ad10c707p22a984vanrz"; + }; + } + { + goPackagePath = "github.com/kardianos/osext"; + fetch = { + type = "git"; + url = "https://github.com/kardianos/osext"; + rev = "ae77be60afb1dcacde03767a8c37337fad28ac14"; + sha256 = "056dkgxrqjj5r18bnc3knlpgdz5p3yvp12y4y978hnsfhwaqvbjz"; + }; + } + { + goPackagePath = "github.com/mattn/go-colorable"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-colorable"; + rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; + sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + }; + } + { + goPackagePath = "github.com/mattn/go-isatty"; + fetch = { + type = "git"; + url = "https://github.com/mattn/go-isatty"; + rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"; + sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + }; + } + { + goPackagePath = "github.com/mitchellh/go-homedir"; + fetch = { + type = "git"; + url = "https://github.com/mitchellh/go-homedir"; + rev = "ae18d6b8b3205b561c79e8e5f69bff09736185f4"; + sha256 = "0f0z0aa4wivk4z1y503dmnw0k0g0g403dly8i4q263gfshs82sbq"; + }; + } + { + goPackagePath = "github.com/rjeczalik/notify"; + fetch = { + type = "git"; + url = "https://github.com/rjeczalik/notify"; + rev = "629144ba06a1c6af28c1e42c228e3d42594ce081"; + sha256 = "0745w0mdr9xfr4rxw4pfr1sl8apc7wr7mvfykdl4wslq3mdj8a91"; + }; + } + { + goPackagePath = "github.com/toqueteos/webbrowser"; + fetch = { + type = "git"; + url = "https://github.com/toqueteos/webbrowser"; + rev = "43eedf9c266f511c55ef7eace9ee549e269b54b4"; + sha256 = "0wa8xv0gh9iq3dlwb48dx8w2awrsarqa900hszan8gaxgag7x7ih"; + }; + } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "505ab145d0a99da450461ae2c1a9f6cd10d1f447"; + sha256 = "1vbsvcvmjz6c00p5vf8ls533p52fx2y3gy6v4k5qrdlzl4wf0i5s"; + }; + } + { + goPackagePath = "golang.org/x/net"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/net"; + rev = "927f97764cc334a6575f4b7a1584a147864d5723"; + sha256 = "0np7b766gb92vbm514yhdl7cjmqvn0dxdxskd84aas2ri1fkpgw5"; + }; + } + { + goPackagePath = "golang.org/x/sys"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "b4a75ba826a64a70990f11a225237acd6ef35c9f"; + sha256 = "0kzrd2wywkcq35iakbzplqyma4bvf2ng3mzi7917kxcbdq3fflrj"; + }; + } + { + goPackagePath = "gopkg.in/alecthomas/kingpin.v2"; + fetch = { + type = "git"; + url = "https://github.com/alecthomas/kingpin"; + rev = "947dcec5ba9c011838740e680966fd7087a71d0d"; + sha256 = "0mndnv3hdngr3bxp7yxfd47cas4prv98sqw534mx7vp38gd88n5r"; + }; + } +] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3262e0e0d78..bcd5864a0c4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9002,6 +9002,8 @@ in dejagnu = callPackage ../development/tools/misc/dejagnu { }; + devd = callPackage ../development/tools/devd { }; + devtodo = callPackage ../development/tools/devtodo { }; dfeet = callPackage ../development/tools/misc/d-feet { }; From 6a74ba96fdb4c22146ca4672834d3b6df9c46c86 Mon Sep 17 00:00:00 2001 From: Bryan Richter Date: Tue, 14 May 2019 08:18:02 +0300 Subject: [PATCH 27/91] Add minimal docs for callHackage and friends Specifically haskellSrc2nix, callHackage, and callHackageDirect. Other functions should probably also be documented, but it's at least a start. --- pkgs/development/haskell-modules/make-package-set.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 6b5ecc1df8a..fbe1f991d92 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -118,6 +118,7 @@ let inherit packages; }; + # Use cabal2nix to create a default.nix for the package sources found at 'src'. haskellSrc2nix = { name, src, sha256 ? null, extraCabal2nixOptions ? "" }: let sha256Arg = if isNull sha256 then "--sha256=" else ''--sha256="${sha256}"''; @@ -174,8 +175,14 @@ in package-set { inherit pkgs stdenv callPackage; } self // { inherit (haskellLib) packageSourceOverrides; + # callHackage :: Text -> Text -> AttrSet -> HaskellPackage + # + # e.g., while overriding a package set: + # '... foo = self.callHackage "foo" "1.5.3" {}; ...' callHackage = name: version: callPackageKeepDeriver (self.hackage2nix name version); + # callHackageDirect :: Text -> Text -> AttrSet -> HaskellPackage + # # This function does not depend on all-cabal-hashes and therefore will work # for any version that has been released on hackage as opposed to only # versions released before whatever version of all-cabal-hashes you happen From 4f3012ee355c60265b81a5ec642633fc00971980 Mon Sep 17 00:00:00 2001 From: midchildan Date: Mon, 13 May 2019 21:18:05 +0900 Subject: [PATCH 28/91] nyancat: init at 1.5.2 --- pkgs/tools/misc/nyancat/default.nix | 32 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/misc/nyancat/default.nix diff --git a/pkgs/tools/misc/nyancat/default.nix b/pkgs/tools/misc/nyancat/default.nix new file mode 100644 index 00000000000..47a91915c43 --- /dev/null +++ b/pkgs/tools/misc/nyancat/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "nyancat"; + version = "1.5.2"; + + src = fetchFromGitHub { + owner = "klange"; + repo = "nyancat"; + rev = version; + sha256 = "1mg8nm5xzcq1xr8cvx24ym2vmafkw53rijllwcdm9miiz0p5ky9k"; + }; + + postPatch = '' + substituteInPlace Makefile \ + --replace /usr/bin "$out/bin" \ + --replace /usr/share "$out/share" + ''; + + preInstall = '' + mkdir -p $out/bin + mkdir -p $out/share/man/man1 + ''; + + meta = with stdenv.lib; { + description = "Nyancat in your terminal, rendered through ANSI escape sequences."; + homepage = https://nyancat.dakko.us; + license = licenses.ncsa; + maintainers = with maintainers; [ midchildan ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 318cdfedb17..fb5b0b9785e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4841,6 +4841,8 @@ in nwdiag = with python3Packages; toPythonApplication nwdiag; + nyancat = callPackage ../tools/misc/nyancat { }; + nylon = callPackage ../tools/networking/nylon { }; nzbget = callPackage ../tools/networking/nzbget { }; From 00fc5bd08fc7c5149c50895a5f5d15e9db171c02 Mon Sep 17 00:00:00 2001 From: Millian Poquet Date: Tue, 14 May 2019 18:27:51 +0200 Subject: [PATCH 29/91] simgrid: override checkPhase -> preCheck This commit changes how failing tests are ignored. - Previously, the whole checkPhase was overridden. - Now, preCheck generates a ctest ignore file. ctest doc: https://gitlab.kitware.com/cmake/community/wikis/doc/ctest/Testing-With-CTest#customizing-ctest --- pkgs/applications/science/misc/simgrid/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 43b6f294cdc..5272e3d8418 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -86,13 +86,11 @@ stdenv.mkDerivation rec { doCheck = true; - checkPhase = '' - runHook preCheck - - make tests -j $NIX_BUILD_CORES - ctest -j $NIX_BUILD_CORES --output-on-failure -E smpi-replay-multiple - - runHook postCheck + # Prevent the execution of tests known to fail. + preCheck = '' + cat <CTestCustom.cmake + SET(CTEST_CUSTOM_TESTS_IGNORE smpi-replay-multiple) + EOW ''; enableParallelBuilding = true; From 9b3d4e8b8ba2615b4380605613d7153d4c4960a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Dani=C3=ABl=20de=20Kok?= Date: Tue, 14 May 2019 20:27:13 +0200 Subject: [PATCH 30/91] pythonPackages.fasttext: init at 0.2.0 --- .../python-modules/fasttext/default.nix | 28 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/development/python-modules/fasttext/default.nix diff --git a/pkgs/development/python-modules/fasttext/default.nix b/pkgs/development/python-modules/fasttext/default.nix new file mode 100644 index 00000000000..05034dc7526 --- /dev/null +++ b/pkgs/development/python-modules/fasttext/default.nix @@ -0,0 +1,28 @@ +{stdenv, buildPythonPackage, fetchFromGitHub, numpy, pybind11}: + +buildPythonPackage rec { + pname = "fasttext"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "facebookresearch"; + repo = "fastText"; + rev = version; + sha256 = "1fcrz648r2s80bf7vc0l371xillz5jk3ldaiv9jb7wnsyri831b4"; + }; + + buildInputs = [ pybind11 ]; + + propagatedBuildInputs = [ numpy ]; + + preBuild = '' + HOME=$TMPDIR + ''; + + meta = with stdenv.lib; { + description = "Python module for text classification and representation learning"; + homepage = https://fasttext.cc/; + license = licenses.mit; + maintainers = with maintainers; [ danieldk ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d9ebd75b5c1..66b9e828409 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -399,6 +399,8 @@ in { fastpbkdf2 = callPackage ../development/python-modules/fastpbkdf2 { }; + fasttext = callPackage ../development/python-modules/fasttext { }; + favicon = callPackage ../development/python-modules/favicon { }; fido2 = callPackage ../development/python-modules/fido2 { }; From baeea1f463f72d1d13e9e43cd1579b93e173c06d Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Tue, 14 May 2019 15:57:41 -0400 Subject: [PATCH 31/91] libfaketime: refactor using `builtins.placeholder` --- pkgs/development/libraries/libfaketime/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libfaketime/default.nix b/pkgs/development/libraries/libfaketime/default.nix index cc9db8f7e66..65d04cb53f1 100644 --- a/pkgs/development/libraries/libfaketime/default.nix +++ b/pkgs/development/libraries/libfaketime/default.nix @@ -21,9 +21,8 @@ stdenv.mkDerivation rec { done ''; - preBuild = '' - makeFlagsArray+=(PREFIX="$out" LIBDIRNAME=/lib) - ''; + PREFIX = placeholder "out"; + LIBDIRNAME = "/lib"; checkInputs = [ perl ]; From 4cdcfc51f81b9f2cc94133cd7973d59bc760d9eb Mon Sep 17 00:00:00 2001 From: Edmund Wu Date: Tue, 14 May 2019 16:35:28 -0400 Subject: [PATCH 32/91] nvidia_x11: 430.09 -> 430.14 --- pkgs/os-specific/linux/nvidia-x11/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix index ed71f27bdcc..ff0416b4efc 100644 --- a/pkgs/os-specific/linux/nvidia-x11/default.nix +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -20,10 +20,10 @@ rec { # No active beta right now beta = generic { - version = "430.09"; - sha256_64bit = "0k59ahljya286ararncf3mc7sfgsw82vnrszczqicpysn3qfar95"; - settingsSha256 = "082v0xmz83sf4wdvcb2zawddy5vh3pbwjz0fda1rayc7fdadni05"; - persistencedSha256 = "028vs23mnb345sxjxqqmln9pwq8n6cc6dhfzq4hj21ghc6l6fg54"; + version = "430.14"; + sha256_64bit = "05qgakc0sqv9zr6j4i49iqrd271nris8pmnv3l431r71ygx6zm00"; + settingsSha256 = "1hh07258a6z0g8dl6mxrizdxqcgswv58r4rbamfhhwh9i42fpdgg"; + persistencedSha256 = "1wmwmg9ma9rfx03s2qa249f0p7yf0lxdpiadab0raajk1lzlrrc8"; }; stable_418 = generic { From 193018687cdf9bda15c526850b2e5fd558fd3204 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Mon, 13 May 2019 21:06:54 -0700 Subject: [PATCH 33/91] unison: fix building on macOS with enableX11 = false If `UISTYLE` is not specified, Unison tries to auto-detect the UI style based on the available environment. On macOS this apparently means using `UISTYLE=mac`, it can't actually build this way in Nix. --- pkgs/applications/networking/sync/unison/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/sync/unison/default.nix b/pkgs/applications/networking/sync/unison/default.nix index 7862cc1e6e4..ad5a35eb251 100644 --- a/pkgs/applications/networking/sync/unison/default.nix +++ b/pkgs/applications/networking/sync/unison/default.nix @@ -20,8 +20,10 @@ stdenv.mkDerivation (rec { echo -e '\ninstall:\n\tcp $(FSMONITOR)$(EXEC_EXT) $(INSTALLDIR)' >> src/fsmonitor/linux/Makefile ''; - makeFlags = "INSTALLDIR=$(out)/bin/" + (if enableX11 then " UISTYLE=gtk2" else "") - + (if ! ocaml.nativeCompilers then " NATIVE=false" else ""); + makeFlags = [ + "INSTALLDIR=$(out)/bin/" + "UISTYLE=${if enableX11 then "gtk2" else "text"}" + ] ++ stdenv.lib.optional (!ocaml.nativeCompilers) "NATIVE=false"; preInstall = "mkdir -p $out/bin"; From 2db1a06136d6ad3faef897e8cc9dfedf30b9fad5 Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Tue, 14 May 2019 23:37:25 +0000 Subject: [PATCH 34/91] chromium: 74.0.3729.131 -> 74.0.3729.157 Fixes a security bug with no CVE at this time: https://chromereleases.googleblog.com/2019/05/stable-channel-update-for-desktop.html --- .../browsers/chromium/upstream-info.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.nix b/pkgs/applications/networking/browsers/chromium/upstream-info.nix index 6e96cf217f5..0de95c7d6a9 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.nix +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.nix @@ -1,18 +1,18 @@ # This file is autogenerated from update.sh in the same directory. { beta = { - sha256 = "1b5hpf1j7ygvh15p11jswr8qf33b6k7l8nnsda93fya5bkc34mgd"; - sha256bin64 = "1mwia5l9zz858186m9kj2daq38jw75fipyhh3ncvhkw5hqggx0cd"; - version = "75.0.3770.18"; + sha256 = "01sw6ql4fr1zwbw4l4c3xgmd3jqil9lgmpmlhfyj9ga4kp2qlnim"; + sha256bin64 = "0xwxb54l1ylrckxd36pkzcla34d5hbnhxz3gkrv4id530l6ms6jh"; + version = "75.0.3770.27"; }; dev = { - sha256 = "1mmkj89pmbkgf6p7wb1q75j1rsrqcf7wncy3rl03rlhj64b231w7"; - sha256bin64 = "0mjcdg8las81lyrgyqymsb80k4wwzsib4sw3nyxd3cgrdxgc5vi9"; - version = "76.0.3783.0"; + sha256 = "0fq8sjyscz998ha4wnn4npr3bb4jslcjc1i7xgwz6bh4yhi1az4f"; + sha256bin64 = "1yb6ff6bg662klki7dcrdaysmsnqrnlp8syxcvwl2rysswll3wyl"; + version = "76.0.3788.1"; }; stable = { - sha256 = "11m9mlzrqzmz7rhl0ff7lry2s4yjrdkfi36qfv48m1cg5y2cfy6i"; - sha256bin64 = "034w01k0c84bx33agc2pj8149ff8rfxnsw371ankx0nzhjbn74ln"; - version = "74.0.3729.131"; + sha256 = "01ifjsss3nqr15xx2iqsiqgjq1xc07j7ljnapsb484m7dcfk3gnw"; + sha256bin64 = "0zkv4x4vbra476c6wy4igp6k80r9ssb9632wsyrzjni9w3zk9qvy"; + version = "74.0.3729.157"; }; } From e5b4f6f4ed46fc1b6189f1375326db1b9db72436 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Tue, 14 May 2019 16:16:38 +0200 Subject: [PATCH 35/91] adafruit-ampy: init at 1.0.7 --- pkgs/tools/misc/adafruit-ampy/default.nix | 26 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/tools/misc/adafruit-ampy/default.nix diff --git a/pkgs/tools/misc/adafruit-ampy/default.nix b/pkgs/tools/misc/adafruit-ampy/default.nix new file mode 100644 index 00000000000..be47d42dc89 --- /dev/null +++ b/pkgs/tools/misc/adafruit-ampy/default.nix @@ -0,0 +1,26 @@ +{ stdenv, python3 }: + +with python3.pkgs; + +buildPythonApplication rec { + pname = "adafruit-ampy"; + version = "1.0.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "1dz5sksalccv4c3bzk3c1jxpg3s28lwlw8hfwc9dfxhw3a1np3fd"; + }; + + nativeBuildInputs = [ setuptools_scm ]; + propagatedBuildInputs = [ click python-dotenv pyserial ]; + + # No tests + doCheck = false; + + meta = with stdenv.lib; { + homepage = "https://github.com/pycampers/ampy"; + license = licenses.mit; + description = "Utility to interact with a MicroPython board over a serial connection."; + maintainers = with maintainers; [ etu ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b97691339f..52a9cfdfa50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -447,6 +447,8 @@ in actkbd = callPackage ../tools/system/actkbd { }; + adafruit-ampy = callPackage ../tools/misc/adafruit-ampy { }; + adlplug = callPackage ../applications/audio/adlplug { }; opnplug = callPackage ../applications/audio/adlplug { From 13aa449bab532d6223a9e35841de7bb48a7d4cae Mon Sep 17 00:00:00 2001 From: Millian Poquet Date: Wed, 15 May 2019 12:35:12 +0200 Subject: [PATCH 36/91] simgrid: remove unneeded 'name' definition --- pkgs/applications/science/misc/simgrid/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 5272e3d8418..554ef695a4a 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -19,7 +19,6 @@ in stdenv.mkDerivation rec { pname = "simgrid"; version = "3.22.2"; - name = "${pname}-${version}"; src = fetchFromGitLab { domain = "framagit.org"; From 582fd549fb2d1e31134ce76e1e1f1c9b7cac5725 Mon Sep 17 00:00:00 2001 From: c0bw3b Date: Tue, 14 May 2019 22:26:33 +0200 Subject: [PATCH 37/91] winstone: drop package and service Close #56294 Upstream package is unmaintained for years and nixpkgs provides alternatives --- nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 1 + .../modules/services/web-servers/winstone.nix | 129 ------------------ pkgs/servers/http/winstone/default.nix | 26 ---- pkgs/top-level/all-packages.nix | 4 +- 5 files changed, 3 insertions(+), 158 deletions(-) delete mode 100644 nixos/modules/services/web-servers/winstone.nix delete mode 100644 pkgs/servers/http/winstone/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a66747f0384..434cb69868c 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -793,7 +793,6 @@ ./services/web-servers/traefik.nix ./services/web-servers/uwsgi.nix ./services/web-servers/varnish/default.nix - ./services/web-servers/winstone.nix ./services/web-servers/zope2.nix ./services/x11/colord.nix ./services/x11/compton.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index aa3d120c97f..b2c030fb779 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -210,6 +210,7 @@ with lib; (mkRemovedOptionModule [ "virtualisation" "xen" "qemu" ] "You don't need this option anymore, it will work without it.") (mkRemovedOptionModule [ "services" "logstash" "enableWeb" ] "The web interface was removed from logstash") (mkRemovedOptionModule [ "boot" "zfs" "enableLegacyCrypto" ] "The corresponding package was removed from nixpkgs.") + (mkRemovedOptionModule [ "services" "winstone" ] "The corresponding package was removed from nixpkgs.") # ZSH (mkRenamedOptionModule [ "programs" "zsh" "enableSyntaxHighlighting" ] [ "programs" "zsh" "syntaxHighlighting" "enable" ]) diff --git a/nixos/modules/services/web-servers/winstone.nix b/nixos/modules/services/web-servers/winstone.nix deleted file mode 100644 index 064ead5ce4b..00000000000 --- a/nixos/modules/services/web-servers/winstone.nix +++ /dev/null @@ -1,129 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.winstone; - - winstoneOpts = { name, ... }: { - options = { - name = mkOption { - default = name; - internal = true; - }; - - serviceName = mkOption { - type = types.str; - description = '' - The name of the systemd service. By default, it is - derived from the winstone instance name. - ''; - }; - - warFile = mkOption { - type = types.str; - description = '' - The WAR file that Winstone should serve. - ''; - }; - - javaPackage = mkOption { - type = types.package; - default = pkgs.jre; - defaultText = "pkgs.jre"; - description = '' - Which Java derivation to use for running Winstone. - ''; - }; - - user = mkOption { - type = types.str; - description = '' - The user that should run this Winstone process and - own the working directory. - ''; - }; - - group = mkOption { - type = types.str; - description = '' - The group that will own the working directory. - ''; - }; - - workDir = mkOption { - type = types.str; - description = '' - The working directory for this Winstone instance. Will - contain extracted webapps etc. The directory will be - created if it doesn't exist. - ''; - }; - - extraJavaOptions = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Extra command line options given to the java process running - Winstone. - ''; - }; - - extraOptions = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Extra command line options given to the Winstone process. - ''; - }; - }; - - config = { - workDir = mkDefault "/run/winstone/${name}"; - serviceName = mkDefault "winstone-${name}"; - }; - }; - - mkService = cfg: let - opts = concatStringsSep " " (cfg.extraOptions ++ [ - "--warfile ${cfg.warFile}" - ]); - - javaOpts = concatStringsSep " " (cfg.extraJavaOptions ++ [ - "-Djava.io.tmpdir=${cfg.workDir}" - "-jar ${pkgs.winstone}/lib/winstone.jar" - ]); - in { - wantedBy = [ "multi-user.target" ]; - description = "winstone service for ${cfg.name}"; - preStart = '' - mkdir -p "${cfg.workDir}" - chown ${cfg.user}:${cfg.group} "${cfg.workDir}" - ''; - serviceConfig = { - ExecStart = "${cfg.javaPackage}/bin/java ${javaOpts} ${opts}"; - User = cfg.user; - PermissionsStartOnly = true; - }; - }; - -in { - - options = { - services.winstone = mkOption { - default = {}; - type = with types; attrsOf (submodule winstoneOpts); - description = '' - Defines independent Winstone services, each serving one WAR-file. - ''; - }; - }; - - config = mkIf (cfg != {}) { - - systemd.services = mapAttrs' (n: c: nameValuePair c.serviceName (mkService c)) cfg; - - }; - -} diff --git a/pkgs/servers/http/winstone/default.nix b/pkgs/servers/http/winstone/default.nix deleted file mode 100644 index 6a92c0a228a..00000000000 --- a/pkgs/servers/http/winstone/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "winstone-${version}"; - version = "0.9.10"; - - src = fetchurl { - url = "mirror://sourceforge/winstone/${name}.jar"; - sha256 = "17xvq3yk95335c6ag1bmbmxlvh7gqq35ifi64r2l6rnvrf6pqyan"; - }; - - phases = [ "installPhase" ]; - - installPhase = '' - mkdir -p $out/lib - cp $src $out/lib/winstone.jar - ''; - - meta = { - homepage = http://winstone.sourceforge.net/; - description = "A simple Java Servlet container"; - license = stdenv.lib.licenses.cddl; - platforms = stdenv.lib.platforms.all; - maintainers = [ stdenv.lib.maintainers.rickynils ]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4b97691339f..805118ff3f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4885,7 +4885,7 @@ in ola = callPackage ../applications/misc/ola { }; - olive-editor = libsForQt5.callPackage ../applications/video/olive-editor { + olive-editor = libsForQt5.callPackage ../applications/video/olive-editor { inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; @@ -14726,7 +14726,7 @@ in webhook = callPackage ../servers/http/webhook { }; - winstone = callPackage ../servers/http/winstone { }; + winstone = throw "Winstone is not supported anymore. Alternatives are Jetty or Tomcat."; xinetd = callPackage ../servers/xinetd { }; From aba46ce1443ba4b5be71585f2ca12020b9a6d342 Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Wed, 15 May 2019 11:53:46 -0700 Subject: [PATCH 38/91] cocoapods: 1.6.1 -> 1.6.2 --- pkgs/development/mobile/cocoapods/Gemfile.lock | 8 ++++---- pkgs/development/mobile/cocoapods/gemset.nix | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/development/mobile/cocoapods/Gemfile.lock b/pkgs/development/mobile/cocoapods/Gemfile.lock index 9145ca18188..37915b87431 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -9,10 +9,10 @@ GEM tzinfo (~> 1.1) atomos (0.1.3) claide (1.0.2) - cocoapods (1.6.1) + cocoapods (1.6.2) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.6.1) + cocoapods-core (= 1.6.2) cocoapods-deintegrate (>= 1.0.2, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -28,7 +28,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.8.1, < 2.0) - cocoapods-core (1.6.1) + cocoapods-core (1.6.2) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) @@ -59,7 +59,7 @@ GEM thread_safe (0.3.6) tzinfo (1.2.5) thread_safe (~> 0.1) - xcodeproj (1.8.2) + xcodeproj (1.9.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/development/mobile/cocoapods/gemset.nix b/pkgs/development/mobile/cocoapods/gemset.nix index de6c524633f..6ef71592bb5 100644 --- a/pkgs/development/mobile/cocoapods/gemset.nix +++ b/pkgs/development/mobile/cocoapods/gemset.nix @@ -40,10 +40,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0sjipdbybs2ikjz9drpwfq1msisha3cbf3508ywaj5w3i481av37"; + sha256 = "1f2xdcar9yk3x4v18pjh3rnn489h252wh3llxx39ig18pcijwzmg"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.2"; }; cocoapods-core = { dependencies = ["activesupport" "fuzzy_match" "nap"]; @@ -51,10 +51,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03g31gn8k9q8ky1qhg9i2xawg6xdpl8x3mq4fdah17jclsg8y0sh"; + sha256 = "052fwscc9k3pvka6y8c2mh8i7wm6a6jk44b236krj33jyzk0z2vw"; type = "gem"; }; - version = "1.6.1"; + version = "1.6.2"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -254,9 +254,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ji3wmpr6xm4172vxh9y6731vm2xrvv7ccwk4ijd5n4if1dakm03"; + sha256 = "0qhanxa4zbirbdq6skdpg7hvx1vivwy1i5x22c3xkdb7pykh7dm7"; type = "gem"; }; - version = "1.8.2"; + version = "1.9.0"; }; } \ No newline at end of file From ffd371164fc9042ea360fb196f88d2c71301332b Mon Sep 17 00:00:00 2001 From: Lily Ballard Date: Wed, 15 May 2019 13:02:02 -0700 Subject: [PATCH 39/91] cocoapods-beta: 1.7.0.rc.1 -> 1.7.0.rc.2 --- pkgs/development/mobile/cocoapods/Gemfile-beta.lock | 6 +++--- pkgs/development/mobile/cocoapods/gemset-beta.nix | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index 64eb87294a4..c9b27c36678 100644 --- a/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -9,10 +9,10 @@ GEM tzinfo (~> 1.1) atomos (0.1.3) claide (1.0.2) - cocoapods (1.7.0.rc.1) + cocoapods (1.7.0.rc.2) activesupport (>= 4.0.2, < 5) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.7.0.rc.1) + cocoapods-core (= 1.7.0.rc.2) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.2.2, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -28,7 +28,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.8.2, < 2.0) - cocoapods-core (1.7.0.rc.1) + cocoapods-core (1.7.0.rc.2) activesupport (>= 4.0.2, < 6) fuzzy_match (~> 2.0.4) nap (~> 1.0) diff --git a/pkgs/development/mobile/cocoapods/gemset-beta.nix b/pkgs/development/mobile/cocoapods/gemset-beta.nix index e5841c4d2d3..643760a91c0 100644 --- a/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -46,10 +46,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wdy3kjlz121i6b0njq09xz6wvw6l6pkwabgswbmk5b8m74q97ml"; + sha256 = "0s9kqrmlvmgyd9aqrv89lg1ccspbk9hw2qx3fpb56xff1zk69gwf"; type = "gem"; }; - version = "1.7.0.rc.1"; + version = "1.7.0.rc.2"; }; cocoapods-core = { dependencies = ["activesupport" "fuzzy_match" "nap"]; @@ -57,10 +57,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0k7zb0afy49hb24mfg8ypdsbk6j1sr9m8bwqm8p11w4113wbv95w"; + sha256 = "0x940n7ifn8fpr9siicqassryarg13sxh6nmi3cgbbdmnd1ic8b1"; type = "gem"; }; - version = "1.7.0.rc.1"; + version = "1.7.0.rc.2"; }; cocoapods-deintegrate = { groups = ["default"]; From 1ec1bdd4c969486c5110ce74123f02b48a082212 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 8 Apr 2019 17:14:47 -0500 Subject: [PATCH 40/91] libertinus: 6.6 -> 6.8 Notes: https://github.com/libertinus-fonts/libertinus/releases/tag/v6.8 https://github.com/libertinus-fonts/libertinus/releases/tag/v6.7 * update repo "owner", moved * don't try to build since we don't mean to :) * update for font cleanup PR (thanks!) --- pkgs/data/fonts/libertinus/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/data/fonts/libertinus/default.nix b/pkgs/data/fonts/libertinus/default.nix index 246d4a91a96..23c233b5893 100644 --- a/pkgs/data/fonts/libertinus/default.nix +++ b/pkgs/data/fonts/libertinus/default.nix @@ -1,11 +1,11 @@ { lib, fetchFromGitHub }: let - version = "6.6"; + version = "6.8"; in fetchFromGitHub rec { name = "libertinus-${version}"; - owner = "khaledhosny"; + owner = "libertinus-fonts"; repo = "libertinus"; rev = "v${version}"; @@ -14,7 +14,7 @@ in fetchFromGitHub rec { install -m444 -Dt $out/share/fonts/opentype *.otf install -m444 -Dt $out/share/doc/${name} *.txt ''; - sha256 = "11pxb2zwvjlk06zbqrfv2pgwsl4awf68fak1ks4881i8xbl1910m"; + sha256 = "0iwbw3sw8rcsifpzw72g3cz0a960scv7cib8mwrw53282waqq2gc"; meta = with lib; { description = "A fork of the Linux Libertine and Linux Biolinum fonts"; @@ -23,7 +23,7 @@ in fetchFromGitHub rec { that started as an OpenType math companion of the Libertine font family, but grown as a full fork to address some of the bugs in the fonts. ''; - homepage = https://github.com/khaledhosny/libertinus; + homepage = https://github.com/libertinus-fonts/libertinus; license = licenses.ofl; maintainers = with maintainers; [ siddharthist ]; platforms = platforms.all; From 2cd3768d5473e04c3ac66f234b22f70763a80735 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Mon, 13 May 2019 15:05:00 -0500 Subject: [PATCH 41/91] nodejs-12_x: 12.1.0 -> 12.2.0 --- pkgs/development/web/nodejs/v12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/nodejs/v12.nix b/pkgs/development/web/nodejs/v12.nix index d087e7dea99..66133b432ee 100644 --- a/pkgs/development/web/nodejs/v12.nix +++ b/pkgs/development/web/nodejs/v12.nix @@ -5,6 +5,6 @@ let in buildNodejs { inherit enableNpm; - version = "12.1.0"; - sha256 = "1efb792c689fed2e028025e1398e84193281f329427a17a62b0bffee8e771395"; + version = "12.2.0"; + sha256 = "10vr8yqrvdmcaszg7l7cjchzzik709vcygcnpkjf2sjhz929glf5"; } From 30a938644406becd8a0101886b4dad0cae09d73b Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 10 May 2019 17:05:31 -0500 Subject: [PATCH 42/91] horst: 5.0 -> 5.1, cleanup a bit 5.1 from back in 2017, unrelated to kernel number these days :). --- pkgs/tools/networking/horst/default.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/networking/horst/default.nix b/pkgs/tools/networking/horst/default.nix index c7d06274bea..ba76c37a4bb 100644 --- a/pkgs/tools/networking/horst/default.nix +++ b/pkgs/tools/networking/horst/default.nix @@ -2,25 +2,19 @@ stdenv.mkDerivation rec { name = "horst-${version}"; - version = "5.0"; + version = "5.1"; src = fetchFromGitHub { owner = "br101"; repo = "horst"; - rev = "version-${version}"; - sha256 = "0m7gc6dj816z8wyq5bdkqj7fw6rmxaah84s34ncsaispz2llva1x"; + rev = "v${version}"; + sha256 = "140pyv6rlsh4c745w4b59pz3hrarr39qq3mz9z1lsd3avc12nx1a"; }; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ ncurses libnl ]; - installPhase = '' - mkdir -p $out/bin - mv horst $out/bin - - mkdir -p $out/man/man1 - cp horst.1 $out/man/man1 - ''; + installFlags = [ "DESTDIR=${placeholder "out"}" ]; meta = with stdenv.lib; { description = "Small and lightweight IEEE802.11 wireless LAN analyzer with a text interface"; From e9568d3b01fd35fdd60f12f07338efc92bc09e22 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 10 May 2019 03:19:45 -0500 Subject: [PATCH 43/91] git-lfs: 2.5.2 -> 2.7.2 --- pkgs/applications/version-management/git-lfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-lfs/default.nix b/pkgs/applications/version-management/git-lfs/default.nix index 67c07072d41..92ba5738250 100644 --- a/pkgs/applications/version-management/git-lfs/default.nix +++ b/pkgs/applications/version-management/git-lfs/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "git-lfs-${version}"; - version = "2.5.2"; + version = "2.7.2"; goPackagePath = "github.com/git-lfs/git-lfs"; @@ -10,7 +10,7 @@ buildGoPackage rec { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "1y9l35j59d422v9hsbi117anm5d0177nspiy9r2zbjz3ygd9a4ck"; + sha256 = "1nf40rbdz901vsahg5cm09pznpina6wimmxl0lmh8pn0mi51yzvc"; }; preBuild = '' From 11a7e02e583c919897996e6cabb3e25a9322ec6c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 15 May 2019 18:38:01 -0500 Subject: [PATCH 44/91] termite: 14 -> 15 --- pkgs/applications/misc/termite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 22f669f0329..1a02d4837fe 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "termite-${version}"; - version = "14"; + version = "15"; src = fetchFromGitHub { owner = "thestinger"; repo = "termite"; rev = "v${version}"; - sha256 = "0dmz9rpc2fdvcwhcmjnhb48ixn403gxpq03g334d1hgjw2hsyx7x"; + sha256 = "0hp1x6lj098m3jgna274wv5dv60lnzg22297di68g4hw9djjyd2k"; fetchSubmodules = true; }; From 4757f0e7cf8484927b65ffa9fe751efffa9c8959 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 15 May 2019 18:45:08 -0500 Subject: [PATCH 45/91] termite: pick upstream fix for off-by-one w/newer vte --- pkgs/applications/misc/termite/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/termite/default.nix b/pkgs/applications/misc/termite/default.nix index 1a02d4837fe..674b228746d 100644 --- a/pkgs/applications/misc/termite/default.nix +++ b/pkgs/applications/misc/termite/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, vte-ng, gtk3, ncurses, wrapGAppsHook }: +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, vte-ng, gtk3, ncurses, wrapGAppsHook }: stdenv.mkDerivation rec { name = "termite-${version}"; @@ -14,7 +14,13 @@ stdenv.mkDerivation rec { # https://github.com/thestinger/termite/pull/516 patches = [ ./url_regexp_trailing.patch ./add_errno_header.patch - ] ++ stdenv.lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch; + # Fix off-by-one in select_text() on libvte >= 0.55.0 + # Expected to be included in next release (16). + (fetchpatch { + url = "https://github.com/thestinger/termite/commit/7e9a93b421b9596f8980645a46ac2ad5468dac06.patch"; + sha256 = "0vph2m5919f7w1xnc8i6z0j44clsm1chxkfg7l71nahxyfw5yh4j"; + }) + ] ++ stdenv.lib.optional stdenv.isDarwin ./remove_ldflags_macos.patch; makeFlags = [ "VERSION=v${version}" "PREFIX=" "DESTDIR=$(out)" ]; From ab1ac905b43a1dc64a00cacd0ccf31a6d0bc572c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 15 May 2019 22:39:22 +0200 Subject: [PATCH 46/91] libjpeg-turbo: 2.0.1 -> 2.0.2 --- .../libraries/libjpeg-turbo/default.nix | 19 +++---------------- .../djpeg-rgb-islow-icc-cmp.patch | 11 ----------- 2 files changed, 3 insertions(+), 27 deletions(-) delete mode 100644 pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch diff --git a/pkgs/development/libraries/libjpeg-turbo/default.nix b/pkgs/development/libraries/libjpeg-turbo/default.nix index ebcf51dfd03..23fa2f44b46 100644 --- a/pkgs/development/libraries/libjpeg-turbo/default.nix +++ b/pkgs/development/libraries/libjpeg-turbo/default.nix @@ -2,29 +2,16 @@ stdenv.mkDerivation rec { name = "libjpeg-turbo-${version}"; - version = "2.0.1"; + version = "2.0.2"; src = fetchurl { url = "mirror://sourceforge/libjpeg-turbo/${name}.tar.gz"; - sha256 = "1zv6z093l3x3jzygvni7b819j7xhn6d63jhcdrckj7fz67n6ry75"; + sha256 = "1v9gx1gdzgxf51nd55ncq7rghmj4x9x91rby50ag36irwngmkf5c"; }; patches = stdenv.lib.optional (stdenv.hostPlatform.libc or null == "msvcrt") - ./mingw-boolean.patch - ++ [ - ./djpeg-rgb-islow-icc-cmp.patch # https://github.com/libjpeg-turbo/libjpeg-turbo/pull/321 - (fetchpatch { - name = "cve-2018-19664.diff"; - url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/f8cca819a4fb.diff"; - sha256 = "1kgfag62qmphlrq0mz15g17zw7zrg9nzaz7d2vg50m6m7m5aw4y5"; - }) - (fetchpatch { - name = "CVE-2018-20330.patch"; - url = "https://github.com/libjpeg-turbo/libjpeg-turbo/commit/3d9c64e9f8aa1ee954d1d0bb3390fc894bb84da3.diff"; - sha256 = "1jai8izw6xl05ihx24rpc96d1jcr9rp421cb02pbz3v53cxdasji"; - }) - ]; + ./mingw-boolean.patch; outputs = [ "bin" "dev" "out" "man" "doc" ]; diff --git a/pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch b/pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch deleted file mode 100644 index c0f7fef4493..00000000000 --- a/pkgs/development/libraries/libjpeg-turbo/djpeg-rgb-islow-icc-cmp.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -999,6 +999,8 @@ foreach(libtype ${TEST_LIBTYPES}) - - add_test(djpeg-${libtype}-rgb-islow-icc-cmp - ${MD5CMP} b06a39d730129122e85c1363ed1bbc9e testout_rgb_islow.icc) -+ set_tests_properties(djpeg-${libtype}-rgb-islow-icc-cmp PROPERTIES -+ DEPENDS djpeg-${libtype}-rgb-islow) - - add_bittest(jpegtran icc "-copy;all;-icc;${TESTIMAGES}/test2.icc" - testout_rgb_islow2.jpg testout_rgb_islow.jpg ${MD5_JPEG_RGB_ISLOW2}) From 8f277d1c106cb9172a4cab12226a90bbb247da6f Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 16 May 2019 04:55:36 -0500 Subject: [PATCH 47/91] libertinus: update github owner, libertinus-fonts is now a redirect --- pkgs/data/fonts/libertinus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/libertinus/default.nix b/pkgs/data/fonts/libertinus/default.nix index 23c233b5893..578550bbe45 100644 --- a/pkgs/data/fonts/libertinus/default.nix +++ b/pkgs/data/fonts/libertinus/default.nix @@ -5,7 +5,7 @@ let in fetchFromGitHub rec { name = "libertinus-${version}"; - owner = "libertinus-fonts"; + owner = "alif-type"; repo = "libertinus"; rev = "v${version}"; @@ -23,7 +23,7 @@ in fetchFromGitHub rec { that started as an OpenType math companion of the Libertine font family, but grown as a full fork to address some of the bugs in the fonts. ''; - homepage = https://github.com/libertinus-fonts/libertinus; + homepage = https://github.com/alif-type/libertinus; license = licenses.ofl; maintainers = with maintainers; [ siddharthist ]; platforms = platforms.all; From 9e2a22ae87390065cd59a46ecb4f4a02e140c5e1 Mon Sep 17 00:00:00 2001 From: marius851000 Date: Thu, 16 May 2019 12:20:18 +0200 Subject: [PATCH 48/91] pioneer: update to 20190203 --- pkgs/games/pioneer/default.nix | 25 +++++++++++-------------- 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix index ffe0841184b..b6035918af7 100644 --- a/pkgs/games/pioneer/default.nix +++ b/pkgs/games/pioneer/default.nix @@ -1,33 +1,30 @@ -{ fetchFromGitHub, stdenv, autoconf, automake, pkgconfig -, curl, libsigcxx, SDL2, SDL2_image, freetype, libvorbis, libpng, assimp, libGLU_combined +{ fetchFromGitHub, stdenv, cmake, pkgconfig, curl, libsigcxx, SDL2 +, SDL2_image, freetype, libvorbis, libpng, assimp, libGLU_combined +, glew }: stdenv.mkDerivation rec { - name = "pioneer-${version}"; - version = "20180203"; + pname = "pioneer"; + version = "20190203"; src = fetchFromGitHub{ owner = "pioneerspacesim"; repo = "pioneer"; rev = version; - sha256 = "0hp2mf36kj2v93hka8m8lxw2qhmnjc62wjlpw7c7ix0r8xa01i6h"; + sha256 = "1g34wvgyvz793dhm1k64kl82ib0cavkbg0f2p3fp05b457ycljff"; }; - nativeBuildInputs = [ autoconf automake pkgconfig ]; + nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ curl libsigcxx SDL2 SDL2_image freetype libvorbis libpng assimp libGLU_combined ]; - - NIX_CFLAGS_COMPILE = [ - "-I${SDL2}/include/SDL2" + buildInputs = [ + curl libsigcxx SDL2 SDL2_image freetype libvorbis libpng + assimp libGLU_combined glew ]; preConfigure = '' - export PIONEER_DATA_DIR="$out/share/pioneer/data"; - ./bootstrap + export PIONEER_DATA_DIR="$out/share/pioneer/data"; ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { description = "A space adventure game set in the Milky Way galaxy at the turn of the 31st century"; homepage = https://pioneerspacesim.net; From b8a6775227222b4c6b0c4394d4c47f523658fcb6 Mon Sep 17 00:00:00 2001 From: Gabriel Ebner Date: Thu, 16 May 2019 11:59:10 +0200 Subject: [PATCH 49/91] neovim: use lua on aarch64 --- pkgs/applications/editors/neovim/default.nix | 4 +--- pkgs/top-level/all-packages.nix | 5 ++++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/editors/neovim/default.nix b/pkgs/applications/editors/neovim/default.nix index a53c499fe5c..5d623cdfc6d 100644 --- a/pkgs/applications/editors/neovim/default.nix +++ b/pkgs/applications/editors/neovim/default.nix @@ -80,6 +80,7 @@ in "-DGPERF_PRG=${gperf}/bin/gperf" ] ++ optional doCheck "-DBUSTED_PRG=${neovimLuaEnv}/bin/busted" + ++ optional (!lua.pkgs.isLuaJIT) "-DPREFER_LUA=ON" ; # triggers on buffer overflow bug while running tests @@ -122,8 +123,5 @@ in license = with licenses; [ asl20 vim ]; maintainers = with maintainers; [ manveru garbas rvolosatovs ]; platforms = platforms.unix; - # `lua: bad light userdata pointer` - # https://nix-cache.s3.amazonaws.com/log/9ahcb52905d9d417zsskjpc331iailpq-neovim-unwrapped-0.2.2.drv - broken = stdenv.isAarch64; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fd3cc0fe4d2..f0880f66de0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20458,7 +20458,10 @@ in wrapNeovim = callPackage ../applications/editors/neovim/wrapper.nix { }; neovim-unwrapped = callPackage ../applications/editors/neovim { - lua = luajit; + lua = + # neovim doesn't work with luajit on aarch64: https://github.com/neovim/neovim/issues/7879 + if stdenv.isAarch64 then lua5_1 else + luajit; }; neovim = wrapNeovim neovim-unwrapped { }; From 9ee1763cb6162c70846e197205154da69d5a3578 Mon Sep 17 00:00:00 2001 From: Renaud Date: Thu, 16 May 2019 14:41:48 +0200 Subject: [PATCH 50/91] pythonPackages.httpretty: disable 2 flaky tests intermittently failing on all platforms --- pkgs/development/python-modules/httpretty/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/httpretty/default.nix b/pkgs/development/python-modules/httpretty/default.nix index 0f61fd6d516..7d8f25ca954 100644 --- a/pkgs/development/python-modules/httpretty/default.nix +++ b/pkgs/development/python-modules/httpretty/default.nix @@ -34,7 +34,11 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; - NOSE_EXCLUDE = stdenv.lib.optionalString (stdenv.isAarch64) "tests.functional.test_httplib2.test_callback_response"; + # Those flaky tests are failing intermittently on all platforms + NOSE_EXCLUDE = stdenv.lib.concatStringsSep "," [ + "tests.functional.test_httplib2.test_callback_response" + "tests.functional.test_requests.test_streaming_responses" + ]; meta = with stdenv.lib; { homepage = "https://httpretty.readthedocs.org/"; From f38fbe0d4949209d1dee9194d14718defcf9aece Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 16 May 2019 09:36:20 -0400 Subject: [PATCH 51/91] vivaldi: 2.5.1525.41-1 -> 2.5.1525.43-1 --- pkgs/applications/networking/browsers/vivaldi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vivaldi/default.nix b/pkgs/applications/networking/browsers/vivaldi/default.nix index c1764aa3d5f..39351512a6a 100644 --- a/pkgs/applications/networking/browsers/vivaldi/default.nix +++ b/pkgs/applications/networking/browsers/vivaldi/default.nix @@ -16,11 +16,11 @@ let vivaldiName = if isSnapshot then "vivaldi-snapshot" else "vivaldi"; in stdenv.mkDerivation rec { pname = "vivaldi"; - version = "2.5.1525.41-1"; + version = "2.5.1525.43-1"; src = fetchurl { url = "https://downloads.vivaldi.com/${branch}/vivaldi-${branch}_${version}_amd64.deb"; - sha256 = "0hdyk2f0jwp9rgzkqidksrmbri6lgihlgny6hpksfz132m00lv0b"; + sha256 = "0mmyl32fz6p43gz8vzkhh0z1wcb3l5cckxl8vkz53lb9k2mckjqi"; }; unpackPhase = '' From b6769b6876fd030e09fdee69a25f8782233158dd Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Thu, 16 May 2019 21:38:43 +0800 Subject: [PATCH 52/91] cargo-sweep: fix cargoSha256 --- pkgs/development/tools/rust/cargo-sweep/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/rust/cargo-sweep/default.nix b/pkgs/development/tools/rust/cargo-sweep/default.nix index 52198665e9f..a6068a96dc7 100644 --- a/pkgs/development/tools/rust/cargo-sweep/default.nix +++ b/pkgs/development/tools/rust/cargo-sweep/default.nix @@ -11,7 +11,7 @@ rustPlatform.buildRustPackage rec { sha256 = "1zp0x0jy5bjqbxawlwvpj6vb3y602mnh19p48rw70kdx6vripbvj"; }; - cargoSha256 = "06hx8mlqarjnqrprwdp80cmanmacg3xz62r1bbn27pn60xv719hn"; + cargoSha256 = "1j5i4gp5mspgb8l6a25lqlyr5c16pchbh3g3yn8h1qlxj8g2vgnh"; meta = with stdenv.lib; { description = "A Cargo subcommand for cleaning up unused build files generated by Cargo"; From 636042d2658197ccbac27cff8707ea3b83e2d6b5 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 16 May 2019 17:57:37 +0200 Subject: [PATCH 53/91] yandex-disk: update i386 hash for 0.1.5.1010 --- pkgs/tools/filesystems/yandex-disk/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 15c61513d9a..3b9e4a02108 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -9,7 +9,7 @@ let else { arch = "i386"; gcclib = "${stdenv.cc.cc.lib}/lib"; - sha256 = "09h71i3k9d24ki81jdwhnav63fqbc44glbx228s9g3cr4ap41jcx"; + sha256 = "1s829q8gy9xgz0jm7w70aljqs2h49x402blqfr9zvn806aprmrm5"; }; in stdenv.mkDerivation rec { From 927da26d344fbc94f7f516b687706d9f970416f1 Mon Sep 17 00:00:00 2001 From: Renaud Date: Thu, 16 May 2019 19:28:58 +0200 Subject: [PATCH 54/91] mergerfs: 2.26.0 -> 2.26.1 Changes: https://github.com/trapexit/mergerfs/releases/tag/2.26.1 --- pkgs/tools/filesystems/mergerfs/default.nix | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/filesystems/mergerfs/default.nix b/pkgs/tools/filesystems/mergerfs/default.nix index a0981de42b0..4d28869d160 100644 --- a/pkgs/tools/filesystems/mergerfs/default.nix +++ b/pkgs/tools/filesystems/mergerfs/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, automake, autoconf, pkgconfig, gettext, libtool, pandoc, which, attr, libiconv }: stdenv.mkDerivation rec { - name = "mergerfs-${version}"; - version = "2.26.0"; + pname = "mergerfs"; + version = "2.26.1"; src = fetchFromGitHub { owner = "trapexit"; - repo = "mergerfs"; + repo = pname; rev = version; - sha256 = "1arq09rn1lmvv7gj3ymwdiygm620zdcx1jh2qpa1dxrdg8xrwqa9"; + sha256 = "16dgm2n36n6k7s1nzprzsv5bdckk0x2s08qpcvc42ny6jbivpjn3"; }; nativeBuildInputs = [ @@ -17,21 +17,20 @@ stdenv.mkDerivation rec { buildInputs = [ attr libiconv ]; preConfigure = '' - cat > src/version.hpp < VERSION ''; - makeFlags = [ "PREFIX=$(out)" "XATTR_AVAILABLE=1" ]; + makeFlags = [ "PREFIX=${placeholder "out"}" "XATTR_AVAILABLE=1" ]; + enableParallelBuilding = true; postFixup = '' - ln -s $out/bin/mergerfs $out/bin/mount.fuse.mergerfs + ln -srf $out/bin/mergerfs $out/bin/mount.fuse.mergerfs + ln -srf $out/bin/mergerfs $out/bin/mount.mergerfs ''; meta = { description = "A FUSE based union filesystem"; - homepage = https://github.com/trapexit/mergerfs; + homepage = "https://github.com/trapexit/mergerfs"; license = stdenv.lib.licenses.isc; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ jfrankenau makefu ]; From 42aafcedf4aa06459c4a8bd2953e52df2d55cd4b Mon Sep 17 00:00:00 2001 From: Renaud Date: Thu, 16 May 2019 19:50:51 +0200 Subject: [PATCH 55/91] mergerfs-tools: 20171221 -> 20190411 --- pkgs/tools/filesystems/mergerfs/tools.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/filesystems/mergerfs/tools.nix b/pkgs/tools/filesystems/mergerfs/tools.nix index 01f0de25a90..44337cf1161 100644 --- a/pkgs/tools/filesystems/mergerfs/tools.nix +++ b/pkgs/tools/filesystems/mergerfs/tools.nix @@ -2,14 +2,14 @@ , rsync, python3, pythonPackages }: stdenv.mkDerivation rec { - name = "mergerfs-tools-${version}"; - version = "20171221"; + pname = "mergerfs-tools"; + version = "20190411"; src = fetchFromGitHub { owner = "trapexit"; - repo = "mergerfs-tools"; - rev = "9b4fe0097b5b51e1a7411a26eb344a24cc8ce1b4"; - sha256 = "0qrixh3j58gzkmc8r2sgzgy56gm8bmhakwlc2gjb0yrpa1213na1"; + repo = pname; + rev = "6e41fc5848c7cc4408caea86f3991c8cc2ac85a1"; + sha256 = "0izswg6bya13scvb37l3gkl7mvi8q7l11p4hp4phdlcwh9jvdzcj"; }; nativeBuildInputs = [ makeWrapper ]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { makeFlags = [ "INSTALL=${coreutils}/bin/install" - "PREFIX=$(out)" + "PREFIX=${placeholder "out"}" ]; postInstall = with stdenv.lib; '' @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Optional tools to help manage data in a mergerfs pool"; - homepage = https://github.com/trapexit/mergerfs-tools; + homepage = "https://github.com/trapexit/mergerfs-tools"; license = licenses.isc; platforms = platforms.linux; maintainers = with maintainers; [ jfrankenau ]; From 08aae882b6ad774146dcd6ed4023a566a3140785 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 16 May 2019 14:38:02 -0400 Subject: [PATCH 56/91] linux: 4.14.119 -> 4.14.120 --- pkgs/os-specific/linux/kernel/linux-4.14.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.14.nix b/pkgs/os-specific/linux/kernel/linux-4.14.nix index 0a8b8cd4042..c10b2b8a6d4 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.14.119"; + version = "4.14.120"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0z1vmpbjkn9vqf380dgdcdmi2a22cymjs0spm9708x4x709vf5an"; + sha256 = "0k6bphnwwbgj06v8a4xafb23ysrvh8kg0imwhbvm6vsyyrnfif6x"; }; } // (args.argsOverride or {})) From e9ec2f1f2953ea4abca53ad6ada41d7672031d32 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 16 May 2019 14:38:05 -0400 Subject: [PATCH 57/91] linux: 4.19.43 -> 4.19.44 --- pkgs/os-specific/linux/kernel/linux-4.19.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.19.nix b/pkgs/os-specific/linux/kernel/linux-4.19.nix index 2119c11dee4..bd5f2fe347d 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "4.19.43"; + version = "4.19.44"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0myzsbajwvskiqdlqsahw87f0ppj9gj7kh05vbs8ndmjzahij5hi"; + sha256 = "125jlsy42qlprg6yhinsm87ir7x4iw2v2fd0myjihmkpjgll4xkh"; }; } // (args.argsOverride or {})) From b5c73e967c8a909e8bcede646a8597aa7e6990d9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 16 May 2019 14:38:08 -0400 Subject: [PATCH 58/91] linux: 4.4.179 -> 4.4.180 --- pkgs/os-specific/linux/kernel/linux-4.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.4.nix b/pkgs/os-specific/linux/kernel/linux-4.4.nix index 7ffe5dc88f1..dc6998410cf 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.179"; + version = "4.4.180"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1l979wmxridq9psjlhmgkax3bi769pvmmvdgf0j2y67gclkrssic"; + sha256 = "0ykai953rpy9zkb4qxb63y6pwwbwlnvx69nhb797zfw1scbh4i8s"; }; } // (args.argsOverride or {})) From e289798ec86d63b46d01d17d1980c3efc203ecd8 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 16 May 2019 14:38:11 -0400 Subject: [PATCH 59/91] linux: 4.9.176 -> 4.9.177 --- pkgs/os-specific/linux/kernel/linux-4.9.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-4.9.nix b/pkgs/os-specific/linux/kernel/linux-4.9.nix index 2f2ff1f929e..ca30427a883 100644 --- a/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { stdenv, buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.176"; + version = "4.9.177"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0y5i0picww914ljynqjdpv7cld7380y9lrlgnza02zvkq04d151a"; + sha256 = "1vl7g21538ndlygpjsbjnayi9f37zi8s2g37gcznany3phz1wfy7"; }; } // (args.argsOverride or {})) From 327bfaf1a71bb846e73a21cdcc0e54c19abf97c1 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 16 May 2019 14:38:14 -0400 Subject: [PATCH 60/91] linux: 5.0.16 -> 5.0.17 --- pkgs/os-specific/linux/kernel/linux-5.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.0.nix b/pkgs/os-specific/linux/kernel/linux-5.0.nix index 4571a570d4d..28ea81e8795 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.0.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.0.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.0.16"; + version = "5.0.17"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1b7wz577mdn2cdpn8mm8bl5kgxvm3rq7fzy0nc8cxl2j1wwwx9sw"; + sha256 = "0acng2xdpjagqabhirb85yj2z9h6yplgdiicvk2kyklsvjdh4dxb"; }; } // (args.argsOverride or {})) From 37d17ec48553e6775a1a33fafaa02590bb37291a Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Thu, 16 May 2019 14:38:17 -0400 Subject: [PATCH 61/91] linux: 5.1.2 -> 5.1.3 --- pkgs/os-specific/linux/kernel/linux-5.1.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-5.1.nix b/pkgs/os-specific/linux/kernel/linux-5.1.nix index e06cdd26fdd..5db24b34ec9 100644 --- a/pkgs/os-specific/linux/kernel/linux-5.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-5.1.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.1.2"; + version = "5.1.3"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStrings (intersperse "." (take 3 (splitString "." "${version}.0"))) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0nzgkg4si0378pz6cv3hwj7qmmi5wdz1qvml0198b61n89xdcypc"; + sha256 = "18malq2ps7v8c21xp8vaba9kvnnpnzg3wcsi46ci1rzqv893xxdh"; }; } // (args.argsOverride or {})) From 357239577f7e9e01af50d848f3c73b37b62e422c Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 16 May 2019 13:44:01 -0500 Subject: [PATCH 62/91] buku: 4.1 -> 4.2 (#61564) * buku: 4.1 -> 4.2 * buku: fix install tests --- pkgs/applications/misc/buku/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/buku/default.nix b/pkgs/applications/misc/buku/default.nix index bde8fab8144..9822a187b9e 100644 --- a/pkgs/applications/misc/buku/default.nix +++ b/pkgs/applications/misc/buku/default.nix @@ -1,14 +1,14 @@ { stdenv, python3, fetchFromGitHub, fetchpatch }: with python3.pkgs; buildPythonApplication rec { - version = "4.1"; + version = "4.2"; pname = "buku"; src = fetchFromGitHub { owner = "jarun"; repo = "buku"; rev = "v${version}"; - sha256 = "166l1fmpqn4hys4l0ssc4yd590mmav1w62vm9l5ijhjhmlnrzfax"; + sha256 = "1ipvhd9wa4iq0763b9h4f3xa6x31bssi6m0595w97mdhh9n6bgxg"; }; checkInputs = [ @@ -18,6 +18,7 @@ with python3.pkgs; buildPythonApplication rec { pylint flake8 pyyaml + mypy_extensions ]; propagatedBuildInputs = [ From 3e2d174d3b23e34f55fb5ce8fd947594502141ac Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Thu, 16 May 2019 20:43:30 +0200 Subject: [PATCH 63/91] android-studio: 3.4.0.18 -> 3.4.1.0 --- 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 8af0a647561..d53ccb1fdbd 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -8,9 +8,9 @@ let inherit (gnome2) GConf gnome_vfs; }; stableVersion = { - version = "3.4.0.18"; # "Android Studio 3.4.0" - build = "183.5452501"; - sha256Hash = "0i8wz9v6nxzr27a07cv2330i84v94pcl13gjwvpglp55hyzd8axd"; + version = "3.4.1.0"; # "Android Studio 3.4.1" + build = "183.5522156"; + sha256Hash = "0y4l9d1yrvv1csx6vl4jnqgqy96y44rl6p8hcxrnbvrg61iqnj30"; }; betaVersion = latestVersion; latestVersion = { # canary & dev From ef14821cc1813952b73ee1ddb2a893606a483637 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 16 May 2019 14:51:23 -0400 Subject: [PATCH 64/91] pythonPackages.anytree: init at 2.6.0 --- .../python-modules/anytree/default.nix | 63 +++++++++++++++++++ .../python-modules/anytree/graphviz.patch | 13 ++++ pkgs/top-level/python-packages.nix | 4 ++ 3 files changed, 80 insertions(+) create mode 100644 pkgs/development/python-modules/anytree/default.nix create mode 100644 pkgs/development/python-modules/anytree/graphviz.patch diff --git a/pkgs/development/python-modules/anytree/default.nix b/pkgs/development/python-modules/anytree/default.nix new file mode 100644 index 00000000000..3821fea2446 --- /dev/null +++ b/pkgs/development/python-modules/anytree/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, substituteAll +, fetchpatch +, nose +, six +, graphviz +, fontconfig +}: + +buildPythonPackage rec { + pname = "anytree"; + version = "2.6.0"; + + src = fetchFromGitHub { + owner = "c0fec0de"; + repo = pname; + rev = version; + sha256 = "1k3yj9h3ssjlz57r4g1qzxvprxjp7n92vms9fv0d46pigylxm5i3"; + }; + + patches = [ + (substituteAll { + src = ./graphviz.patch; + inherit graphviz; + }) + # Fix tests python3.7 + # See: https://github.com/c0fec0de/anytree/pull/85 + (fetchpatch { + url = "https://github.com/c0fec0de/anytree/commit/dd1b3d325546fef7436711e4cfea9a5fb61daaf8.patch"; + sha256 = "1dpa2jh2kakfaapnqrz03frb67q5fwxzc8c70i6nv1b01i9xw0bn"; + }) + ]; + + checkInputs = [ + nose + ]; + + propagatedBuildInputs = [ + six + ]; + + # Fontconfig error: Cannot load default config file + preCheck = '' + export FONTCONFIG_FILE=${fontconfig.out}/etc/fonts/fonts.conf + ''; + + checkPhase = '' + runHook preCheck + + nosetests + + runHook postCheck + ''; + + meta = with lib; { + description = "Powerful and Lightweight Python Tree Data Structure"; + homepage = https://github.com/c0fec0de/anytree; + license = licenses.asl20; + maintainers = [ maintainers.worldofpeace ]; + }; +} diff --git a/pkgs/development/python-modules/anytree/graphviz.patch b/pkgs/development/python-modules/anytree/graphviz.patch new file mode 100644 index 00000000000..583b60444e3 --- /dev/null +++ b/pkgs/development/python-modules/anytree/graphviz.patch @@ -0,0 +1,13 @@ +diff --git a/anytree/exporter/dotexporter.py b/anytree/exporter/dotexporter.py +index 9c10a68..209a952 100644 +--- a/anytree/exporter/dotexporter.py ++++ b/anytree/exporter/dotexporter.py +@@ -228,7 +228,7 @@ class DotExporter(object): + for line in self: + dotfile.write(("%s\n" % line).encode("utf-8")) + dotfile.flush() +- cmd = ["dot", dotfilename, "-T", fileformat, "-o", filename] ++ cmd = ["@graphviz@/bin/dot", dotfilename, "-T", fileformat, "-o", filename] + check_call(cmd) + try: + remove(dotfilename) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a70f5309d4d..7dae4ff91af 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -181,6 +181,10 @@ in { ansicolor = callPackage ../development/python-modules/ansicolor { }; + anytree = callPackage ../development/python-modules/anytree { + inherit (pkgs) graphviz; + }; + aplpy = callPackage ../development/python-modules/aplpy { }; argon2_cffi = callPackage ../development/python-modules/argon2_cffi { }; From e2bbc6fb469a43384b593f3018920a0f2a090a5e Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 16 May 2019 15:05:32 -0500 Subject: [PATCH 65/91] nixos: fix services.foundationdb.traceFormat for older server versions This was a testing oversight that came from #61009 -- I forgot to test the new traceFormat option with older server versions while I was working on FDB 6.1. Since trace_format is only available in 6.1+, emitting it unconditionally caused older versions of the database fail to start, reporting an error. We simply gate it behind a version check instead, and assert the format is always XML on older versions. This avoids the case where the user has an old version, changes traceFormat willingly, and then is confused by why it didn't work. As reported by @TimothyKlim in the comments on commit c55b9236f0f208a8689e400ddbea52858c923372. See https://github.com/NixOS/nixpkgs/commit/c55b9236f0f208a8689e400ddbea52858c923372#r33566132 Signed-off-by: Austin Seipp --- nixos/modules/services/databases/foundationdb.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/modules/services/databases/foundationdb.nix b/nixos/modules/services/databases/foundationdb.nix index 169ed37b348..490c5e9d005 100644 --- a/nixos/modules/services/databases/foundationdb.nix +++ b/nixos/modules/services/databases/foundationdb.nix @@ -35,7 +35,10 @@ let ${optionalString (cfg.class != null) "class = ${cfg.class}"} memory = ${cfg.memory} storage_memory = ${cfg.storageMemory} + + ${optionalString (lib.versionAtLeast cfg.package.version "6.1") '' trace_format = ${cfg.traceFormat} + ''} ${optionalString (cfg.tls != null) '' tls_plugin = ${pkg}/libexec/plugins/FDBLibTLS.so @@ -327,6 +330,15 @@ in }; config = mkIf cfg.enable { + assertions = [ + { assertion = lib.versionOlder cfg.package.version "6.1" -> cfg.traceFormat == "xml"; + message = '' + Versions of FoundationDB before 6.1 do not support configurable trace formats (only XML is supported). + This option has no effect for version '' + cfg.package.version + '', and enabling it is an error. + ''; + } + ]; + environment.systemPackages = [ pkg ]; users.users = optionalAttrs (cfg.user == "foundationdb") (singleton From 44d9383483883904231333b6d35368f1d5e8ae5e Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 16 May 2019 15:31:33 -0500 Subject: [PATCH 66/91] electrum: 3.3.5 -> 3.3.6 https://github.com/spesmilo/electrum/blob/3.3.6/RELEASE-NOTES --- pkgs/applications/misc/electrum/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 9cabd6dda7c..6e69665da2b 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, fetchFromGitHub, python3, python3Packages, zbar, secp256k1 }: let - version = "3.3.5"; + version = "3.3.6"; # Not provided in official source releases, which are what upstream signs. tests = fetchFromGitHub { owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "11rzzrv5xxqazcb7q1ig93d6cisqmd1x0jrgvfgzysbzvi51gg11"; + sha256 = "0s8i6fn1jwk80d036n4c7csv4qnx2k15f6347kr4mllglcpa9hb3"; extraPostFetch = '' mv $out ./all @@ -23,7 +23,7 @@ python3Packages.buildPythonApplication rec { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "1csj0n96zlajnrs39wsazfj5lmy7v7n77cdz56lr8nkmchh6k9z1"; + sha256 = "0am5ki3z0yvhrz16vp2jjy5fkxxqph0mj9qqpbw3kpql65shykwz"; }; postUnpack = '' From 71fdb6931436e98259dcb65dbcd1f656c1b2d194 Mon Sep 17 00:00:00 2001 From: Bas van Dijk Date: Thu, 16 May 2019 23:42:02 +0200 Subject: [PATCH 67/91] nixos: add test for tinydns --- nixos/tests/all-tests.nix | 1 + nixos/tests/tinydns.nix | 26 ++++++++++++++++++++++++++ 2 files changed, 27 insertions(+) create mode 100644 nixos/tests/tinydns.nix diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index d495b2fa633..7ac6aba4ab3 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -236,6 +236,7 @@ in pdns-recursor = handleTest ./pdns-recursor.nix {}; taskserver = handleTest ./taskserver.nix {}; telegraf = handleTest ./telegraf.nix {}; + tinydns = handleTest ./tinydns.nix {}; tomcat = handleTest ./tomcat.nix {}; tor = handleTest ./tor.nix {}; transmission = handleTest ./transmission.nix {}; diff --git a/nixos/tests/tinydns.nix b/nixos/tests/tinydns.nix new file mode 100644 index 00000000000..cb7ee0c5fb5 --- /dev/null +++ b/nixos/tests/tinydns.nix @@ -0,0 +1,26 @@ +import ./make-test.nix ({ lib, ...} : { + name = "tinydns"; + meta = { + maintainers = with lib.maintainers; [ basvandijk ]; + }; + nodes = { + nameserver = { config, lib, ... } : let + ip = (lib.head config.networking.interfaces.eth1.ipv4.addresses).address; + in { + networking.nameservers = [ ip ]; + services.tinydns = { + enable = true; + inherit ip; + data = '' + .foo.bar:${ip} + +.bla.foo.bar:1.2.3.4:300 + ''; + }; + }; + }; + testScript = '' + $nameserver->start; + $nameserver->waitForUnit("tinydns.service"); + $nameserver->succeed("host bla.foo.bar | grep '1\.2\.3\.4'"); + ''; +}) From 2d93f57db58f2631017714c4e28bf72c2c52c036 Mon Sep 17 00:00:00 2001 From: LeOtaku Date: Thu, 2 May 2019 00:08:56 +0200 Subject: [PATCH 68/91] nixos/geoclue2: make configurable, can whitelist applications All options within geoclue.conf[0] have been made configurable. Additonally, we can now specify whether or not GeoClue should ask the agent to authorize an application like so: ``` services.geoclue2.appConfig."redshift" = { isAllowed = true; isSystem = true; }; ``` [0]: https://gitlab.freedesktop.org/geoclue/geoclue/blob/2.5.2/data/geoclue.conf.in Co-authored-by: worldofpeace --- nixos/modules/services/desktops/geoclue2.nix | 188 ++++++++++++++++++- 1 file changed, 183 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/desktops/geoclue2.nix b/nixos/modules/services/desktops/geoclue2.nix index 840aa5294ed..a16dbc04a5f 100644 --- a/nixos/modules/services/desktops/geoclue2.nix +++ b/nixos/modules/services/desktops/geoclue2.nix @@ -7,6 +7,56 @@ with lib; let # the demo agent isn't built by default, but we need it here package = pkgs.geoclue2.override { withDemoAgent = config.services.geoclue2.enableDemoAgent; }; + + cfg = config.services.geoclue2; + + defaultWhitelist = [ "gnome-shell" "io.elementary.desktop.agent-geoclue2" ]; + + appConfigModule = types.submodule ({ name, ... }: { + options = { + desktopID = mkOption { + type = types.str; + description = "Desktop ID of the application."; + }; + + isAllowed = mkOption { + type = types.bool; + default = null; + description = '' + Whether the application will be allowed access to location information. + ''; + }; + + isSystem = mkOption { + type = types.bool; + default = null; + description = '' + Whether the application is a system component or not. + ''; + }; + + users = mkOption { + type = types.listOf types.str; + default = []; + description = '' + List of UIDs of all users for which this application is allowed location + info access, Defaults to an empty string to allow it for all users. + ''; + }; + }; + + config.desktopID = mkDefault name; + }); + + appConfigToINICompatible = _: { desktopID, isAllowed, isSystem, users, ... }: { + name = desktopID; + value = { + allowed = isAllowed; + system = isSystem; + users = concatStringsSep ";" users; + }; + }; + in { @@ -35,23 +85,117 @@ in ''; }; + enableNmea = mkOption { + type = types.bool; + default = true; + description = '' + Whether to fetch location from NMEA sources on local network. + ''; + }; + + enable3G = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable 3G source. + ''; + }; + + enableCDMA = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable CDMA source. + ''; + }; + + enableModemGPS = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable Modem-GPS source. + ''; + }; + + enableWifi = mkOption { + type = types.bool; + default = true; + description = '' + Whether to enable WiFi source. + ''; + }; + + geoProviderUrl = mkOption { + type = types.str; + default = "https://location.services.mozilla.com/v1/geolocate?key=geoclue"; + example = "https://www.googleapis.com/geolocation/v1/geolocate?key=YOUR_KEY"; + description = '' + The url to the wifi GeoLocation Service. + ''; + }; + + submitData = mkOption { + type = types.bool; + default = false; + description = '' + Whether to submit data to a GeoLocation Service. + ''; + }; + + submissionUrl = mkOption { + type = types.str; + default = "https://location.services.mozilla.com/v1/submit?key=geoclue"; + description = '' + The url to submit data to a GeoLocation Service. + ''; + }; + + submissionNick = mkOption { + type = types.str; + default = "geoclue"; + description = '' + A nickname to submit network data with. + Must be 2-32 characters long. + ''; + }; + + appConfig = mkOption { + type = types.loaOf appConfigModule; + default = {}; + example = literalExample '' + "com.github.app" = { + isAllowed = true; + isSystem = true; + users = [ "300" ]; + }; + ''; + description = '' + Specify extra settings per application. + ''; + }; + }; }; ###### implementation - config = mkIf config.services.geoclue2.enable { + config = mkIf cfg.enable { environment.systemPackages = [ package ]; services.dbus.packages = [ package ]; systemd.packages = [ package ]; - + + # restart geoclue service when the configuration changes + systemd.services."geoclue".restartTriggers = [ + config.environment.etc."geoclue/geoclue.conf".source + ]; + # this needs to run as a user service, since it's associated with the # user who is making the requests - systemd.user.services = mkIf config.services.geoclue2.enableDemoAgent { + systemd.user.services = mkIf cfg.enableDemoAgent { "geoclue-agent" = { description = "Geoclue agent"; script = "${package}/libexec/geoclue-2.0/demos/agent"; @@ -62,7 +206,41 @@ in }; }; - environment.etc."geoclue/geoclue.conf".source = "${package}/etc/geoclue/geoclue.conf"; - }; + services.geoclue2.appConfig."epiphany" = { + isAllowed = true; + isSystem = false; + }; + services.geoclue2.appConfig."firefox" = { + isAllowed = true; + isSystem = false; + }; + + environment.etc."geoclue/geoclue.conf".text = + generators.toINI {} ({ + agent = { + whitelist = concatStringsSep ";" + (optional cfg.enableDemoAgent "geoclue-demo-agent" ++ defaultWhitelist); + }; + network-nmea = { + enable = cfg.enableNmea; + }; + "3g" = { + enable = cfg.enable3G; + }; + cdma = { + enable = cfg.enableCDMA; + }; + modem-gps = { + enable = cfg.enableModemGPS; + }; + wifi = { + enable = cfg.enableWifi; + url = cfg.geoProviderUrl; + submit-data = boolToString cfg.submitData; + submission-url = cfg.submissionUrl; + submission-nick = cfg.submissionNick; + }; + } // mapAttrs' appConfigToINICompatible cfg.appConfig); + }; } From 00d8fc1cdef7cc60f044160b87bc673ef4885d1b Mon Sep 17 00:00:00 2001 From: LeOtaku Date: Wed, 15 May 2019 19:53:01 +0200 Subject: [PATCH 69/91] nixos/gnome3: add geoclue application configuration Co-authored-by: worldofpeace --- .../services/x11/desktop-managers/gnome3.nix | 21 ++++++++++++++++--- 1 file changed, 18 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 7b65f1b85c6..ef6820d3326 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -120,9 +120,6 @@ in { security.polkit.enable = true; services.udisks2.enable = true; services.accounts-daemon.enable = true; - services.geoclue2.enable = mkDefault true; - # GNOME should have its own geoclue agent - services.geoclue2.enableDemoAgent = false; services.dleyna-renderer.enable = mkDefault true; services.dleyna-server.enable = mkDefault true; services.gnome3.at-spi2-core.enable = true; @@ -191,6 +188,24 @@ in { '') cfg.sessionPath} ''; + + services.geoclue2.enable = mkDefault true; + # GNOME should have its own geoclue agent + services.geoclue2.enableDemoAgent = false; + + services.geoclue2.appConfig."gnome-datetime-panel" = { + isAllowed = true; + isSystem = true; + }; + services.geoclue2.appConfig."gnome-color-panel" = { + isAllowed = true; + isSystem = true; + }; + services.geoclue2.appConfig."org.gnome.Shell" = { + isAllowed = true; + isSystem = true; + }; + environment.variables.GNOME_SESSION_DEBUG = optionalString cfg.debug "1"; # Override default mimeapps From efcdac63fee4280cdc276362199503b6acb75df2 Mon Sep 17 00:00:00 2001 From: LeOtaku Date: Thu, 16 May 2019 23:35:37 +0200 Subject: [PATCH 70/91] nixos/pantheon: add geoclue application configuration Co-authored-by: worldofpeace --- .../services/x11/desktop-managers/pantheon.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index e1eeb32aa1a..9a0f77a856a 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -118,9 +118,6 @@ in (mkIf config.services.printing.enable ([pkgs.system-config-printer]) ) ]; services.pantheon.contractor.enable = mkDefault true; - services.geoclue2.enable = mkDefault true; - # pantheon has pantheon-agent-geoclue2 - services.geoclue2.enableDemoAgent = false; services.gnome3.at-spi2-core.enable = true; services.gnome3.evince.enable = mkDefault true; services.gnome3.evolution-data-server.enable = true; @@ -140,6 +137,14 @@ in services.xserver.updateDbusEnvironment = true; services.zeitgeist.enable = mkDefault true; + services.geoclue2.enable = mkDefault true; + # pantheon has pantheon-agent-geoclue2 + services.geoclue2.enableDemoAgent = false; + services.geoclue2.appConfig."io.elementary.desktop.agent-geoclue2" = { + isAllowed = true; + isSystem = true; + }; + networking.networkmanager.enable = mkDefault true; networking.networkmanager.basePackages = { inherit (pkgs) networkmanager modemmanager wpa_supplicant; From 632591818a26065c378b3acafb9b275fbe9ce66a Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 16 May 2019 18:53:45 -0400 Subject: [PATCH 71/91] pantheon.elementary-photos: 2.6.3 -> 2.6.4 Patch in tree is removed because it's included upstream. https://github.com/elementary/photos/releases/tag/2.6.4 --- .../apps/elementary-photos/default.nix | 10 ++------- .../elementary-photos/fix-missing-line.patch | 21 ------------------- 2 files changed, 2 insertions(+), 29 deletions(-) delete mode 100644 pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patch diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 493e7a97805..4ee2aef1760 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { pname = "photos"; - version = "2.6.3"; + version = "2.6.4"; name = "elementary-${pname}-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "1s0ww5g26wj0gd1drj8gxs74gvg2c9fdj4ixpifj8jh8yafdmrvg"; + sha256 = "17r9658s0pqy6s45ysi3915sm8hpvmsp7cw2jahqvjc61r4qpdc1"; }; passthru = { @@ -66,12 +66,6 @@ stdenv.mkDerivation rec { "-Dplugins=false" ]; - patches = [ - # https://github.com/elementary/photos/pull/505 - # Unrelated line got dropped in https://github.com/elementary/photos/pull/498 - ./fix-missing-line.patch - ]; - postPatch = '' chmod +x meson/post_install.py patchShebangs meson/post_install.py diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patch b/pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patch deleted file mode 100644 index ae859d9dff9..00000000000 --- a/pkgs/desktops/pantheon/apps/elementary-photos/fix-missing-line.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 88ee69b57f94efa2779595d1544109fed6a3211c Mon Sep 17 00:00:00 2001 -From: Fabio Valentini -Date: Tue, 16 Apr 2019 16:12:47 +0200 -Subject: [PATCH] photos/PhotoMetadata: fix issue introduced with PR #498 - ---- - src/photos/PhotoMetadata.vala | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/photos/PhotoMetadata.vala b/src/photos/PhotoMetadata.vala -index f0a4a73b..34dcbb55 100644 ---- a/src/photos/PhotoMetadata.vala -+++ b/src/photos/PhotoMetadata.vala -@@ -197,6 +197,7 @@ public class PhotoMetadata : MediaMetadata { - #else - exiv2.from_app1_segment (buffer, length); - #endif -+ exif = Exif.Data.new_from_data (buffer, length); - source_name = "".printf (length); - } - From 4ce159c41df1148f14b8f057b338a7c5c6022ffd Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 16 May 2019 19:08:21 -0400 Subject: [PATCH 72/91] pantheon.wingpanel-applications-menu: 2.4.2 -> 2.4.3 Now finally builds with Meson, where it was available since last release but needed several fixes to be release quality IMHO. Also dropped xdg patch since because meson [0]. https://github.com/elementary/applications-menu/releases/tag/2.4.3 [0]: https://github.com/elementary/applications-menu/commit/58cd96a4cc5c98bbf379f119cd2e92d0142a80d9 --- .../applications-menu/default.nix | 26 ++++++++++++------- .../applications-menu/xdg.patch | 13 ---------- 2 files changed, 16 insertions(+), 23 deletions(-) delete mode 100644 pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/xdg.patch diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix index 2461ea4875e..e905ce9d854 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/default.nix @@ -1,11 +1,11 @@ -{ stdenv, fetchFromGitHub, pantheon, substituteAll, cmake, ninja +{ stdenv, fetchFromGitHub, pantheon, substituteAll, meson, ninja, python3 , pkgconfig, vala, granite, libgee, gettext, gtk3, appstream, gnome-menus , json-glib, plank, bamf, switchboard, libunity, libsoup, wingpanel, libwnck3 -, zeitgeist, gobject-introspection, elementary-icon-theme, bc, wrapGAppsHook }: +, zeitgeist, bc }: stdenv.mkDerivation rec { pname = "applications-menu"; - version = "2.4.2"; + version = "2.4.3"; name = "wingpanel-${pname}-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "elementary"; repo = pname; rev = version; - sha256 = "0y7kh50ixvm4m56v18c70s05hhpfp683c4qi3sxy50p2368d772x"; + sha256 = "15mwfynaa57jii43x77iaz5gqjlylh5zxc70am8zgp8vhgzflvyd"; }; passthru = { @@ -25,18 +25,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ appstream - cmake - ninja gettext - gobject-introspection + meson + ninja pkgconfig + python3 vala - wrapGAppsHook ]; buildInputs = [ bamf - elementary-icon-theme gnome-menus granite gtk3 @@ -51,6 +49,10 @@ stdenv.mkDerivation rec { zeitgeist ]; + mesonFlags = [ + "--sysconfdir=${placeholder ''out''}/etc" + ]; + PKG_CONFIG_WINGPANEL_2_0_INDICATORSDIR = "${placeholder ''out''}/lib/wingpanel"; PKG_CONFIG_SWITCHBOARD_2_0_PLUGSDIR = "${placeholder ''out''}/lib/switchboard"; @@ -59,9 +61,13 @@ stdenv.mkDerivation rec { src = ./bc.patch; exec = "${bc}/bin/bc"; }) - ./xdg.patch ]; + postPatch = '' + chmod +x meson/post_install.py + patchShebangs meson/post_install.py + ''; + meta = with stdenv.lib; { description = "Lightweight and stylish app launcher for Pantheon"; homepage = https://github.com/elementary/applications-menu; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/xdg.patch b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/xdg.patch deleted file mode 100644 index f17e2581e07..00000000000 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/applications-menu/xdg.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 928976a..7f0ea58 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -90,7 +90,7 @@ link_directories (${DEPS_LIBRARY_DIRS}) - - # Installation - install (TARGETS ${APPNAME} RUNTIME DESTINATION bin) --install (FILES ${applications_menu} DESTINATION /etc/xdg/menus) -+install (FILES ${applications_menu} DESTINATION etc/xdg/menus) - file (GLOB resources "${CMAKE_CURRENT_SOURCE_DIR}/data/*") - - # Settings schema From d494c6c9b42e3682acfa57f740a8e0016698d8ab Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 10 May 2019 13:57:51 -0500 Subject: [PATCH 73/91] libnice: 0.1.15 -> 0.1.16 https://gitlab.freedesktop.org/libnice/libnice/blob/0.1.16/NEWS --- pkgs/development/libraries/libnice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index e71bcd0e368..08718c99092 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, fetchpatch, meson, ninja, pkgconfig, python3, gobject-introspection, gtk-doc, docbook_xsl, docbook_xml_dtd_412, glib, gupnp-igd, gst_all_1, gnutls }: stdenv.mkDerivation rec { - name = "libnice-0.1.15"; + name = "libnice-0.1.16"; outputs = [ "bin" "out" "dev" "devdoc" ]; src = fetchurl { url = "https://nice.freedesktop.org/releases/${name}.tar.gz"; - sha256 = "1nl7fn07f4i513s9c1s1ic3rki8rm2d000wsf6f4157mb0zhya7p"; + sha256 = "1pzgxq0qrqlrhd78qnvpfgp8bl5c4znqh599ljaybpcldw37idh6"; }; patches = [ From 79e492e7fdb652fc500c08b73c6091d40e013483 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 10 May 2019 14:08:04 -0500 Subject: [PATCH 74/91] libnice: drop included patches --- pkgs/development/libraries/libnice/default.nix | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/pkgs/development/libraries/libnice/default.nix b/pkgs/development/libraries/libnice/default.nix index 08718c99092..d6bb8ec5046 100644 --- a/pkgs/development/libraries/libnice/default.nix +++ b/pkgs/development/libraries/libnice/default.nix @@ -18,19 +18,6 @@ stdenv.mkDerivation rec { url = https://gitlab.freedesktop.org/libnice/libnice/commit/d470c4bf4f2449f7842df26ca1ce1efb63452bc6.patch; sha256 = "0z74vizf92flfw1m83p7yz824vfykmnm0xbnk748bnnyq186i6mg"; }) - - # Fix test-different-number-streams - # https://gitlab.freedesktop.org/libnice/libnice/merge_requests/36 - (fetchpatch { - url = https://gitlab.freedesktop.org/libnice/libnice/commit/a38c2adfc4bed2a69dc02568417f0926dd555b9a.patch; - sha256 = "1rh4z4iknrimmm3b3v8ln8vl3dsqi91g4vf0dl85348kvnf0sv6z"; - }) - # Fix test-gstreamer - # https://gitlab.freedesktop.org/libnice/libnice/merge_requests/35 - (fetchpatch { - url = https://gitlab.freedesktop.org/libnice/libnice/commit/02de1fa1956105b09d9db4fd6331452b0ff0b8a2.patch; - sha256 = "12dymq1v20wj5n1cway4n3y8fkra1ffnpj5w7pbz38i612b82qw0"; - }) ]; nativeBuildInputs = [ meson ninja pkgconfig python3 gobject-introspection gtk-doc docbook_xsl docbook_xml_dtd_412 ]; From 85b3448e6a1967e2f49bc85f2559b3393f33361d Mon Sep 17 00:00:00 2001 From: nyanloutre Date: Wed, 1 May 2019 21:56:58 +0200 Subject: [PATCH 75/91] nixos/factorio: sandbox service using systemd - DynamicUser enabled instead of static uid/gid - Enables most sandboxing options systemd offers --- nixos/modules/misc/ids.nix | 4 +-- nixos/modules/services/games/factorio.nix | 44 +++++++++++------------ 2 files changed, 23 insertions(+), 25 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 5198bedc138..5b7fa5d2b98 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -265,7 +265,7 @@ syncthing = 237; caddy = 239; taskd = 240; - factorio = 241; + # factorio = 241; # DynamicUser = true # emby = 242; # unusued, removed 2019-05-01 graylog = 243; sniproxy = 244; @@ -567,7 +567,7 @@ syncthing = 237; caddy = 239; taskd = 240; - factorio = 241; + # factorio = 241; # unused # emby = 242; # unused, removed 2019-05-01 sniproxy = 244; nzbget = 245; diff --git a/nixos/modules/services/games/factorio.nix b/nixos/modules/services/games/factorio.nix index 3f6bf9de893..d04673a6c8b 100644 --- a/nixos/modules/services/games/factorio.nix +++ b/nixos/modules/services/games/factorio.nix @@ -6,7 +6,7 @@ let cfg = config.services.factorio; factorio = pkgs.factorio-headless; name = "Factorio"; - stateDir = cfg.stateDir; + stateDir = "/var/lib/${cfg.stateDirName}"; mkSavePath = name: "${stateDir}/saves/${name}.zip"; configFile = pkgs.writeText "factorio.conf" '' use-system-read-write-data-directories=true @@ -80,11 +80,11 @@ in customizations. ''; }; - stateDir = mkOption { - type = types.path; - default = "/var/lib/factorio"; + stateDirName = mkOption { + type = types.string; + default = "factorio"; description = '' - The server's data directory. + Name of the directory under /var/lib holding the server's data. The configuration and map will be stored here. ''; @@ -176,20 +176,6 @@ in }; config = mkIf cfg.enable { - users = { - users.factorio = { - uid = config.ids.uids.factorio; - description = "Factorio server user"; - group = "factorio"; - home = stateDir; - createHome = true; - }; - - groups.factorio = { - gid = config.ids.gids.factorio; - }; - }; - systemd.services.factorio = { description = "Factorio headless server"; wantedBy = [ "multi-user.target" ]; @@ -205,12 +191,10 @@ in ]; serviceConfig = { - User = "factorio"; - Group = "factorio"; Restart = "always"; KillSignal = "SIGINT"; - WorkingDirectory = stateDir; - PrivateTmp = true; + DynamicUser = true; + StateDirectory = cfg.stateDirName; UMask = "0007"; ExecStart = toString [ "${factorio}/bin/factorio" @@ -220,6 +204,20 @@ in "--server-settings=${serverSettingsFile}" (optionalString (cfg.mods != []) "--mod-directory=${modDir}") ]; + + # Sandboxing + NoNewPrivileges = true; + PrivateTmp = true; + PrivateDevices = true; + ProtectSystem = "strict"; + ProtectHome = true; + ProtectControlGroups = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" "AF_NETLINK" ]; + RestrictRealtime = true; + RestrictNamespaces = true; + MemoryDenyWriteExecute = true; }; }; From 3bd3ef9c9dea744af71cd74841086c235b137053 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 17 May 2019 02:57:53 -0500 Subject: [PATCH 76/91] dnstracer: 1.9 -> 1.10, touchup --- pkgs/tools/networking/dnstracer/default.nix | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/networking/dnstracer/default.nix b/pkgs/tools/networking/dnstracer/default.nix index 5e2b27c6516..5261fdb1896 100644 --- a/pkgs/tools/networking/dnstracer/default.nix +++ b/pkgs/tools/networking/dnstracer/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchurl, libresolv }: +{ stdenv, fetchurl, libresolv, perl }: stdenv.mkDerivation rec { - version = "1.9"; - name = "dnstracer-${version}"; + version = "1.10"; + pname = "dnstracer"; src = fetchurl { - url = "https://www.mavetju.org/download/${name}.tar.gz"; - sha256 = "177y58smnq2xhx9lbmj1gria371iv3r1d132l2gjvflkjsphig1f"; + url = "https://www.mavetju.org/download/${pname}-${version}.tar.bz2"; + sha256 = "089bmrjnmsga2n0r4xgw4bwbf41xdqsnmabjxhw8lngg2pns1kb4"; }; outputs = [ "out" "man" ]; + nativeBuildInputs = [ perl /* for pod2man */ ]; + setOutputFlags = false; + installPhase = '' + install -Dm755 -t $out/bin dnstracer + install -Dm755 -t $man/share/man/man8 dnstracer.8 + ''; + buildInputs = [] ++ stdenv.lib.optionals stdenv.isDarwin [ libresolv ]; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lresolv"; From 43ed419aa10ab8ac111acdb4335b6dcb58fbe704 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 16 May 2019 08:41:43 -0500 Subject: [PATCH 77/91] libxmlb: 0.1.9 -> 0.1.10 https://github.com/hughsie/libxmlb/blob/0.1.10/NEWS --- pkgs/development/libraries/libxmlb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxmlb/default.nix b/pkgs/development/libraries/libxmlb/default.nix index c5ff7c11713..9edb9b475e8 100644 --- a/pkgs/development/libraries/libxmlb/default.nix +++ b/pkgs/development/libraries/libxmlb/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "libxmlb-${version}"; - version = "0.1.9"; + version = "0.1.10"; outputs = [ "out" "lib" "dev" "devdoc" ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libxmlb"; rev = version; - sha256 = "1rdpsssrwpx24snqb82hisjybnpz9fq91wbmxfi2s63xllzi14b6"; + sha256 = "1ismh3bdwd0l1fjlhwycam89faxjmpb0wxqlbv58m0z6cxykp6rd"; }; nativeBuildInputs = [ meson ninja python3 pkgconfig gobject-introspection gtk-doc shared-mime-info docbook_xsl docbook_xml_dtd_43 ]; From b911ce24e6e8a8d96f75e5a812649709a6a5e375 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 16 May 2019 08:39:22 -0500 Subject: [PATCH 78/91] fwts: 19.03.00 -> 19.05.00 --- pkgs/os-specific/linux/fwts/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/fwts/default.nix b/pkgs/os-specific/linux/fwts/default.nix index 566d1e9f56a..7f31ac1dac0 100644 --- a/pkgs/os-specific/linux/fwts/default.nix +++ b/pkgs/os-specific/linux/fwts/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "fwts-${version}"; - version = "19.03.00"; + version = "19.05.00"; src = fetchzip { url = "http://fwts.ubuntu.com/release/fwts-V${version}.tar.gz"; - sha256 = "1zri73qmpgc0dwmdcfbcywcvxld7dqz7rkwwqncfkvvfc9zchk5l"; + sha256 = "0hhwp25a7lknzmbbm067nxlzgyb3p7gh119jra2gdkm6d3p2gc47"; stripRoot = false; }; From f5b400b875f42a6fbf01564534e74063ec53d7a9 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Wed, 15 May 2019 19:55:58 -0500 Subject: [PATCH 79/91] spectre-meltdown-checker: 0.40 -> 0.41 https://github.com/speed47/spectre-meltdown-checker/releases/tag/v0.41 --- pkgs/tools/security/spectre-meltdown-checker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/spectre-meltdown-checker/default.nix b/pkgs/tools/security/spectre-meltdown-checker/default.nix index 256423892c4..a3e6468c4fe 100644 --- a/pkgs/tools/security/spectre-meltdown-checker/default.nix +++ b/pkgs/tools/security/spectre-meltdown-checker/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "spectre-meltdown-checker-${version}"; - version = "0.40"; + version = "0.41"; src = fetchFromGitHub { owner = "speed47"; repo = "spectre-meltdown-checker"; rev = "v${version}"; - sha256 = "0lhykc2andl0611bbs9b5dzp7c753crppvir2i7aw6bgwis23gjs"; + sha256 = "0byjp7ph7g9di9xlg1fvspgq995a3b2yajq7sc8qap46ywvqr899"; }; prePatch = '' From fc1129c8af5705039d197d133e15a090052ebb24 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 17 May 2019 12:29:44 +0200 Subject: [PATCH 80/91] electrum: implement crude updater Takes care of the tedium of checking signatures & whatnot. Does not update checksum for the tests yet ... Usage $ nix-shell maintainers/scripts/update.nix --argstr package electrum Warning: dumps cruft to $PWD --- pkgs/applications/misc/electrum/default.nix | 30 ++++++++++- pkgs/applications/misc/electrum/update.nix | 59 +++++++++++++++++++++ 2 files changed, 88 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/misc/electrum/update.nix diff --git a/pkgs/applications/misc/electrum/default.nix b/pkgs/applications/misc/electrum/default.nix index 6e69665da2b..2f8b98f3a44 100644 --- a/pkgs/applications/misc/electrum/default.nix +++ b/pkgs/applications/misc/electrum/default.nix @@ -1,4 +1,17 @@ -{ stdenv, fetchurl, fetchFromGitHub, python3, python3Packages, zbar, secp256k1 }: +{ stdenv, fetchurl, fetchFromGitHub, python3, python3Packages, zbar, secp256k1 + + +# for updater.nix +, writeScript +, common-updater-scripts +, bash +, coreutils +, curl +, gnugrep +, gnupg +, gnused +, nix +}: let version = "3.3.6"; @@ -85,6 +98,21 @@ python3Packages.buildPythonApplication rec { $out/bin/electrum help >/dev/null ''; + passthru.updateScript = import ./update.nix { + inherit (stdenv) lib; + inherit + writeScript + common-updater-scripts + bash + coreutils + curl + gnupg + gnugrep + gnused + nix + ; + }; + meta = with stdenv.lib; { description = "A lightweight Bitcoin wallet"; longDescription = '' diff --git a/pkgs/applications/misc/electrum/update.nix b/pkgs/applications/misc/electrum/update.nix new file mode 100644 index 00000000000..247fabe3891 --- /dev/null +++ b/pkgs/applications/misc/electrum/update.nix @@ -0,0 +1,59 @@ +{ lib +, writeScript +, common-updater-scripts +, bash +, coreutils +, curl +, gnugrep +, gnupg +, gnused +, nix +}: + +with lib; + +let + downloadPageUrl = "https://download.electrum.org"; + + signingKeys = ["6694 D8DE 7BE8 EE56 31BE D950 2BD5 824B 7F94 70E6"]; +in + +writeScript "update-electrum" '' +#! ${bash}/bin/bash + +set -eu -o pipefail + +export PATH=${makeBinPath [ + common-updater-scripts + coreutils + curl + gnugrep + gnupg + gnused + nix +]} + +version=$(curl -L --list-only -- '${downloadPageUrl}' \ + | grep -Po ' Date: Fri, 17 May 2019 13:38:48 +0200 Subject: [PATCH 81/91] vimPlugins: update (#61628) --- pkgs/misc/vim-plugins/generated.nix | 204 ++++++++++++++-------------- 1 file changed, 102 insertions(+), 102 deletions(-) diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 97121e2d6ce..7e9e49f82de 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -61,12 +61,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2019-05-09"; + version = "2019-05-16"; src = fetchFromGitHub { owner = "w0rp"; repo = "ale"; - rev = "f444abdfe66696505cb891889b18c4144d12d4ea"; - sha256 = "1id66swgzkgal2hxppm3ls0asffvmsbz81sl1qvci053jr9mr5d0"; + rev = "e5ea809094fd1d521ac88516f5b4b6870e656f3a"; + sha256 = "1wq12ycfkkcj70gprzwrp88v0i7jjzf1340mmkhs46wyd5ds82vz"; }; }; @@ -248,12 +248,12 @@ let command-t = buildVimPluginFrom2Nix { pname = "command-t"; - version = "2019-03-31"; + version = "2019-05-12"; src = fetchFromGitHub { owner = "wincent"; repo = "command-t"; - rev = "792d6079d32f1973c142c6fab89d2fdc94019ac8"; - sha256 = "0bi2bmx0k6fwi1jwajgafbb750ajlzz1jncvvg0cssv6h5syxvpk"; + rev = "57e112c12c99185e062a4330896cfaf422d1ea64"; + sha256 = "19ajaxga54kij9ii68cd38frq4y7lr7896wqa5xgs5qq83wh1b1z"; fetchSubmodules = true; }; }; @@ -403,12 +403,12 @@ let denite-nvim = buildVimPluginFrom2Nix { pname = "denite-nvim"; - version = "2019-05-01"; + version = "2019-05-12"; src = fetchFromGitHub { owner = "Shougo"; repo = "denite.nvim"; - rev = "f16b581357a575f37f4c51f6c809e8f2fd98b5bf"; - sha256 = "17fsngxpfy1m0r76c99xphwlcip85s4fyf9zj3vcdvb69hdgva2s"; + rev = "67475c70b4c48b99a0b327a3ff93ca8d25aa3632"; + sha256 = "0bgz2ljfpccawklzhhxvg5z77h4569p6ihf64rqs2q0b3laswmcx"; }; }; @@ -505,12 +505,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2019-04-15"; + version = "2019-05-15"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "9d4e88f6cce63ed1b52ca2401d809c55ab443b25"; - sha256 = "165vxlr2zjh0p7mcqaj60axpnffcrjfx6rvp786nxch4kmfhrz5p"; + rev = "310371d7e0cf123a725dd3f1d1fe02e4919d2d8a"; + sha256 = "15j6hq3ckjmgwr3a2wc43r7kv9bi8ns4x9sg9gn8lwp4c325khfw"; }; }; @@ -695,12 +695,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2019-04-29"; + version = "2019-05-14"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "ac4e7bfb36c88d27799c080218cea3bb833bdbd9"; - sha256 = "10m6v1jrry4fhrbkgb8kkdjasl0pz2qgr9khxl94nlg42fxb1r20"; + rev = "5c87ab86c0e7b0ec8a5edd39a4ce5500bb9e9333"; + sha256 = "0ippj4xpxx8yypfp4fa66hahz9ciy2inyq9275ajpgs7gxs6yx7n"; }; }; @@ -949,12 +949,12 @@ let lightline-vim = buildVimPluginFrom2Nix { pname = "lightline-vim"; - version = "2019-05-02"; + version = "2019-05-12"; src = fetchFromGitHub { owner = "itchyny"; repo = "lightline.vim"; - rev = "78b1cc9e715f509a7e9f157e0d7a0e02b7e5125e"; - sha256 = "0j2i09shwi8fcqfh7m48m4d6bi5pzfgn8mf6iw53v4ah2cdp2m93"; + rev = "bb0b4013611e11200d2ae5a65e8804bbd930a770"; + sha256 = "1sjsrih8cl8pksb3ikycarszhx8cvkgvj4nn63db59fnvdr7nqyl"; }; }; @@ -1037,12 +1037,12 @@ let ncm2-jedi = buildVimPluginFrom2Nix { pname = "ncm2-jedi"; - version = "2019-05-09"; + version = "2019-05-16"; src = fetchFromGitHub { owner = "ncm2"; repo = "ncm2-jedi"; - rev = "485520af57aee528a3448d1f26bb7761dd915b0e"; - sha256 = "1qq5mydg99y2865gx3i3kzk0vl6agx26l8if4nq47wlxnfcbgslv"; + rev = "10f7d917c5fbc99c0029cf4aa6befb91e4b90364"; + sha256 = "0hap4plkqs21908h1l1y54i77da9nh26ii636ymw8948d7gyb0wc"; }; }; @@ -1147,34 +1147,34 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2019-05-03"; + version = "2019-05-10"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "7fe72c5d84765e0af19718a57e24659f81471393"; - sha256 = "1kpb6ycsnf0sncpixf3016i2aq82wxvm9q9hjcg9bb7d9706s15d"; + rev = "787b1bff2a48a85b823abb9d50f8c8553273776a"; + sha256 = "1vdnbplv5spy18azcsn2plcfgnxxbbmr1dca2pfalzgs7bww0la1"; }; }; neoinclude-vim = buildVimPluginFrom2Nix { pname = "neoinclude-vim"; - version = "2019-04-17"; + version = "2019-05-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "neoinclude.vim"; - rev = "9baaab193f461193e737dd1342a43d43a380bca6"; - sha256 = "0gh2sdz32hp7wa5rvnrgwp8ga75sxpb4d3fxszkf8vd3gdxkxsq4"; + rev = "5125e73de0a8b4f2c399e4896e21be1b8f7b3d39"; + sha256 = "0qw63xyvrxvdzx01k5nnsv3p8zmnd77cwbkk24pikqrscxw3ypsz"; }; }; neomake = buildVimPluginFrom2Nix { pname = "neomake"; - version = "2019-05-09"; + version = "2019-05-13"; src = fetchFromGitHub { owner = "benekastah"; repo = "neomake"; - rev = "9575d0f72b82c453281eac697630d85cb097550f"; - sha256 = "12mbgglszgqrbpwwfxhmiq77h6ml4hd0z4ambrdzzl8hidp73d55"; + rev = "786e76cfc1124355f68ff7820439268a0cf9779d"; + sha256 = "02l5rh9n31c8k2vjnm8wx323x21ssg1pxnlhm2svhkpm1qax5q45"; }; }; @@ -1334,12 +1334,12 @@ let nvim-yarp = buildVimPluginFrom2Nix { pname = "nvim-yarp"; - version = "2018-12-23"; + version = "2019-05-15"; src = fetchFromGitHub { owner = "roxma"; repo = "nvim-yarp"; - rev = "1524cf7988d1e1ed7475ead3654987f64943a1f0"; - sha256 = "1iblb9hy4svbabhkid1qh7v085dkpq7dwg4aj38d8xvhj9b7mf6v"; + rev = "9eac5b198ad87210a498d4f93344b7450537ab00"; + sha256 = "17y1lcq92dkynjv5hbk3mjnc8g1yg8f19rw1imak7smwx4xjiqv8"; }; }; @@ -1708,12 +1708,12 @@ let syntastic = buildVimPluginFrom2Nix { pname = "syntastic"; - version = "2019-05-05"; + version = "2019-05-10"; src = fetchFromGitHub { owner = "scrooloose"; repo = "syntastic"; - rev = "29e15407b2b372bf1bad95bf0c5264dc7fdc1882"; - sha256 = "1vnxm49zjsk0w7n9arpl9pgy5lh7hrqa2392yl68rhk0vvh5fn46"; + rev = "1e8bae3d13e62628ec2262fcc2dc8aa36d6953fe"; + sha256 = "1bbvbvj8yr83kk6rpai24mhdb2q18yq0rnjj2kxfvzm3cwchbdwz"; }; }; @@ -1829,12 +1829,12 @@ let traces-vim = buildVimPluginFrom2Nix { pname = "traces-vim"; - version = "2019-04-27"; + version = "2019-05-14"; src = fetchFromGitHub { owner = "markonm"; repo = "traces.vim"; - rev = "971d0f6c293002bea7c90773c8fd67f4345ddf7c"; - sha256 = "0aj5x96g4ngir73h79brmijw5gikz6vgbblpbd3np64nb3h86a7c"; + rev = "d07bb40a3064ff5a2fb16c90946a6259ceb447a3"; + sha256 = "18b9215ifp591hkirs9h09g7r7baal2kcxccpz0siq9939y32b9p"; }; }; @@ -2170,12 +2170,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2019-05-08"; + version = "2019-05-14"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "9a1acf144fd63cae6f48a3b445958d737c0b167e"; - sha256 = "14n3fcmiv733si64226vm72f7gicffrkcq3xadpzzy0n22dnb1hz"; + rev = "7b20361baf5f8947ff55ac5d26dd4a75aacfc7d7"; + sha256 = "07bcd3f41jc52kn3spjrn8s3p58fsy6vn6kjrsl1j9qvmjc7x1q8"; }; }; @@ -2390,12 +2390,12 @@ let vim-css-color = buildVimPluginFrom2Nix { pname = "vim-css-color"; - version = "2019-05-03"; + version = "2019-05-14"; src = fetchFromGitHub { owner = "ap"; repo = "vim-css-color"; - rev = "10eae530889331457b738b28eafcfa3789481fcd"; - sha256 = "0y9m2jnzz58y5h7r8xgfimha8fz0if2pc760g4qbm922afm3a00a"; + rev = "8a84356d5319cad3da2835bd5fbc6318500f31ce"; + sha256 = "1yad8jrcna82ll893wf53ms2hqmcaa63g43yafxvlgmxw5yrh3im"; }; }; @@ -2434,12 +2434,12 @@ let vim-dirdiff = buildVimPluginFrom2Nix { pname = "vim-dirdiff"; - version = "2019-03-05"; + version = "2019-05-14"; src = fetchFromGitHub { owner = "will133"; repo = "vim-dirdiff"; - rev = "2257a283fc6e03d018ff503382c2ae97e32d5afa"; - sha256 = "0fqshk92dn62lz44csavpl9jg5bpd8jfik20ci9plns8nd9g6pg4"; + rev = "7049f5061ee48301fc00ea69f2473325d43bf5cb"; + sha256 = "1x65adb2xfscbyx8w3wl1av9c0jqlch0kpch49jxyvcbmxdlgf65"; }; }; @@ -2456,12 +2456,12 @@ let vim-dispatch = buildVimPluginFrom2Nix { pname = "vim-dispatch"; - version = "2019-03-26"; + version = "2019-05-15"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dispatch"; - rev = "178acd05aaf26b14afd0a29f8e1c318ca96637f5"; - sha256 = "1qxblrwm8zssg8zavfxq3a43yz69fk4ylqgxbi6mq3hvz3bnkb6k"; + rev = "d8bf968958f4bdc838321cceace52299f28ad750"; + sha256 = "0y1wwscj5vn9ssmysr12zwx1k1a4j6l0gchhlrvgzj4ar2wpvig0"; }; }; @@ -2533,12 +2533,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2019-05-02"; + version = "2019-05-14"; src = fetchFromGitHub { owner = "elixir-lang"; repo = "vim-elixir"; - rev = "98c03047d15dfa62cedf56e27bffb03772d41753"; - sha256 = "0pbad3hlsy6glhmbz6nkb6lfx9y3yb6rw23vc48acxw936zm282n"; + rev = "38e8bbfd0019033ae53d623e3fd1d9cf6ec2d335"; + sha256 = "1mbgks1460vm8sl2hkag6hrsvbf9gfvdlswqr5hh8hy3laylh6qf"; }; }; @@ -2577,12 +2577,12 @@ let vim-fireplace = buildVimPluginFrom2Nix { pname = "vim-fireplace"; - version = "2019-05-09"; + version = "2019-05-17"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fireplace"; - rev = "f327d6e523975e1544b2effd426b99df25b01d18"; - sha256 = "0abh80w4xyg1wpc1fra9m68f882x430ky0vjfbp9xsnz3i5xd44c"; + rev = "6f12616ee3d2160054270a9fb444006f580667d6"; + sha256 = "0ms1xpp3kw98qq4dl7mp4c353acqncav6dwfz690lacpy0bgb9d3"; }; }; @@ -2676,12 +2676,12 @@ let vim-gitgutter = buildVimPluginFrom2Nix { pname = "vim-gitgutter"; - version = "2019-03-11"; + version = "2019-05-15"; src = fetchFromGitHub { owner = "airblade"; repo = "vim-gitgutter"; - rev = "7eeea63e62b1cc088a75c7a7c244fc774d82e5bb"; - sha256 = "0m7mkhm5cq4aknaxxn476lykkgyapb350cn20ax5c9nrmpfzf4rz"; + rev = "e5936a22cfd2e25893e2ac34af4b0afdec1e36f5"; + sha256 = "04nhkg1axpcvzjba6rvjn16v3gfdch12y74mfcrbmj0v2qqs8rgk"; }; }; @@ -2698,12 +2698,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2019-05-07"; + version = "2019-05-16"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "c4b419db6c57125e91d6f292daa664b73b155b7b"; - sha256 = "1whcmgr0isa7np6xmc66jrc68an58677bnpzyrd1y817np5f2336"; + rev = "d2f1bbe458d8c7c3154ed113c3768bd84451f872"; + sha256 = "0dcj36vcrbai049bjv8gw6kfd594lny17vvi7c817av6yclmxjqf"; }; }; @@ -3062,12 +3062,12 @@ let vim-localvimrc = buildVimPluginFrom2Nix { pname = "vim-localvimrc"; - version = "2019-03-24"; + version = "2019-05-10"; src = fetchFromGitHub { owner = "embear"; repo = "vim-localvimrc"; - rev = "08f1389285902473a8b2de045c2d916fcc5affbc"; - sha256 = "1sfcq50f5gkpwa2c5szi8aa7h2x50ki87knba8rsq58h58pgbnq1"; + rev = "0b36a367f4d46b7f060836fcbfec029cce870ea9"; + sha256 = "119ah0mx7ais335spdy5apk40wbfvhr1mnvjfs429fvym3xdqfk3"; }; }; @@ -3084,12 +3084,12 @@ let vim-lsc = buildVimPluginFrom2Nix { pname = "vim-lsc"; - version = "2019-04-24"; + version = "2019-05-15"; src = fetchFromGitHub { owner = "natebosch"; repo = "vim-lsc"; - rev = "9616bcb14c0128a6722806dafe2b6f325fa0c26f"; - sha256 = "10vsmcifjinqd26rw4fk94l4pymqzsqm66d8gwdqpp3jkx5birwg"; + rev = "1fb7e1a50a11f5c45988c6515141b83e131d674f"; + sha256 = "065yfp499640kkdn3n1n246lq3dhvgpc9ibpzn77qvqpmjavanzh"; }; }; @@ -3172,12 +3172,12 @@ let vim-nix = buildVimPluginFrom2Nix { pname = "vim-nix"; - version = "2018-08-27"; + version = "2019-05-13"; src = fetchFromGitHub { owner = "LnL7"; repo = "vim-nix"; - rev = "be0c6bb409732b79cc86c177ca378b0b334e1efe"; - sha256 = "1ivkwlm6lz43xk1m7aii0bgn2p3225dixck0qyhxw4zxhp2xiz06"; + rev = "1403934ebe9f2e1951ebafa38dd93ca9326c890e"; + sha256 = "0910slyddcgl03ijayx2p2vhvsz4442q7ffsz7xsrl6fr0k0xkj9"; }; }; @@ -3260,12 +3260,12 @@ let vim-pandoc = buildVimPluginFrom2Nix { pname = "vim-pandoc"; - version = "2019-05-05"; + version = "2019-05-16"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc"; - rev = "2e342ac8b841934c66a1c9afade42e709a068095"; - sha256 = "1hzjp9s490k8rcvv74zhjn8k17xn9igxbzxxkxy3n3zxhfd3jw8j"; + rev = "2b91b338c371c4d7a7ab75901246d992b3542d7e"; + sha256 = "1yn1kip09s37hs8ngld67zxa20gvvman6jd7q4vdrxlmy2miy9q4"; }; }; @@ -3282,12 +3282,12 @@ let vim-pandoc-syntax = buildVimPluginFrom2Nix { pname = "vim-pandoc-syntax"; - version = "2019-05-05"; + version = "2019-05-16"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-syntax"; - rev = "e557ade9aceb4925cd919c412fe9660b8c4f4cba"; - sha256 = "1msryzjzlv4mil05h17jjy09839dzqp9r11g1f369zxi5hini8g2"; + rev = "14c778e5bf069a1f13a4645aa8a34e1b46c980a8"; + sha256 = "1a66f0shycqkl1329lgbvrbbzwdv8pgi9d8zaybw9jddn64rx9r7"; }; }; @@ -3601,12 +3601,12 @@ let vim-sneak = buildVimPluginFrom2Nix { pname = "vim-sneak"; - version = "2018-08-29"; + version = "2019-05-10"; src = fetchFromGitHub { owner = "justinmk"; repo = "vim-sneak"; - rev = "91192d8969af1d86c98beff4001612976ea25d7a"; - sha256 = "0nmbrp0ma9s3yfzb8z70l0pcxv8p115zv6fz4injxn1c436x9337"; + rev = "045b3c0a70815de8e928a094c36d3b6bfde0aade"; + sha256 = "1qwhfbsjwz58wph91l4disk1ab1c63lirf9j472wlwb22nf4yzlc"; }; }; @@ -3623,12 +3623,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2019-05-01"; + version = "2019-05-10"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "9827f1713407ace7d7608b5dec4db256979d5858"; - sha256 = "1l3pig6v0k629av50vcdhc0qwh5v1lsg7wlmm77q11sk0jacw2sv"; + rev = "7ade68cb23b33e9483667a09dc6683bb5b4de682"; + sha256 = "0ix30glpl55xz9knpi9p7gmyjpjg2nr4yg94qa8wj9y8hs54zm5l"; }; }; @@ -3667,12 +3667,12 @@ let vim-startify = buildVimPluginFrom2Nix { pname = "vim-startify"; - version = "2019-04-11"; + version = "2019-05-10"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-startify"; - rev = "0a212847827933436d0b139f37b9825e28e3c0a1"; - sha256 = "08si59jvwlgj1i8z1i0ly439ar75ifrnlraa6nw20n3ii6nwzsvh"; + rev = "2e5d068572f1e6899d7cb7b509020b0a6f0c3f68"; + sha256 = "1hkf8lc63bdjwdcp0cabwx3p1jydiy4h5gzm042110szxx5xir3q"; }; }; @@ -3755,23 +3755,23 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2019-03-31"; + version = "2019-05-14"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "a44bf0b1a142bb39e84e5d525f7d98b5d3a66057"; - sha256 = "12wyjfmwz3lsd45vv4ava361ph6gravggi9vvvr9qgf5zc1shd3b"; + rev = "d98d657d29691118b2ac830ca876f297d8567800"; + sha256 = "1hhr3d8z9mfhylwx6vj49hs3b54hrhkipy67si5mds38g92rqfhg"; }; }; vim-test = buildVimPluginFrom2Nix { pname = "vim-test"; - version = "2019-05-09"; + version = "2019-05-15"; src = fetchFromGitHub { owner = "janko-m"; repo = "vim-test"; - rev = "8e137f223df427e620496f02f0fda6363a76435f"; - sha256 = "0qj4f597mr20lglvyapviqzn390yiwbaksb2bz42v4s0zh33nahg"; + rev = "f665955382b4baf4f2e33344250a9914c5281681"; + sha256 = "0mx4gz072gx7kvrhmfn7kdh3ccx9q1hfibkwz6870a3hxsciin6a"; }; }; @@ -3854,12 +3854,12 @@ let vim-vinegar = buildVimPluginFrom2Nix { pname = "vim-vinegar"; - version = "2019-04-20"; + version = "2019-05-13"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-vinegar"; - rev = "e48cc1d71b838e6223a0ece54b9457ed76f92676"; - sha256 = "16cx1j76b9kdrcjs8hhl15kfhpgan69qs9djda0c1pvzphj4bbgp"; + rev = "09ac84c4d152a944caa341e913220087211c72ef"; + sha256 = "18ki85s1l4f0q40k26jvcdcbq6a73x870dnxkw20ji3pfwdaa5v3"; }; }; @@ -4019,12 +4019,12 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2019-05-03"; + version = "2019-05-14"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "ee10671c2b25287196194426607c2684827126f7"; - sha256 = "04mxx4ww1qmr6918dryfh956lwmyz4nlq4dissms440p4kqf5giv"; + rev = "26de8b92c9e9f2428f27d241cab1e7e15af56d3a"; + sha256 = "0zvj6f02x3gf3qpv877n01yxyi7hqk5gczw0z3m7x3yz81xpv1m1"; }; }; @@ -4163,12 +4163,12 @@ let youcompleteme = buildVimPluginFrom2Nix { pname = "youcompleteme"; - version = "2019-05-08"; + version = "2019-05-11"; src = fetchFromGitHub { owner = "valloric"; repo = "youcompleteme"; - rev = "f7e0a6cb7580471d1fc1c68ab85467ff207b5dee"; - sha256 = "0cbv9ahnl70zh3abrr43ijyaqxnprp1kp6bgiwkpi7qzvcbvwzca"; + rev = "dbcc3b0e14876fd4f39d38dfdef22351f74da3a5"; + sha256 = "17rmmdnmj4pa1admls3d3w43vl9r040x3yhf4nnr1pf2jarv028v"; fetchSubmodules = true; }; }; From 03398be1b9fa2febdbb301fff5576c48740f56bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Thu, 16 May 2019 10:40:32 +0200 Subject: [PATCH 82/91] saleae-logic: 1.2.28 -> 1.2.18 Yes, this is a downgrade. The .28 version is beta software, whereas .18 is the latest stable version. --- pkgs/development/tools/misc/saleae-logic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/saleae-logic/default.nix b/pkgs/development/tools/misc/saleae-logic/default.nix index 779f6c76fef..19e4423f7d8 100644 --- a/pkgs/development/tools/misc/saleae-logic/default.nix +++ b/pkgs/development/tools/misc/saleae-logic/default.nix @@ -26,13 +26,13 @@ assert stdenv.hostPlatform.system == "x86_64-linux"; stdenv.mkDerivation rec { pname = "saleae-logic"; - version = "1.2.28"; + version = "1.2.18"; name = "${pname}-${version}"; src = fetchurl { name = "saleae-logic-${version}-64bit.zip"; url = "http://downloads.saleae.com/logic/${version}/Logic%20${version}%20(64-bit).zip"; - sha256 = "0apq8hmn39k0ads4xy8iyy9rp8bvia60mh7a944rk1gjpqv227g5"; + sha256 = "0lhair2vsg8sjvzicvfcjfmvy30q7i01xj4z02iqh7pgzpb025h8"; }; desktopItem = makeDesktopItem { From a9110315fef4145c4c852a95cadb384aacc19c6a Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Fri, 17 May 2019 09:05:42 -0500 Subject: [PATCH 83/91] bettercap: 2.11 -> 2.24 (#61215) * bettercap: 2.11 -> 2.24 * bettercap: use current libusb1 and not the old v0.1 compat-API --- pkgs/tools/security/bettercap/default.nix | 14 +-- pkgs/tools/security/bettercap/deps.nix | 132 +++++++++++++++++----- pkgs/top-level/all-packages.nix | 6 +- 3 files changed, 110 insertions(+), 42 deletions(-) diff --git a/pkgs/tools/security/bettercap/default.nix b/pkgs/tools/security/bettercap/default.nix index f7e09d54de1..c72bc6d8b9e 100644 --- a/pkgs/tools/security/bettercap/default.nix +++ b/pkgs/tools/security/bettercap/default.nix @@ -1,20 +1,20 @@ -{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, libpcap, libnfnetlink, libnetfilter_queue }: +{ stdenv, buildGoPackage, fetchFromGitHub, pkgconfig, libpcap, libnfnetlink, libnetfilter_queue, libusb1 }: buildGoPackage rec { - name = "bettercap-${version}"; - version = "2.11"; + pname = "bettercap"; + version = "2.24"; goPackagePath = "github.com/bettercap/bettercap"; src = fetchFromGitHub { - owner = "bettercap"; - repo = "bettercap"; + owner = pname; + repo = pname; rev = "v${version}"; - sha256 = "08hd7hk0jllfhdiky1f5pfsvl1x0bkgv1p4z9qvsksdg9a7qjznw"; + sha256 = "1f8bzxbcyf0bpyqj6hz4l8dp5xknnb537xy9y5skcznp03i44h55"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libpcap libnfnetlink libnetfilter_queue ]; + buildInputs = [ libpcap libnfnetlink libnetfilter_queue libusb1 ]; goDeps = ./deps.nix; diff --git a/pkgs/tools/security/bettercap/deps.nix b/pkgs/tools/security/bettercap/deps.nix index cbfe7c54dad..ef09a821317 100644 --- a/pkgs/tools/security/bettercap/deps.nix +++ b/pkgs/tools/security/bettercap/deps.nix @@ -9,13 +9,40 @@ sha256 = "167iwpwdwfbyghqfrzdfvfpvsmj92x7qqy6sx6yngdw21wd0m44f"; }; } + { + goPackagePath = "github.com/antchfx/jsonquery"; + fetch = { + type = "git"; + url = "https://github.com/antchfx/jsonquery"; + rev = "a2896be8c82bb2229d1cf26204863180e34b2b31"; + sha256 = "0mh6v21i3v3sxqjln7vph6wx3sm79p99010in9am1wh7k30rrjl5"; + }; + } + { + goPackagePath = "github.com/antchfx/xpath"; + fetch = { + type = "git"; + url = "https://github.com/antchfx/xpath"; + rev = "ce1d48779e67a1ddfb380995fe532b2e0015919c"; + sha256 = "0brd75mhd5ix7rz1ijhbggyp53v6g8kz9bc2n7g6zwavzxarfj5p"; + }; + } { goPackagePath = "github.com/bettercap/gatt"; fetch = { type = "git"; url = "https://github.com/bettercap/gatt"; - rev = "66e7446993acb3de936b3f487e5933522ed16923"; - sha256 = "0hvm59zpbghgw8fq9yr4dd2x3209ii9856qklflkz2ywf7vryjqq"; + rev = "fac16c0ad797bbccae1fe4acf49761b98f7516e7"; + sha256 = "08pyg4caw7lzb230l3k4rwgvn68zz6kmrlsdapaf3wa216pphyd9"; + }; + } + { + goPackagePath = "github.com/bettercap/nrf24"; + fetch = { + type = "git"; + url = "https://github.com/bettercap/nrf24"; + rev = "aa37e6d0e0eb125cee9ec71ed694db2ad58b509a"; + sha256 = "1y6ffcj94hk7slajqw3lqpdxzx6iqpj2i2zpsvggg6kfaa1iklnj"; }; } { @@ -27,6 +54,15 @@ sha256 = "1qd2qhjps26x4pin2614w732giy89p22b2qww4wg15zz5g2365nk"; }; } + { + goPackagePath = "github.com/bettercap/recording"; + fetch = { + type = "git"; + url = "https://github.com/bettercap/recording"; + rev = "3ce1dcf032e391eb321311b34cdf31c6fc9523f5"; + sha256 = "1arh12iz15anyrqr4q496lpd0gx5nf2cwyr5rv17rawqqz8ydg23"; + }; + } { goPackagePath = "github.com/chifflier/nfqueue-go"; fetch = { @@ -50,8 +86,8 @@ fetch = { type = "git"; url = "https://github.com/elazarl/goproxy"; - rev = "f58a169a71a51037728990b2d3597a14f56b525b"; - sha256 = "103crrh6zwdwcj7j6z63rbm467nff3r1rvpwdk0qj8x275zi45g6"; + rev = "9d40249d3c2f14d1a9d75e070a738362adeb5a83"; + sha256 = "0hpzna9dvs2ff0bj8baz3sc5gg49vqmb0cbi6p061lmwl09cd00i"; }; } { @@ -59,8 +95,8 @@ fetch = { type = "git"; url = "https://github.com/evilsocket/islazy"; - rev = "3d8400c74f9dbc626d913e0575cda05d914bea57"; - sha256 = "0yfqvcxaympfgsda0jhqnaqhbhic2irdjn0h2bppz4misjv6sxn9"; + rev = "c5c7a41bb1c20e6df409825ed24af8de5fb7fb70"; + sha256 = "1ayc4di6584yajybh724mcmng069q38j1dpljgi8fhsyhb4sila3"; }; } { @@ -95,17 +131,17 @@ fetch = { type = "git"; url = "https://github.com/google/gopacket"; - rev = "d67ddb98d5a1b7c79a8977ec2d552e1db45eda86"; - sha256 = "0pk4hddx6fnbbjjgi86vx12xs5d8591dlkx1q5cswc0jghymbplh"; + rev = "v1.1.16"; + sha256 = "1vnjgjz52l1bzrhx70qpvmwandf8v13zhiaj3rdljsphdp5cgadi"; }; } { - goPackagePath = "github.com/gorilla/context"; + goPackagePath = "github.com/google/gousb"; fetch = { type = "git"; - url = "https://github.com/gorilla/context"; - rev = "08b5f424b9271eedf6f9f0ce86cb9396ed337a42"; - sha256 = "03p4hn87vcmfih0p9w663qbx9lpsf7i7j3lc7yl7n84la3yz63m4"; + url = "https://github.com/google/gousb"; + rev = "64d82086770b8b671e1e7f162372dd37f1f5efba"; + sha256 = "1kjgg8cdp8wz9rck4nh48pcia741p7a8w2nikhzxsscn0ld33109"; }; } { @@ -113,8 +149,8 @@ fetch = { type = "git"; url = "https://github.com/gorilla/mux"; - rev = "e3702bed27f0d39777b0b37b664b6280e8ef8fbf"; - sha256 = "0pvzm23hklxysspnz52mih6h1q74vfrdhjfm1l3sa9r8hhqmmld2"; + rev = "c5c6c98bc25355028a63748a498942a6398ccd22"; + sha256 = "0im4da3hqxb6zr8g3m640qz234f5gs0a8hqhcz35mkvfqlv48f62"; }; } { @@ -126,6 +162,15 @@ sha256 = "00i4vb31nsfkzzk7swvx3i75r2d960js3dri1875vypk3v2s0pzk"; }; } + { + goPackagePath = "github.com/hashicorp/mdns"; + fetch = { + type = "git"; + url = "https://github.com/hashicorp/mdns"; + rev = "06dd1a31b32c42d4d6c2cf8dbce70597d1118f54"; + sha256 = "185zpyj1jf1jm7hihg73gqnspr0a359aqwv11v4a6mwd5bkdh19j"; + }; + } { goPackagePath = "github.com/inconshreveable/go-vhost"; fetch = { @@ -140,8 +185,17 @@ fetch = { type = "git"; url = "https://github.com/jpillora/go-tld"; - rev = "4bfc8d9a90b591e101a56265afc2239359fb0810"; - sha256 = "04pv1rwpfq3ip3vn0yfixxczcnv56w1l0z8bp4fjscw1bfqbb4pn"; + rev = "f16ca3b7b383d3f0373109cac19147de3e8ae2d1"; + sha256 = "19v8bj14w0lcvysaw84klf5dg6ka351ixz9r6cd9mksdd80nvzcq"; + }; + } + { + goPackagePath = "github.com/kr/binarydist"; + fetch = { + type = "git"; + url = "https://github.com/kr/binarydist"; + rev = "88f551ae580780cc79d12ab4c218ba1ca346b83a"; + sha256 = "0hz1yqlxmkdib8xsdkkvn4ian4i69jmfapadim9fhj632d6jpi7w"; }; } { @@ -158,8 +212,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-colorable"; - rev = "167de6bfdfba052fa6b2d3664c8f5272e23c9072"; - sha256 = "1nwjmsppsjicr7anq8na6md7b1z84l9ppnlr045hhxjvbkqwalvx"; + rev = "3a70a971f94a22f2fa562ffcc7a0eb45f5daf045"; + sha256 = "0l640974j804c1yyjfgyxqlsivz0yrzmbql4mhcw2azryigkp08p"; }; } { @@ -167,8 +221,8 @@ fetch = { type = "git"; url = "https://github.com/mattn/go-isatty"; - rev = "6ca4dbf54d38eea1a992b3c722a76a5d1c4cb25c"; - sha256 = "0zs92j2cqaw9j8qx1sdxpv3ap0rgbs0vrvi72m40mg8aa36gd39w"; + rev = "c2a7a6ca930a4cd0bc33a3f298eb71960732a3a7"; + sha256 = "1i77aq4gf9as03m8fpfh8fq49n4z9j7548blrcsidm1xhslzk5xd"; }; } { @@ -176,8 +230,8 @@ fetch = { type = "git"; url = "https://github.com/mdlayher/dhcp6"; - rev = "e26af0688e455a82b14ebdbecf43f87ead3c4624"; - sha256 = "0fvw8zz2yhla03jfb79bby9vg4rbmaj39v00ypb8yl4fb696zfip"; + rev = "2a67805d7d0b0bad6c1103058981afdea583b459"; + sha256 = "0xn7canpik3lrz73dcz4jzapq1bfxpnashvjvnvshcpa2n1lh8yw"; }; } { @@ -185,8 +239,8 @@ fetch = { type = "git"; url = "https://github.com/mdlayher/raw"; - rev = "67a536258490ec29bca6d465b51dea32c0db3623"; - sha256 = "1fba4c6kc7llwr4n5rsspsc3yb0c81xsqzxv86wnj1b0d8l2s7nr"; + rev = "480b93709cce56651807d3fdeb260a5a7c4e2d5f"; + sha256 = "0a0zlznk67nhpmgp21hxsbhyl5lvlkmwy5xvm3d3q0yaq0rqnh2x"; }; } { @@ -207,13 +261,22 @@ sha256 = "1f8sqibkzz9wfplvvblz9s0xvvmhkd2af8ghcsmjw8818gcrzsqx"; }; } + { + goPackagePath = "github.com/miekg/dns"; + fetch = { + type = "git"; + url = "https://github.com/miekg/dns"; + rev = "8aa92d4e02c501ba21e26fb92cf2fb9f23f56917"; + sha256 = "1niymj11xv82ghif3p7i60bgj0lqskwm7fmrzfjchd8wxwbk4bbi"; + }; + } { goPackagePath = "github.com/pkg/errors"; fetch = { type = "git"; url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; + rev = "ba968bfe8b2f7e042a574c888954fccecfa385b4"; + sha256 = "0g5qcb4d4fd96midz0zdk8b9kz8xkzwfa8kr1cliqbg8sxsy5vd1"; }; } { @@ -234,13 +297,22 @@ sha256 = "1yj4jiv2f3x3iawxdflrlmdan0k9xsbnccgc9yz658rmif1ag3pb"; }; } + { + goPackagePath = "golang.org/x/crypto"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/crypto"; + rev = "a29dc8fdc73485234dbef99ebedb95d2eced08de"; + sha256 = "07f0jj4haqs0ywc1akk1qjwn5msl2j0pry1rxjkkbfcq4r6ihc1p"; + }; + } { goPackagePath = "golang.org/x/net"; fetch = { type = "git"; url = "https://go.googlesource.com/net"; - rev = "49bb7cea24b1df9410e1712aa6433dae904ff66a"; - sha256 = "111q4qm3hcjvzvyv9y5rz8ydnyg48rckcygxqy6gv63q618wz6gn"; + rev = "9ce7a6920f093fc0b908c4a5f66ae049110f417e"; + sha256 = "1kbs85jsqbv4v89ii2zam4b8dhmllhsrf46njmi09x0w6s0b9cbk"; }; } { @@ -248,8 +320,8 @@ fetch = { type = "git"; url = "https://go.googlesource.com/sys"; - rev = "fa43e7bc11baaae89f3f902b2b4d832b68234844"; - sha256 = "1z96xhgw930jpd53g1sy9x6wiijgz751czbvr2zzgc55y0md1mfw"; + rev = "d89cdac9e8725f2aefce25fcbfef41134c9ad412"; + sha256 = "0iazr13ir6i267nb2w81lc3pr740wdjs86nsliwpf90kkgzn853f"; }; } { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c9afc88c12c..9f635450982 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1932,11 +1932,7 @@ in bepasty = callPackage ../tools/misc/bepasty { }; - bettercap = callPackage ../tools/security/bettercap { - # XXX: this is failing with Go 1.12. Error is related to cgo, an - # update to this package might fix it. - buildGoPackage = buildGo111Package; - }; + bettercap = callPackage ../tools/security/bettercap { }; bfg-repo-cleaner = gitAndTools.bfg-repo-cleaner; From 9d200707bad9e8494c36e9b1c6d184fc80fe3ec9 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 17 May 2019 10:04:15 -0400 Subject: [PATCH 84/91] oh-my-zsh: 2019-05-11 -> 2019-05-17 --- 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 9a2e71e5a40..01fdfb7d1f4 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-11"; + version = "2019-05-17"; name = "oh-my-zsh-${version}"; - rev = "486fa1010df847bfd8823b4492623afc7c935709"; + rev = "5aa62461d91546ce1fd5dcc6531569d0e6e6f17f"; src = fetchgit { inherit rev; url = "https://github.com/robbyrussell/oh-my-zsh"; - sha256 = "097n64xzdqgqdbgcqnzsk0s9r9yn8ncqbixbsxgpcj29x9hi1dkn"; + sha256 = "0mg308h9k9lcv9flqwnynq2iiicl7b89arn7m97wwjijww1isdg6"; }; pathsToLink = [ "/share/oh-my-zsh" ]; From 96c66ee6094d5b076b05003fd31d8dfa250980a3 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Fri, 17 May 2019 17:59:22 +0200 Subject: [PATCH 85/91] sublime3: 3200 -> 3207 --- pkgs/applications/editors/sublime/3/packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/sublime/3/packages.nix b/pkgs/applications/editors/sublime/3/packages.nix index ebceb4a8b35..b8fef39d3ea 100644 --- a/pkgs/applications/editors/sublime/3/packages.nix +++ b/pkgs/applications/editors/sublime/3/packages.nix @@ -12,8 +12,8 @@ in } {}; sublime3 = common { - buildVersion = "3200"; - x32sha256 = "01krmbji8z62x4kl1hf3c1nfj4c4n4xmg1df62ljiwhkcfm74izr"; - x64sha256 = "1gagc50fqb0d2bszi8m5spzb64shkaylvrwl6fxah55xcmy2kmdr"; + buildVersion = "3207"; + x32sha256 = "14hfb8x8zb49zjq0pd8s73xk333gmf38h5b7g979czcmbhdxiyqy"; + x64sha256 = "1i1q9592sc8idvlpygksdkclh7h506hsz5l0i02g1814w0flzdmc"; } {}; } From 3cebc9a390305e33d719a967d1deeabc87e47db3 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Fri, 17 May 2019 20:31:45 +0200 Subject: [PATCH 86/91] gns3Packages.{server,gui}Stable: 2.1.16 -> 2.1.17 --- pkgs/applications/networking/gns3/default.nix | 6 +++--- pkgs/applications/networking/gns3/server.nix | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/gns3/default.nix b/pkgs/applications/networking/gns3/default.nix index cda455d9e56..2f588cd304d 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.16"; + stableVersion = "2.1.17"; previewVersion = "2.2.0a5"; 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 = "03d7yjdnks568njkrgyh7g6c3vf6v7wkifshz2bcvry79pp2h4nl"; - serverSrcHash = "0p331aaqxw16kk5l2074qn9a7ih6fkivm05n8da3fwydzp9hjmcp"; + guiSrcHash = "1caqb644nq0hhszlg3ac87730m1xmw48b17jisqiq7zmk9scsh40"; + serverSrcHash = "0zyfh5sw8r2n41v0nazgdbr50cz6g5an2myvlgj5xx41smr9gflb"; in { guiStable = mkGui { stable = true; diff --git a/pkgs/applications/networking/gns3/server.nix b/pkgs/applications/networking/gns3/server.nix index 556d341231f..dcad3027e96 100644 --- a/pkgs/applications/networking/gns3/server.nix +++ b/pkgs/applications/networking/gns3/server.nix @@ -47,6 +47,8 @@ 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 ''; propagatedBuildInputs = with python.pkgs; [ From 989787b5e6b76c7c47de8dfcdbea237d7696b9b9 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Wed, 15 May 2019 23:33:04 +0200 Subject: [PATCH 87/91] iputils: 20190324 -> 20190515 This is mainly a bug fix release [0]. File changes: -etc/systemd/system/rdisc@.service +etc/systemd/system/rdisc.service nix path-info -S: 20190324: 41055576 20190515: 41055584 [0]: https://github.com/iputils/iputils/releases/tag/s20190515 --- pkgs/os-specific/linux/iputils/default.nix | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/pkgs/os-specific/linux/iputils/default.nix b/pkgs/os-specific/linux/iputils/default.nix index 223d5c4fe0f..57eb09e40cf 100644 --- a/pkgs/os-specific/linux/iputils/default.nix +++ b/pkgs/os-specific/linux/iputils/default.nix @@ -6,7 +6,7 @@ with stdenv.lib; let - time = "20190324"; + time = "20190515"; # ninfod probably could build on cross, but the Makefile doesn't pass --host # etc to the sub configure... withNinfod = stdenv.hostPlatform == stdenv.buildPlatform; @@ -21,19 +21,19 @@ in stdenv.mkDerivation { owner = "iputils"; repo = "iputils"; rev = "s${time}"; - sha256 = "0b755gv3370c0rrphx14mrsqjb396zqnsm9lsws842a4k4zrqmvi"; + sha256 = "1k2wzgk0d47d1g9k8c1a5l24ml8h8xxz1vrs0vfbyxr7qghdhn4i"; }; # ninfod cannot be build with nettle yet: patches = [ ./build-ninfod-with-openssl.patch - (fetchpatch { # tracepath: fix musl build, again - url = "https://github.com/iputils/iputils/commit/c9aca1b53324bcd1b5a2de5c645813f80eccd016.patch"; - sha256 = "0faqgkqbi57cyx1zgzzy6xgd24xr0iawix7mjs47j92ra9gw90cz"; + (fetchpatch { # build-sys/doc: Fix the dependency on xsltproc + url = "https://github.com/iputils/iputils/commit/3b013f271931c3fe771e5a2c591f35d617de90f3.patch"; + sha256 = "0ilhlgiqdflry7km3ik8i4h1yymm5f5zmwyl5r029q7x1p8kinfw"; }) - (fetchpatch { # doc: Use namespace correctly - url = "https://github.com/iputils/iputils/commit/c503834519d21973323980850431101f90e663ef.patch"; - sha256 = "1yp6b6403ddccbhfzsb36cscxd36d4xb8syc1g02a18xkswiwf09"; + (fetchpatch { # build-sys: Make setcap really optional + url = "https://github.com/iputils/iputils/commit/473be6467f995865244e7e68b2fa587a4ee79551.patch"; + sha256 = "0781147qaf0jwa177jbmh474r8hqs0jwgi5vgx9csb43jzdm8hqf"; }) ]; @@ -41,13 +41,14 @@ in stdenv.mkDerivation { [ "-DUSE_CRYPTO=nettle" "-DBUILD_RARPD=true" "-DBUILD_TRACEROUTE6=true" + "-DNO_SETCAP_OR_SUID=true" "-Dsystemdunitdir=etc/systemd/system" ] ++ optional (!withNinfod) "-DBUILD_NINFOD=false" # Disable idn usage w/musl (https://github.com/iputils/iputils/pull/111): ++ optional stdenv.hostPlatform.isMusl "-DUSE_IDN=false"; - nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt.bin docbook_xsl_ns libcap ]; + nativeBuildInputs = [ meson ninja pkgconfig gettext libxslt.bin docbook_xsl_ns ]; buildInputs = [ libcap nettle systemd ] ++ optional (!stdenv.hostPlatform.isMusl) libidn2 ++ optional withNinfod openssl; # TODO: Build with nettle From 1a7c1989e9506cc75645e471ff06bafee4e71690 Mon Sep 17 00:00:00 2001 From: worldofpeace Date: Thu, 16 May 2019 23:04:17 -0400 Subject: [PATCH 88/91] gnome3.mutter328: 3.28.3 -> 3.28.4 Changes since we pulled in everything from gnome-3.28 branch: https://gitlab.gnome.org/GNOME/mutter/compare/4af8d9d4752a94612a98d619e65828f0070a7b0e...3.28.4 https://gitlab.gnome.org/GNOME/mutter/blob/3.28.4/NEWS --- pkgs/desktops/gnome-3/core/mutter/3.28.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/core/mutter/3.28.nix b/pkgs/desktops/gnome-3/core/mutter/3.28.nix index 9be383220e6..8aa7cff2d03 100644 --- a/pkgs/desktops/gnome-3/core/mutter/3.28.nix +++ b/pkgs/desktops/gnome-3/core/mutter/3.28.nix @@ -6,14 +6,14 @@ stdenv.mkDerivation rec { pname = "mutter"; - version = "3.28.3"; + version = "3.28.4"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "GNOME"; repo = pname; - rev = "4af8d9d4752a94612a98d619e65828f0070a7b0e"; # HEAD of https://gitlab.gnome.org/GNOME/mutter/tree/gnome-3-28 - sha256 = "1rmc1bf80yq776xhygi1jzgia1y44j2mr2n94vlxgzqc0whamx2v"; + rev = version; + sha256 = "0p8ky306dnm4alkncmsnd8r2awpsi37p0bzvkv313pgqw2hbwq9i"; }; patches = [ From b4148fb8399fac33ba27624070c3fae843f9ee59 Mon Sep 17 00:00:00 2001 From: Andreas Wiese Date: Wed, 15 May 2019 21:09:53 +0200 Subject: [PATCH 89/91] xbill: init at 2.1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Old game, once more popular than Quake (but not Quake Ⅱ). From the homepage: Ever get the feeling that nothing is going right? You're a sysadmin, and someone's trying to destroy your computers. The little people running around the screen are trying to infect your computers with Wingdows [TM], a virus cleverly designed to resemble a popular operating system. --- pkgs/games/xbill/default.nix | 34 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/games/xbill/default.nix diff --git a/pkgs/games/xbill/default.nix b/pkgs/games/xbill/default.nix new file mode 100644 index 00000000000..119cd8f0876 --- /dev/null +++ b/pkgs/games/xbill/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchurl, libX11, libXpm, libXt, motif, ... }: + +stdenv.mkDerivation rec { + pname = "xbill"; + version = "2.1"; + + buildInputs = [ libX11 libXpm libXt motif ]; + + NIX_CFLAGS_LINK = [ "-lXpm" ]; + + configureFlags = [ + "--with-x" + "--enable-motif" + ]; + + src = fetchurl { + url = "http://www.xbill.org/download/${pname}-${version}.tar.gz"; + sha256 = "13b08lli2gvppmvyhy0xs8cbjbkvrn4b87302mx0pxrdrvqzzz8f"; + }; + + meta = with stdenv; { + description = "Protect a computer network from getting infected."; + homepage = "http://www.xbill.org/"; + license = lib.licenses.gpl1; + maintainers = with lib.maintainers; [ aw ]; + longDescription = '' + Ever get the feeling that nothing is going right? You're a sysadmin, + and someone's trying to destroy your computers. The little people + running around the screen are trying to infect your computers with + Wingdows [TM], a virus cleverly designed to resemble a popular + operating system. + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35c40045b8e..50cd07c2f1b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6585,6 +6585,8 @@ in xbanish = callPackage ../tools/X11/xbanish { }; + xbill = callPackage ../games/xbill { }; + xbrightness = callPackage ../tools/X11/xbrightness { }; xkbvalidate = callPackage ../tools/X11/xkbvalidate { }; From 66c091c52c2ecd374a6ddb580b58cf7fc33a947f Mon Sep 17 00:00:00 2001 From: Timo Kaufmann Date: Sat, 18 May 2019 00:00:17 +0200 Subject: [PATCH 90/91] python.pkgs.r2pipe: 1.2.0 -> 1.3.1 (#61647) --- pkgs/development/python-modules/r2pipe/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/r2pipe/default.nix b/pkgs/development/python-modules/r2pipe/default.nix index 354f2743e98..1612c31562f 100644 --- a/pkgs/development/python-modules/r2pipe/default.nix +++ b/pkgs/development/python-modules/r2pipe/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "r2pipe"; - version = "1.2.0"; + version = "1.3.1"; postPatch = let r2lib = "${lib.getOutput "lib" radare2}/lib"; @@ -27,7 +27,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "1qs3xqmi9alahsgr8akzw06ia4c3554dz8pran1h7z5llk262nj4"; + sha256 = "0xvv12q3cwbibim3r97dsz6lbj7xxhlbq7fdm4pznwfzg803cmiv"; }; # Tiny sanity check to make sure r2pipe finds radare2 (since r2pipe doesn't From 619492c03ecfc6cde541a680a1ac1e5250584acc Mon Sep 17 00:00:00 2001 From: Aaron Andersen Date: Thu, 16 May 2019 21:31:16 -0400 Subject: [PATCH 91/91] devede: fix runtime error --- pkgs/applications/video/devede/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix index 48c5032f2da..4802d259fb2 100644 --- a/pkgs/applications/video/devede/default.nix +++ b/pkgs/applications/video/devede/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, python3Packages, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor -, gtk3, gettext, wrapGAppsHook, gdk_pixbuf }: +, gtk3, gettext, wrapGAppsHook, gdk_pixbuf, gobject-introspection }: let inherit (python3Packages) dbus-python buildPythonApplication pygobject3 urllib3; @@ -15,8 +15,18 @@ in buildPythonApplication rec { sha256 = "0ncb8nykchrjlllbzfjpvirmfvfaps9qhilc56kvcw3nzqrnkx8q"; }; + # Temporary fix + # See https://github.com/NixOS/nixpkgs/issues/61578 + # and https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + nativeBuildInputs = [ gettext wrapGAppsHook + + # Temporary fix + # See https://github.com/NixOS/nixpkgs/issues/61578 + # and https://github.com/NixOS/nixpkgs/issues/56943 + gobject-introspection ]; buildInputs = [