diff options
95 files changed, 1130 insertions, 613 deletions
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index e2bf9f5f49ed..6190de79b7af 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1707,6 +1707,12 @@ githubId = 3086255; name = "Barry Moore II"; }; + chivay = { + email = "hubert.jasudowicz@gmail.com"; + github = "chivay"; + githubId = 14790226; + name = "Hubert Jasudowicz"; + }; chkno = { email = "chuck@intelligence.org"; github = "chkno"; diff --git a/nixos/modules/services/mail/postfix.nix b/nixos/modules/services/mail/postfix.nix index 63c0961b7568..8e5bed5fcb87 100644 --- a/nixos/modules/services/mail/postfix.nix +++ b/nixos/modules/services/mail/postfix.nix @@ -11,6 +11,7 @@ let haveAliases = cfg.postmasterAlias != "" || cfg.rootAlias != "" || cfg.extraAliases != ""; + haveCanonical = cfg.canonical != ""; haveTransport = cfg.transport != ""; haveVirtual = cfg.virtual != ""; haveLocalRecipients = cfg.localRecipients != null; @@ -244,6 +245,7 @@ let ; aliasesFile = pkgs.writeText "postfix-aliases" aliases; + canonicalFile = pkgs.writeText "postfix-canonical" cfg.canonical; virtualFile = pkgs.writeText "postfix-virtual" cfg.virtual; localRecipientMapFile = pkgs.writeText "postfix-local-recipient-map" (concatMapStrings (x: x + " ACCEPT\n") cfg.localRecipients); checkClientAccessFile = pkgs.writeText "postfix-check-client-access" cfg.dnsBlacklistOverrides; @@ -529,6 +531,15 @@ in "; }; + canonical = mkOption { + type = types.lines; + default = ""; + description = '' + Entries for the <citerefentry><refentrytitle>canonical</refentrytitle> + <manvolnum>5</manvolnum></citerefentry> table. + ''; + }; + virtual = mkOption { type = types.lines; default = ""; @@ -941,6 +952,9 @@ in (mkIf haveAliases { services.postfix.aliasFiles.aliases = aliasesFile; }) + (mkIf haveCanonical { + services.postfix.mapFiles.canonical = canonicalFile; + }) (mkIf haveTransport { services.postfix.mapFiles.transport = transportFile; }) diff --git a/pkgs/applications/blockchains/go-ethereum.nix b/pkgs/applications/blockchains/go-ethereum.nix index 0f99f28b42f6..73e067b5b559 100644 --- a/pkgs/applications/blockchains/go-ethereum.nix +++ b/pkgs/applications/blockchains/go-ethereum.nix @@ -8,17 +8,17 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4lHT0P8Euau0AJNtg1YstJJRQ58WTUlIH+HCKEjCq/s="; + sha256 = "sha256-PJaJ9fCva9UUBcQrnVa2c7dk4koi6AyX6bj3JStUMwM="; }; runVend = true; - vendorSha256 = "sha256-DgyOvplk1JWn6D/z4zbXHLNLuAVQ5beEHi0NuSv236A="; + vendorSha256 = "sha256-qLpwrV9NkmUO0yoK2/gwb5oe/lky/w/P0QVoFSTNuMU="; doCheck = false; diff --git a/pkgs/applications/blockchains/polkadot/default.nix b/pkgs/applications/blockchains/polkadot/default.nix index f104c3fe1e3b..abe7ab56431c 100644 --- a/pkgs/applications/blockchains/polkadot/default.nix +++ b/pkgs/applications/blockchains/polkadot/default.nix @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-9GCk1gqlQJhuoiKRi7J1qcJlZjlq2ObGicp5tGGDhrY="; }; - cargoSha256 = "sha256-BMVtwhDHKUUMTSSM+Bw87z4pBcOoQK8nfl5Zu0tvivU="; + cargoSha256 = "sha256-pWqbcargCEkisdGnj08VQdRqjocR7zZhWukhYjfZDqI="; nativeBuildInputs = [ clang ]; diff --git a/pkgs/applications/graphics/fig2dev/default.nix b/pkgs/applications/graphics/fig2dev/default.nix index 99e8478224f4..c7484f4cbfe7 100644 --- a/pkgs/applications/graphics/fig2dev/default.nix +++ b/pkgs/applications/graphics/fig2dev/default.nix @@ -13,11 +13,11 @@ stdenv.mkDerivation rec { pname = "fig2dev"; - version = "3.2.8"; + version = "3.2.8a"; src = fetchurl { url = "mirror://sourceforge/mcj/fig2dev-${version}.tar.xz"; - sha256 = "0zg29yqknfafyzmmln4k7kydfb2dapk3r8ffvlqhj3cm8fp5h4lk"; + sha256 = "1bm75lf9j54qpbjx8hzp6ixaayp1x9w4v3yxl6vxyw8g5m4sqdk3"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/graphics/pdfcpu/default.nix b/pkgs/applications/graphics/pdfcpu/default.nix index 96df57d71981..19d3c63ab3e4 100644 --- a/pkgs/applications/graphics/pdfcpu/default.nix +++ b/pkgs/applications/graphics/pdfcpu/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pdfcpu"; - version = "0.3.9"; + version = "0.3.11"; src = fetchFromGitHub { owner = "pdfcpu"; repo = pname; rev = "v${version}"; - sha256 = "sha256-btkGn/67KVFB272j7u5MKZCeby2fyRthLLeXj8VgX7s="; + sha256 = "sha256-kLRxZW89Bm2N/KxFYetIq+auPBW/vFoUnB8uaEcM8Yo="; }; - vendorSha256 = "sha256-/SsDDFveovJfuEdnOkxHAWccS8PJW5k9IHSxSJAgHMQ="; + vendorSha256 = "sha256-p/2Bu5h2P3ebgvSC12jdR2Zpd27xCFwtB/KZV0AULAM="; # No tests doCheck = false; diff --git a/pkgs/applications/graphics/xfig/default.nix b/pkgs/applications/graphics/xfig/default.nix index 8773db5bead6..3330e3eaefd6 100644 --- a/pkgs/applications/graphics/xfig/default.nix +++ b/pkgs/applications/graphics/xfig/default.nix @@ -14,11 +14,11 @@ stdenv.mkDerivation rec { pname = "xfig"; - version = "3.2.8"; + version = "3.2.8a"; src = fetchurl { url = "mirror://sourceforge/mcj/xfig-${version}.tar.xz"; - sha256 = "1czamqp0xn0j6qjnasa3fjnrzi072v6qknylr6jrs4gwsfw4ybyw"; + sha256 = "0y45i1gqg3r0aq55jk047l1hnv90kqis6ld9lppx6c5jhpmc0hxs"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index f35a3f1b71e1..d7906c7dcbdf 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.11.9"; + version = "0.11.13"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"; - sha256 = "XymM3qma8H2dm2tq8Zg+oKxOzb48azqlqn701pN5gdI="; + sha256 = "0QL1rP37pmdIdGM9eHa7PfW1GVrvn2fX4bQPqQ8FOpI="; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index 1fecadc2ec0b..f37666b0033f 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -89,6 +89,6 @@ mkChromiumDerivation (base: rec { then ["aarch64-linux" "x86_64-linux"] else []; timeout = 172800; # 48 hours (increased from the Hydra default of 10h) - broken = elem channel [ "beta" "dev" ]; + broken = elem channel [ "dev" ]; }; }) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index f043ec60f4e9..07634c337af4 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -159,7 +159,9 @@ let ) ++ optional (versionRange "89" "90.0.4422.0") (fetchpatch { url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/61b0ab526d2aa3c62fa20bb756461ca9a482f6c6/trunk/chromium-fix-libva-redef.patch"; sha256 = "1qj4sn1ngz0p1l1w3346kanr1sqlr3xdzk1f1i86lqa45mhv77ny"; - }); + }) ++ optional (chromiumVersionAtLeast "90") + ./fix-missing-atspi2-dependency.patch + ; postPatch = '' # remove unused third-party diff --git a/pkgs/applications/networking/browsers/chromium/fix-missing-atspi2-dependency.patch b/pkgs/applications/networking/browsers/chromium/fix-missing-atspi2-dependency.patch new file mode 100644 index 000000000000..9417b30159d7 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/fix-missing-atspi2-dependency.patch @@ -0,0 +1,26 @@ +From 6c5b9197076f6f384112e6566039116c56600909 Mon Sep 17 00:00:00 2001 +From: Michael Weiss <dev.primeos@gmail.com> +Date: Sat, 10 Apr 2021 13:53:50 +0200 +Subject: [PATCH] Fix a missing atspi2 dependency + +See https://bugs.chromium.org/p/chromium/issues/detail?id=1197837 for +more details. +--- + content/public/browser/BUILD.gn | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/content/public/browser/BUILD.gn b/content/public/browser/BUILD.gn +index 7e7c436d90c7..20ef832f1d8c 100644 +--- a/content/public/browser/BUILD.gn ++++ b/content/public/browser/BUILD.gn +@@ -535,6 +535,7 @@ source_set("browser_sources") { + + if (use_atk) { + sources += [ "ax_inspect_factory_auralinux.cc" ] ++ configs += [ "//build/config/linux/atspi2" ] + } + + if (is_linux || is_chromeos) { +-- +2.20.1 + diff --git a/pkgs/applications/networking/browsers/lagrange/default.nix b/pkgs/applications/networking/browsers/lagrange/default.nix index 30e154e5222c..abb0bd15515a 100644 --- a/pkgs/applications/networking/browsers/lagrange/default.nix +++ b/pkgs/applications/networking/browsers/lagrange/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "lagrange"; - version = "1.3.0"; + version = "1.3.2"; src = fetchFromGitHub { owner = "skyjake"; repo = "lagrange"; rev = "v${version}"; - sha256 = "sha256-85KshJEL7ri10mSm/KgcT03WLEwRMMTGczb6mGx66Jw="; + sha256 = "sha256-90MN7JH84h10dSXt5Kwc2V3FKVutQ7AmNcR4TK2bpBY="; fetchSubmodules = true; }; diff --git a/pkgs/applications/networking/cluster/octant/desktop.nix b/pkgs/applications/networking/cluster/octant/desktop.nix index 0f43e29e6283..5917d9ce0335 100644 --- a/pkgs/applications/networking/cluster/octant/desktop.nix +++ b/pkgs/applications/networking/cluster/octant/desktop.nix @@ -2,7 +2,7 @@ let pname = "octant-desktop"; - version = "0.18.0"; + version = "0.19.0"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -15,8 +15,8 @@ let src = fetchurl { url = "https://github.com/vmware-tanzu/octant/releases/download/v${version}/Octant-${version}.${suffix}"; sha256 = { - x86_64-linux = "sha256-sQxplTJ3xfHELepx+t7FtMpPTxTDoqTAL8oUz4sLaW0="; - x86_64-darwin = "sha256-ov9j+SgGXCwUjQaX3eCxVvPwPgUIwtHJ6Lmx2crOfIM="; + x86_64-linux = "sha256-1XFb0zuyOy8XEUd9hoexItjq4assuWlWIzqw7pZxHx0="; + x86_64-darwin = "sha256-e3v5BFX7wnx4sAQrOq+dBIDVPJYzQZKKvKjSX+dis2U="; }.${system}; }; diff --git a/pkgs/applications/networking/irc/irssi/default.nix b/pkgs/applications/networking/irc/irssi/default.nix index 7c9714b3555a..7a4fc703dd77 100644 --- a/pkgs/applications/networking/irc/irssi/default.nix +++ b/pkgs/applications/networking/irc/irssi/default.nix @@ -1,19 +1,12 @@ -{ lib, stdenv, fetchurl, fetchpatch, pkg-config, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }: +{ lib, stdenv, fetchurl, pkg-config, ncurses, glib, openssl, perl, libintl, libgcrypt, libotr }: stdenv.mkDerivation rec { pname = "irssi"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { url = "https://github.com/irssi/irssi/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "0g2nxazn4lszmd6mf1s36x5ablk4999g1qx7byrnvgnjsihjh62k"; - }; - - # Fix irssi on GLib >2.62 input being stuck after entering a NUL byte - # See https://github.com/irssi/irssi/issues/1180 - remove after next update. - patches = fetchpatch { - url = "https://github.com/irssi/irssi/releases/download/1.2.2/glib-2-63.patch"; - sha256 = "1ad1p7395n8dfmv97wrf751wwzgncqfh9fp27kq5kfdvh661da1i"; + sha256 = "09cwz5ff1i5lp35qhhmw6kbw5dwcn9pl16gpzkc92xg5sx3bgjr9"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/networking/remote/aws-workspaces/default.nix b/pkgs/applications/networking/remote/aws-workspaces/default.nix index 96c66f054e25..3451cbb129f0 100644 --- a/pkgs/applications/networking/remote/aws-workspaces/default.nix +++ b/pkgs/applications/networking/remote/aws-workspaces/default.nix @@ -5,15 +5,15 @@ stdenv.mkDerivation rec { pname = "aws-workspaces"; - version = "3.1.3.925"; + version = "3.1.5.1105"; src = fetchurl { # ref https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/Packages urls = [ "https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/workspacesclient_${version}_amd64.deb" - "https://web.archive.org/web/20210307233836/https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/workspacesclient_${version}_amd64.deb" + "https://web.archive.org/web/20210411145948/https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/workspacesclient_${version}_amd64.deb" ]; - sha256 = "5b57edb4f6f8c950164fd8104bf62df4c452ab5b16cb65d48db3636959a0f0ad"; + sha256 = "08c8912502d27e61cc2399bf99947e26c1daa1f317d5aa8cc7348d7bf8734e1b"; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/syncthing/add-stcli-target.patch b/pkgs/applications/networking/syncthing/add-stcli-target.patch deleted file mode 100644 index 07b5e334b2c9..000000000000 --- a/pkgs/applications/networking/syncthing/add-stcli-target.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/build.go b/build.go -index c8a5c1cf..d75a8491 100644 ---- a/build.go -+++ b/build.go -@@ -202,6 +202,12 @@ var targets = map[string]target{ - {src: "AUTHORS", dst: "deb/usr/share/doc/syncthing-relaypoolsrv/AUTHORS.txt", perm: 0644}, - }, - }, -+ "stcli": { -+ name: "stcli", -+ description: "Syncthing CLI", -+ buildPkgs: []string{"github.com/syncthing/syncthing/cmd/stcli"}, -+ binaryName: "stcli", -+ }, - } - - // These are repos we need to clone to run "go generate" diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 6d4b3fe34c42..2fa4f0b93c8e 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,23 +3,20 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.14.0"; - name = "${stname}-${version}"; + pname = stname; + version = "1.15.1"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "1nkjbikin341v74fcwdaa2v5f3zhd8xr6pjhpka1fdw6vvnn4lnd"; + sha256 = "sha256-d7b1hqW0ZWg74DyW1ZYMT7sIR7H89Ph38XE2Mhh7ySg="; }; - vendorSha256 = "1kr6yyigi7bbi4xwpk009q801wvmf3aaw4m40ki0s6gjn0wjl4j3"; + vendorSha256 = "sha256-00DdGJNCZ94Wj6yvVXJYNJZEiGxYbqTkX6wwon0O1tc="; doCheck = false; - patches = [ - ./add-stcli-target.patch - ]; BUILD_USER="nix"; BUILD_HOST="nix"; @@ -83,12 +80,6 @@ in { ''; }; - syncthing-cli = common { - stname = "syncthing-cli"; - - target = "stcli"; - }; - syncthing-discovery = common { stname = "syncthing-discovery"; target = "stdiscosrv"; diff --git a/pkgs/applications/office/fava/default.nix b/pkgs/applications/office/fava/default.nix index 4f32486ffe1f..cdef23cff4c5 100644 --- a/pkgs/applications/office/fava/default.nix +++ b/pkgs/applications/office/fava/default.nix @@ -13,17 +13,17 @@ python3.pkgs.buildPythonApplication rec { propagatedBuildInputs = with python3.pkgs; [ Babel + beancount cheroot - flaskbabel + click flask + flaskbabel + jaraco_functools jinja2 - beancount - click markdown2 ply simplejson werkzeug - jaraco_functools ]; checkInputs = with python3.pkgs; [ @@ -39,10 +39,11 @@ python3.pkgs.buildPythonApplication rec { "test_cli" ]; - meta = { - homepage = "https://beancount.github.io/fava"; + meta = with lib; { description = "Web interface for beancount"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ matthiasbeyer ]; + homepage = "https://beancount.github.io/fava"; + changelog = "https://beancount.github.io/fava/changelog.html"; + license = licenses.mit; + maintainers = with maintainers; [ bhipple ]; }; } diff --git a/pkgs/applications/version-management/git-review/default.nix b/pkgs/applications/version-management/git-review/default.nix index d0bbca15ea17..042bdc2a19d7 100644 --- a/pkgs/applications/version-management/git-review/default.nix +++ b/pkgs/applications/version-management/git-review/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "git-review"; - version = "1.28.0"; + version = "2.0.0"; # Manually set version because prb wants to get it from the git # upstream repository (and we are installing from tarball instead) @@ -10,7 +10,7 @@ buildPythonApplication rec { src = fetchurl { url = "https://opendev.org/opendev/${pname}/archive/${version}.tar.gz"; - sha256 = "1y1jzb0hlprynwwr4q5y4x06641qrhj0k69mclabnmhfam9g8ygm"; + sha256 = "0dkyd5g2xmvsa114is3cd9qmki3hi6c06wjnra0f4xq3aqm0ajnj"; }; propagatedBuildInputs = [ pbr requests setuptools ]; diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 31689022b326..60915d6645ad 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -299,10 +299,11 @@ stdenv.mkDerivation { # vs libstdc++, etc.) since Darwin isn't `useLLVM` on all counts. (See # https://clang.llvm.org/docs/Toolchain.html for all the axes one might # break `useLLVM` into.) - + optionalString (isClang && gccForLibs != null + + optionalString (isClang && targetPlatform.isLinux && !(stdenv.targetPlatform.useAndroidPrebuilt or false) - && !(stdenv.targetPlatform.useLLVM or false)) '' + && !(stdenv.targetPlatform.useLLVM or false) + && gccForLibs != null) '' echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags '' diff --git a/pkgs/desktops/gnome-3/extensions/unite/default.nix b/pkgs/desktops/gnome-3/extensions/unite/default.nix index e2f7f547579f..715e2a70cc72 100644 --- a/pkgs/desktops/gnome-3/extensions/unite/default.nix +++ b/pkgs/desktops/gnome-3/extensions/unite/default.nix @@ -1,13 +1,13 @@ { lib, stdenv, gnome3, fetchFromGitHub, xprop, glib }: stdenv.mkDerivation rec { pname = "gnome-shell-extension-unite"; - version = "48"; + version = "49"; src = fetchFromGitHub { owner = "hardpixel"; repo = "unite-shell"; rev = "v${version}"; - sha256 = "1rc9h7zrg9pvyl619ychcp0w7wmnf4ndaq2knv490kzhy0idj18j"; + sha256 = "12kjljw253hshaz6x886kg3mc93lb4pxwd05qihww6m5k4lqjcy5"; }; uuid = "unite@hardpixel.eu"; diff --git a/pkgs/development/compilers/ciao/default.nix b/pkgs/development/compilers/ciao/default.nix index de8e73374c5e..4d26678605e7 100644 --- a/pkgs/development/compilers/ciao/default.nix +++ b/pkgs/development/compilers/ciao/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "ciao"; - version = "1.19.0"; + version = "1.20.0"; src = fetchFromGitHub { owner = "ciao-lang"; repo = "ciao"; rev = "v${version}"; - sha256 = "03qzcb4ivgkiwdpw7a94dn74xqyxjwz5ilrr53rcblsh5ng299jp"; + sha256 = "sha256-Xp0ZQRi7mOO2WN/2hO6zgobDG3S0BEV+SgsaduBZ30U="; }; configurePhase = '' diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index fa4421b9413d..fac8a40bb24a 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "jasper"; - version = "2.0.26"; + version = "2.0.28"; src = fetchFromGitHub { owner = "jasper-software"; repo = pname; rev = "version-${version}"; - hash = "sha256-zmoC8nIsQm2u2cSzu2prdyofo3JFNzJ1bjbIZ3YaAn4="; + hash = "sha256-f3UG5w8GbwZcsFBaQN6v8kdEkKIGgizcAgaVZtKwS78="; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/librsync/default.nix b/pkgs/development/libraries/librsync/default.nix index 9211d9d233f8..a0248e774b7d 100644 --- a/pkgs/development/libraries/librsync/default.nix +++ b/pkgs/development/libraries/librsync/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "librsync"; - version = "2.3.1"; + version = "2.3.2"; src = fetchFromGitHub { owner = "librsync"; repo = "librsync"; rev = "v${version}"; - sha256 = "131cd4asmpm4nskidzgiy8xibbnpibvvbq857a0pcky77min5g4z"; + sha256 = "sha256-GNwOIZ2UjvsYIthotiPDBrabYzCGFG/YVEbwVa9Nwi4="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/medfile/default.nix b/pkgs/development/libraries/medfile/default.nix index a89cb43d2611..c8ff0c05aded 100644 --- a/pkgs/development/libraries/medfile/default.nix +++ b/pkgs/development/libraries/medfile/default.nix @@ -9,6 +9,10 @@ stdenv.mkDerivation rec { sha256 = "1khzclkrd1yn9mz3g14ndgpsbj8j50v8dsjarcj6kkn9zgbbazc4"; }; + patches = [ + ./hdf5-1.12.patch + ]; + nativeBuildInputs = [ cmake ]; buildInputs = [ hdf5 ]; diff --git a/pkgs/development/libraries/medfile/hdf5-1.12.patch b/pkgs/development/libraries/medfile/hdf5-1.12.patch new file mode 100644 index 000000000000..ab73e00487ce --- /dev/null +++ b/pkgs/development/libraries/medfile/hdf5-1.12.patch @@ -0,0 +1,86 @@ +--- a/config/cmake_files/medMacros.cmake ++++ b/config/cmake_files/medMacros.cmake +@@ -447,7 +447,7 @@ MACRO(MED_FIND_HDF5) + ## + ## Requires 1.10.x version + ## +- IF (NOT HDF_VERSION_MAJOR_REF EQUAL 1 OR NOT HDF_VERSION_MINOR_REF EQUAL 10 OR NOT HDF_VERSION_RELEASE_REF GREATER 1) ++ IF (HDF5_VERSION VERSION_LESS 1.10.2) + MESSAGE(FATAL_ERROR "HDF5 version is ${HDF_VERSION_REF}. Only versions >= 1.10.2 are supported.") + ENDIF() + ## +--- a/src/ci/MEDfileCompatibility.c ++++ b/src/ci/MEDfileCompatibility.c +@@ -71,7 +71,7 @@ MEDfileCompatibility(const char* const filename, + _hversionMMR=10000*_hmajeur+100*_hmineur+_hrelease; + /* ISCRUTE(_hversionMMR); */ + /* ISCRUTE(HDF_VERSION_NUM_REF); */ +- if ( (_hversionMMR >= HDF_VERSION_NUM_REF) && (_hmineur == HDF_VERSION_MINOR_REF) ) *hdfok = MED_TRUE; ++ if ( ((_hversionMMR >= HDF_VERSION_NUM_REF) && (_hmineur == HDF_VERSION_MINOR_REF)) || _hversionMMR > HDF_VERSION_NUM_REF ) *hdfok = MED_TRUE; + + /* TODO : Vérifier si la version mineure HDF du fichier est supérieure + à la version mineure de la bibliothèque HDF utilisée : +@@ -113,7 +113,7 @@ MEDfileCompatibility(const char* const filename, + #if MED_NUM_MAJEUR != 4 + #error "Don't forget to update the test version here when you change the major version of the library !" + #endif +-#if H5_VERS_MINOR > 10 ++#if H5_VERS_MINOR > 12 + #error "Don't forget to check the compatibility version of the library, depending on the internal hdf model choice !" + #error "Cf. _MEDfileCreate ..." + #endif +--- a/src/hdfi/_MEDfileCreate.c ++++ b/src/hdfi/_MEDfileCreate.c +@@ -159,7 +159,7 @@ med_idt _MEDfileCreate(const char * const filename, const med_access_mode access + * En HDF5-1.10.0p1 cela n'a aucun effet ! + * Un test autoconf permet de fixer un intervalle de version HDF à MED. + */ +-#if H5_VERS_MINOR > 10 ++#if H5_VERS_MINOR > 12 + #error "Don't forget to change the compatibility version of the library !" + #endif + +--- a/src/hdfi/_MEDfileOpen.c ++++ b/src/hdfi/_MEDfileOpen.c +@@ -72,7 +72,7 @@ med_idt _MEDfileOpen(const char * const filename,const med_access_mode accessmod + + • The creation order tracking property, H5P_CRT_ORDER_TRACKED, has been set in the group creation property list (see H5Pset_link_creation_order). + */ +-#if H5_VERS_MINOR > 10 ++#if H5_VERS_MINOR > 12 + #error "Don't forget to change the compatibility version of the library !" + #endif + /* L'avantage de bloquer le modèle interne HDF5 +--- a/src/hdfi/_MEDmemFileOpen.c ++++ b/src/hdfi/_MEDmemFileOpen.c +@@ -434,7 +434,7 @@ med_idt _MEDmemFileOpen(const char * const filename, med_memfile * const memfile + goto ERROR; + } + +-#if H5_VERS_MINOR > 10 ++#if H5_VERS_MINOR > 12 + #error "Don't forget to change the compatibility version of the library !" + #endif + if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18) ) { +--- a/src/hdfi/_MEDparFileCreate.c ++++ b/src/hdfi/_MEDparFileCreate.c +@@ -64,7 +64,7 @@ med_idt _MEDparFileCreate(const char * const filename, const med_access_mode acc + * En HDF5-1.10.0p1 cela n'a aucun effet ! + * Un test autoconf permet de fixer un intervalle de version HDF à MED. + */ +-#if H5_VERS_MINOR > 10 ++#if H5_VERS_MINOR > 12 + #error "Don't forget to change the compatibility version of the library !" + #endif + +--- a/src/hdfi/_MEDparFileOpen.c ++++ b/src/hdfi/_MEDparFileOpen.c +@@ -55,7 +55,7 @@ med_idt _MEDparFileOpen(const char * const filename,const med_access_mode access + MED_ERR_(_fid,MED_ERR_INIT,MED_ERR_PROPERTY,MED_ERR_PARALLEL_MSG); + goto ERROR; + } +-#if H5_VERS_MINOR > 10 ++#if H5_VERS_MINOR > 12 + #error "Don't forget to change the compatibility version of the library !" + #endif + if ( H5Pset_libver_bounds( _fapl, H5F_LIBVER_18, H5F_LIBVER_18 ) ) { diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix index 93da285e824b..cce17acbf0ac 100644 --- a/pkgs/development/libraries/oneDNN/default.nix +++ b/pkgs/development/libraries/oneDNN/default.nix @@ -5,13 +5,13 @@ # https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn stdenv.mkDerivation rec { pname = "oneDNN"; - version = "2.1.3"; + version = "2.2.1"; src = fetchFromGitHub { owner = "oneapi-src"; repo = "oneDNN"; rev = "v${version}"; - sha256 = "sha256-xByu0HWeyDg5WV/zVO4HO/uwZ2RPrud0FlZHPfFom1E="; + sha256 = "sha256-orsllgBt2EHuZOy9vkgDK3XT6BfbtyIPvO4REB9tAgs="; }; outputs = [ "out" "dev" "doc" ]; diff --git a/pkgs/development/libraries/physics/rivet/darwin.patch b/pkgs/development/libraries/physics/rivet/darwin.patch deleted file mode 100644 index 2d397f1da6ca..000000000000 --- a/pkgs/development/libraries/physics/rivet/darwin.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/include/Rivet/Tools/osdir.hh b/include/Rivet/Tools/osdir.hh -index 05f06ca..59af7de 100644 ---- a/include/Rivet/Tools/osdir.hh -+++ b/include/Rivet/Tools/osdir.hh -@@ -21,7 +21,7 @@ - - /// @cond OSDIR - --#if defined(unix) || defined(__unix) || defined(__unix__) -+#if defined(unix) || defined(__unix) || defined(__unix__) || defined(__APPLE__) - #define OSLINK_OSDIR_POSIX - #elif defined(_WIN32) - #define OSLINK_OSDIR_WINDOWS -@@ -32,18 +32,7 @@ - #include <string> - - #if defined(OSLINK_OSDIR_NOTSUPPORTED) -- --namespace oslink --{ -- class directory -- { -- public: -- directory(const std::string&) { } -- operator void*() const { return (void*)0; } -- std::string next() { return ""; } -- }; --} -- -+#error Platform misdetected or oslink is not implemented - #elif defined(OSLINK_OSDIR_POSIX) - - #include <sys/types.h> diff --git a/pkgs/development/libraries/physics/rivet/default.nix b/pkgs/development/libraries/physics/rivet/default.nix index 44065904d991..9d3124987048 100644 --- a/pkgs/development/libraries/physics/rivet/default.nix +++ b/pkgs/development/libraries/physics/rivet/default.nix @@ -1,50 +1,14 @@ -{ lib, stdenv, fetchurl, fetchpatch, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }: +{ lib, stdenv, fetchurl, fastjet, fastjet-contrib, ghostscript, hepmc, imagemagick, less, python3, rsync, texlive, yoda, which, makeWrapper }: stdenv.mkDerivation rec { pname = "rivet"; - version = "3.1.3"; + version = "3.1.4"; src = fetchurl { url = "https://www.hepforge.org/archive/rivet/Rivet-${version}.tar.bz2"; - sha256 = "08g0f84l7r6vm4n7gn36qi3bzacscpv061m9xar2572vf10wxpak"; + sha256 = "sha256-N+3ICilozhAxWJ5DumtJKHfKeQG+o4+Lt1NqXIz4EA0="; }; - patches = [ - ./darwin.patch # configure relies on impure sw_vers to -Dunix - - # fix compilation errors (fails depending on number of cores filesystem ordering?) - # https://gitlab.com/hepcedar/rivet/-/merge_requests/220 - (fetchpatch { - url = "https://gitlab.com/hepcedar/rivet/commit/3203bf12a4bef81f880789eb9cde7ff489ae5115.diff"; - sha256 = "0zn5yxlv6dk4vcqgz0syzb9mp4qc9smpmgshcqimcvii7qcp20mc"; - }) - # https://gitlab.com/hepcedar/rivet/-/merge_requests/223 - (fetchpatch { - url = "https://gitlab.com/hepcedar/rivet/commit/476f267c46b126fa163a92aa6cbcb7806c4624c3.diff"; - sha256 = "0dhkraddzp06v5z0d2wf0c8vsd50hl5pqsjgsrb8x14d0vwi8rnc"; - }) - - # fix for new python and fix transparency gs 9.52 - # gs 9.52 opacity fix - (fetchpatch { - url = "https://gitlab.com/hepcedar/rivet/commit/25c4bee19882fc56407b0a438f86e1a11753d5e6.diff"; - sha256 = "18p2wk54r0qfq6l27z6805zq1z5jhk5sbxbjixgibzq8prj1a78v"; - }) - - # make-plots: fix wrong logic in Plot.set_xmax() - (fetchpatch { - url = "https://gitlab.com/hepcedar/rivet/commit/d371c6c10cf67a41c0e4e27c16ff5723d6276ad2.diff"; - sha256 = "0w622rd5darj7qafbbc84blznvy5rnhsdyr2n1i1fkz19mrf5h2p"; - }) - - # fix https://gitlab.com/hepcedar/rivet/-/issues/200 - (fetchpatch { - url = "https://gitlab.com/hepcedar/rivet/commit/442dbd17dcb3bd6e30b26e54c50f6a8237f966f9.diff"; - includes = [ "bin/make-pgfplots" "bin/make-plots" "bin/make-plots-fast" ]; - sha256 = "0c3rysgcib49km1zdpgsdai3xi4s6ijqgxp4whn04mrh3qf4bmr3"; - }) - ]; - latex = texlive.combine { inherit (texlive) scheme-basic collection-pstricks diff --git a/pkgs/development/ocaml-modules/janestreet/0.12.nix b/pkgs/development/ocaml-modules/janestreet/0.12.nix index 295960764dc5..10d8886d9947 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.12.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.12.nix @@ -1,13 +1,10 @@ -{ janePackage -, ctypes -, num -, octavius -, ppxlib -, re +{ self , openssl }: -rec { +with self; + +{ ocaml-compiler-libs = janePackage { pname = "ocaml-compiler-libs"; diff --git a/pkgs/development/ocaml-modules/janestreet/0.14.nix b/pkgs/development/ocaml-modules/janestreet/0.14.nix index 738828e83086..eb429b2bb6dc 100644 --- a/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -1,30 +1,11 @@ -{ janePackage -, alcotest -, angstrom -, angstrom-async -, base64 -, cryptokit -, ctypes -, dune-configurator -, faraday -, inotify -, js_of_ocaml -, js_of_ocaml-ppx -, lambdasoup -, magic-mime -, num -, octavius -, ppxlib -, re -, tyxml -, uri-sexp -, zarith +{ self , openssl -, ounit , zstd }: -rec { +with self; + +{ accessor = janePackage { pname = "accessor"; diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index a4c026ffb8b2..679ef4a58e48 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -1,10 +1,10 @@ -{ janePackage, ocamlbuild, angstrom, cryptokit, ctypes, - magic-mime, ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, - num, openssl -, ppxlib +{ self +, openssl }: -rec { +with self; + +{ ocaml-compiler-libs = janePackage { pname = "ocaml-compiler-libs"; diff --git a/pkgs/development/ocaml-modules/janestreet/old.nix b/pkgs/development/ocaml-modules/janestreet/old.nix index 447a9cdf71f5..8b4a6ed52962 100644 --- a/pkgs/development/ocaml-modules/janestreet/old.nix +++ b/pkgs/development/ocaml-modules/janestreet/old.nix @@ -1,8 +1,32 @@ -{ stdenv, lib, janePackage, ocaml, ocamlbuild, cryptokit, ctypes, magic-mime, - ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, zarith, num, - openssl }: - -rec { +{ self +, super +, lib +, stdenv +, openssl +}: + +let + inherit (super) + janePackage + ocaml + ocamlbuild + cryptokit + ctypes + magic-mime + ocaml-migrate-parsetree + octavius + ounit + ppx_deriving + re + zarith + num + ; + +in + +with self; + +{ # Jane Street packages, up to ppx_core diff --git a/pkgs/development/ocaml-modules/printbox/default.nix b/pkgs/development/ocaml-modules/printbox/default.nix index f2bbfdcec18a..04361de72221 100644 --- a/pkgs/development/ocaml-modules/printbox/default.nix +++ b/pkgs/development/ocaml-modules/printbox/default.nix @@ -1,21 +1,24 @@ -{ lib, fetchFromGitHub, buildDunePackage, uucp, uutf }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml, uucp, uutf, mdx }: buildDunePackage rec { pname = "printbox"; - version = "0.4"; + version = "0.5"; - minimumOCamlVersion = "4.05"; + useDune2 = true; + + minimumOCamlVersion = "4.03"; src = fetchFromGitHub { owner = "c-cube"; repo = pname; rev = version; - sha256 = "0bq2v37v144i00h1zwyqhkfycxailr245n97yff0f7qnidxprix0"; + sha256 = "099yxpp7d9bms6dwzp9im7dv1qb801hg5rx6awpx3rpfl4cvqfn2"; }; - checkInputs = lib.optionals doCheck [ uucp uutf ]; + checkInputs = [ uucp uutf mdx.bin ]; - doCheck = true; + # mdx is not available for OCaml < 4.07 + doCheck = lib.versionAtLeast ocaml.version "4.07"; meta = { homepage = "https://github.com/c-cube/printbox/"; diff --git a/pkgs/development/python-modules/aioemonitor/default.nix b/pkgs/development/python-modules/aioemonitor/default.nix new file mode 100644 index 000000000000..e78cb83b3f4c --- /dev/null +++ b/pkgs/development/python-modules/aioemonitor/default.nix @@ -0,0 +1,49 @@ +{ lib +, aiohttp +, aioresponses +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytest-raises +, pytestCheckHook +, pythonOlder +, xmltodict +}: + +buildPythonPackage rec { + pname = "aioemonitor"; + version = "1.0.5"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = pname; + rev = "v${version}"; + sha256 = "0h8zqqy8v8r1fl9bp3m8icr2sy44p0mbfl1hbb0zni17r9r50dhn"; + }; + + propagatedBuildInputs = [ + aiohttp + xmltodict + ]; + + checkInputs = [ + aioresponses + pytest-asyncio + pytest-raises + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py --replace '"pytest-runner>=5.2",' "" + ''; + + pythonImportsCheck = [ "aioemonitor" ]; + + meta = with lib; { + description = "Python client for SiteSage Emonitor"; + homepage = "https://github.com/bdraco/aioemonitor"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/aiosyncthing/default.nix b/pkgs/development/python-modules/aiosyncthing/default.nix new file mode 100644 index 000000000000..553876a48cfd --- /dev/null +++ b/pkgs/development/python-modules/aiosyncthing/default.nix @@ -0,0 +1,45 @@ +{ lib +, aiohttp +, aioresponses +, buildPythonPackage +, fetchFromGitHub +, expects +, pytest-asyncio +, pytest-mock +, pytestCheckHook +, yarl +}: + +buildPythonPackage rec { + pname = "aiosyncthing"; + version = "0.5.1"; + + src = fetchFromGitHub { + owner = "zhulik"; + repo = pname; + rev = "v${version}"; + sha256 = "0704qbg3jy80vaw3bcvhy988s1qs3fahpfwkja71fy70bh0vc860"; + }; + + propagatedBuildInputs = [ + aiohttp + yarl + ]; + + checkInputs = [ + aioresponses + expects + pytestCheckHook + pytest-asyncio + pytest-mock + ]; + + pythonImportsCheck = [ "aiosyncthing" ]; + + meta = with lib; { + description = "Python client for the Syncthing REST API"; + homepage = "https://github.com/zhulik/aiosyncthing"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/datadog/default.nix b/pkgs/development/python-modules/datadog/default.nix index 4a1bddfe3692..498a813569e2 100644 --- a/pkgs/development/python-modules/datadog/default.nix +++ b/pkgs/development/python-modules/datadog/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "datadog"; - version = "0.39.0"; + version = "0.40.0"; src = fetchPypi { inherit pname version; - sha256 = "b0ef69a27aad0e4412c1ac3e6894fa1b5741db735515c34dfe1606d8cf30e4e5"; + sha256 = "4bbd66a02bbcf9cd03ba05194d605a64c9efb7aed90d5e69c6ec42655c3c01a4"; }; postPatch = '' diff --git a/pkgs/development/python-modules/expects/default.nix b/pkgs/development/python-modules/expects/default.nix new file mode 100644 index 000000000000..093bdc27bf84 --- /dev/null +++ b/pkgs/development/python-modules/expects/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "expects"; + version = "0.9.0"; + + src = fetchFromGitHub { + owner = "jaimegildesagredo"; + repo = pname; + rev = "v${version}"; + sha256 = "0mk1mhh8n9ly820krkhazn1w96f10vmgh21y2wr44sn8vwr4ngyy"; + }; + + # mamba is used as test runner. Not available and should not be used as + # it's just another unmaintained test runner. + doCheck = false; + pythonImportsCheck = [ "expects" ]; + + meta = with lib; { + description = "Expressive and extensible TDD/BDD assertion library for Python"; + homepage = "https://expects.readthedocs.io/"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index 0397a2d7629e..a9f0d30ef44e 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.42.0"; + version = "0.43.0"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = version; - sha256 = "sha256-vDgjuNgwNp9cDgiCNxhACOcuaxcrR+0DW/U5OaSW0n4="; + sha256 = "sha256-mfVSiquZrCtAza4q9Ocle22e4ZMoTgxguevuOlZEUm8="; }; postPatch = '' diff --git a/pkgs/development/python-modules/ifcopenshell/default.nix b/pkgs/development/python-modules/ifcopenshell/default.nix index 75d1c4d77405..2eedaaece690 100644 --- a/pkgs/development/python-modules/ifcopenshell/default.nix +++ b/pkgs/development/python-modules/ifcopenshell/default.nix @@ -1,11 +1,10 @@ { lib, stdenv , buildPythonPackage , fetchFromGitHub -, substituteAll , python , gcc10 , cmake -, boost172 +, boost17x , icu , swig , pcre @@ -16,29 +15,21 @@ buildPythonPackage rec { pname = "ifcopenshell"; - version = "0.6.0b0"; + version = "210410"; format = "other"; src = fetchFromGitHub { owner = "IfcOpenShell"; repo = "IfcOpenShell"; - rev = "v${version}"; + rev = "blenderbim-${version}"; fetchSubmodules = true; - sha256 = "1ad1s9az41z2f46rbi1jnr46mgc0q4h5kz1jm9xdlwifqv9y04g1"; + sha256 = "1g52asxrqcfj01iqvf03k3bb6rg3v04hh1wc3nmn329a2lwjbxpw"; }; - patches = [ - (substituteAll { - name = "site-packages.patch"; - src = ./site-packages.patch; - site_packages = "lib/${python.libPrefix}/site-packages"; - }) - ]; - nativeBuildInputs = [ gcc10 cmake ]; buildInputs = [ - boost172 + boost17x icu pcre libxml2 @@ -48,7 +39,9 @@ buildPythonPackage rec { cd cmake ''; + PYTHONUSERBASE="."; cmakeFlags = [ + "-DUSERSPACE_PYTHON_PREFIX=ON" "-DOCC_INCLUDE_DIR=${opencascade-occt}/include/opencascade" "-DOCC_LIBRARY_DIR=${opencascade-occt}/lib" "-DOPENCOLLADA_INCLUDE_DIR=${opencollada}/include/opencollada" diff --git a/pkgs/development/python-modules/ifcopenshell/site-packages.patch b/pkgs/development/python-modules/ifcopenshell/site-packages.patch deleted file mode 100644 index e61fe2056f7b..000000000000 --- a/pkgs/development/python-modules/ifcopenshell/site-packages.patch +++ /dev/null @@ -1,32 +0,0 @@ ---- a/src/ifcwrap/CMakeLists.txt -+++ b/src/ifcwrap/CMakeLists.txt -@@ -68,26 +68,17 @@ endif() - # directory in which the wrapper can be installed. - FIND_PACKAGE(PythonInterp) - IF(PYTHONINTERP_FOUND AND NOT "${PYTHON_EXECUTABLE}" STREQUAL "") -- EXECUTE_PROCESS( -- COMMAND ${PYTHON_EXECUTABLE} -c "import sys; from distutils.sysconfig import get_python_lib; sys.stdout.write(get_python_lib(1))" -- OUTPUT_VARIABLE python_package_dir -- ) -- -- IF("${python_package_dir}" STREQUAL "") -- MESSAGE(WARNING "Unable to locate Python site-package directory, unable to install the Python wrapper") -- ELSE() - FILE(GLOB_RECURSE sourcefiles "${CMAKE_CURRENT_SOURCE_DIR}/../ifcopenshell-python/ifcopenshell/*.py") - FOREACH(file ${sourcefiles}) - FILE(RELATIVE_PATH relative "${CMAKE_CURRENT_SOURCE_DIR}/../ifcopenshell-python/ifcopenshell/" "${file}") - GET_FILENAME_COMPONENT(dir "${relative}" DIRECTORY) - INSTALL(FILES "${file}" -- DESTINATION "${python_package_dir}/ifcopenshell/${dir}") -+ DESTINATION "@site_packages@/ifcopenshell/${dir}") - ENDFOREACH() - INSTALL(FILES "${CMAKE_BINARY_DIR}/ifcwrap/ifcopenshell_wrapper.py" -- DESTINATION "${python_package_dir}/ifcopenshell") -+ DESTINATION "@site_packages@/ifcopenshell") - INSTALL(TARGETS _ifcopenshell_wrapper -- DESTINATION "${python_package_dir}/ifcopenshell") -- ENDIF() -+ DESTINATION "@site_packages@/ifcopenshell") - ELSE() - MESSAGE(WARNING "No Python interpreter found, unable to install the Python wrapper") - ENDIF() diff --git a/pkgs/development/python-modules/karton-classifier/default.nix b/pkgs/development/python-modules/karton-classifier/default.nix new file mode 100644 index 000000000000..a623486f03cf --- /dev/null +++ b/pkgs/development/python-modules/karton-classifier/default.nix @@ -0,0 +1,48 @@ +{ lib +, buildPythonPackage +, chardet +, fetchFromGitHub +, karton-core +, python +, python_magic +}: + +buildPythonPackage rec { + pname = "karton-classifier"; + version = "1.0.0"; + + src = fetchFromGitHub { + owner = "CERT-Polska"; + repo = pname; + rev = "v${version}"; + sha256 = "05pxv0smrzgmljykc6yx0rx8b85ck7fa09xjkjw0dd7lb6bb19a6"; + }; + + propagatedBuildInputs = [ + chardet + karton-core + python_magic + ]; + + postPatch = '' + substituteInPlace requirements.txt \ + --replace "chardet==3.0.4" "chardet" \ + --replace "karton-core==4.0.4" "karton-core" \ + --replace "python-magic==0.4.18" "python-magic" + ''; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck + ''; + + pythonImportsCheck = [ "karton.classifier" ]; + + meta = with lib; { + description = "File type classifier for the Karton framework"; + homepage = "https://github.com/CERT-Polska/karton-classifier"; + license = with licenses; [ bsd3 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/karton-core/default.nix b/pkgs/development/python-modules/karton-core/default.nix new file mode 100644 index 000000000000..b05c6bd343fa --- /dev/null +++ b/pkgs/development/python-modules/karton-core/default.nix @@ -0,0 +1,34 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, minio +, python +, redis +}: + +buildPythonPackage rec { + pname = "karton-core"; + version = "4.2.0"; + + src = fetchFromGitHub { + owner = "CERT-Polska"; + repo = "karton"; + rev = "v${version}"; + sha256 = "08j1bm9g58576sswcrpfczaki24nlqqaypp7qv1rxxwsyp5pq6h6"; + }; + + propagatedBuildInputs = [ minio redis ]; + + checkPhase = '' + runHook preCheck + ${python.interpreter} -m unittest discover + runHook postCheck + ''; + + meta = with lib; { + description = "Distributed malware processing framework"; + homepage = "https://karton-core.readthedocs.io/"; + maintainers = with maintainers; [ chivay ]; + license = licenses.bsd3; + }; +} diff --git a/pkgs/development/python-modules/poetry/default.nix b/pkgs/development/python-modules/poetry/default.nix index 1519187d174b..95e45020d463 100644 --- a/pkgs/development/python-modules/poetry/default.nix +++ b/pkgs/development/python-modules/poetry/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "1.1.4"; + version = "1.1.5"; format = "pyproject"; disabled = isPy27; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "0lx3qpz5dad0is7ki5a4vxphvc8cm8fnv4bmrx226a6nvvaj6ahs"; + sha256 = "0bv6irpscpak6pldkzrx4j12dqnpfz5h8fy5lliglizv0avh60hf"; }; postPatch = '' diff --git a/pkgs/development/python-modules/pyclimacell/default.nix b/pkgs/development/python-modules/pyclimacell/default.nix new file mode 100644 index 000000000000..c9eb0f0353f6 --- /dev/null +++ b/pkgs/development/python-modules/pyclimacell/default.nix @@ -0,0 +1,39 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +, pythonOlder +, pytz +}: + +buildPythonPackage rec { + pname = "pyclimacell"; + version = "0.18.0"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "raman325"; + repo = pname; + rev = "v${version}"; + sha256 = "0pxlh3lwd1az6v7vbaz9kv6ngqxf34iddp7vr0d0p8apbvinwrha"; + }; + + propagatedBuildInputs = [ + aiohttp + pytz + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "pyclimacell" ]; + + meta = with lib; { + description = "Python client for ClimaCell API"; + homepage = "https://github.com/raman325/pyclimacell"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pycognito/default.nix b/pkgs/development/python-modules/pycognito/default.nix index 511df9f07f55..797da43352df 100644 --- a/pkgs/development/python-modules/pycognito/default.nix +++ b/pkgs/development/python-modules/pycognito/default.nix @@ -1,7 +1,6 @@ { lib , boto3 , buildPythonPackage -, cryptography , envs , fetchFromGitHub , isPy27 @@ -13,20 +12,16 @@ buildPythonPackage rec { pname = "pycognito"; - version = "0.1.5"; + version = "2021.03.1"; + disabled = isPy27; src = fetchFromGitHub { owner = "pvizeli"; repo = pname; rev = version; - sha256 = "sha256-RJeHPCTuaLN+zB0N0FGt4qrTI6++1ks5iBn64Cx0Psc="; + sha256 = "sha256-V3R6i1/FZrjcfRqJhczjURr/+x++iCvZ3aCK9wdEL1A="; }; - postPatch = '' - substituteInPlace setup.py \ - --replace 'python-jose[cryptography]' 'python-jose' - ''; - propagatedBuildInputs = [ boto3 envs @@ -34,20 +29,24 @@ buildPythonPackage rec { requests ]; - disabled = isPy27; - checkInputs = [ mock pytestCheckHook ]; + postPatch = '' + substituteInPlace setup.py \ + --replace 'python-jose[cryptography]' 'python-jose' + ''; + pytestFlagsArray = [ "tests.py" ]; + pythonImportsCheck = [ "pycognito" ]; meta = with lib; { description = "Python class to integrate Boto3's Cognito client so it is easy to login users. With SRP support"; - homepage = "https://GitHub.com/pvizeli/pycognito"; + homepage = "https://github.com/pvizeli/pycognito"; license = licenses.asl20; - maintainers = [ maintainers.mic92 ]; + maintainers = with maintainers; [ mic92 ]; }; } diff --git a/pkgs/development/python-modules/pydanfossair/default.nix b/pkgs/development/python-modules/pydanfossair/default.nix new file mode 100644 index 000000000000..d492923f07ab --- /dev/null +++ b/pkgs/development/python-modules/pydanfossair/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "pydanfossair"; + version = "0.1.0"; + + src = fetchFromGitHub { + owner = "JonasPed"; + repo = "pydanfoss-air"; + rev = "v${version}"; + sha256 = "0950skga7x930whdn9f765x7fi8g6rr3zh99zpzaj8avjdwf096b"; + }; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "pydanfossair" ]; + + meta = with lib; { + description = "Python interface for Danfoss Air HRV systems"; + homepage = "https://github.com/JonasPed/pydanfoss-air"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pytorch/default.nix b/pkgs/development/python-modules/pytorch/default.nix index 145c9a240750..1436153e1db5 100644 --- a/pkgs/development/python-modules/pytorch/default.nix +++ b/pkgs/development/python-modules/pytorch/default.nix @@ -38,6 +38,7 @@ assert !(MPISupport && cudaSupport) || mpi.cudatoolkit == cudatoolkit; assert !cudaSupport || magma.cudatoolkit == cudatoolkit; let + setBool = v: if v then "1" else "0"; cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; # nccl is here purely for semantic grouping it could be moved to nativeBuildInputs @@ -160,16 +161,17 @@ in buildPythonPackage rec { # Use pytorch's custom configurations dontUseCmakeConfigure = true; - BUILD_NAMEDTENSOR = true; - BUILD_DOCS = buildDocs; + BUILD_NAMEDTENSOR = setBool true; + BUILD_DOCS = setBool buildDocs; - USE_MKL = blas.implementation == "mkl"; + # We only do an imports check, so do not build tests either. + BUILD_TEST = setBool false; # Unlike MKL, oneDNN (née MKLDNN) is FOSS, so we enable support for # it by default. PyTorch currently uses its own vendored version # of oneDNN through Intel iDeep. - USE_MKLDNN = mklDnnSupport; - USE_MKLDNN_CBLAS = mklDnnSupport; + USE_MKLDNN = setBool mklDnnSupport; + USE_MKLDNN_CBLAS = setBool mklDnnSupport; preBuild = '' export MAX_JOBS=$NIX_BUILD_CORES @@ -198,7 +200,7 @@ in buildPythonPackage rec { PYTORCH_BUILD_VERSION = version; PYTORCH_BUILD_NUMBER = 0; - USE_SYSTEM_NCCL=useSystemNccl; # don't build pytorch's third_party NCCL + USE_SYSTEM_NCCL=setBool useSystemNccl; # don't build pytorch's third_party NCCL # Suppress a weird warning in mkl-dnn, part of ideep in pytorch # (upstream seems to have fixed this in the wrong place?) diff --git a/pkgs/development/python-modules/sleepyq/default.nix b/pkgs/development/python-modules/sleepyq/default.nix new file mode 100644 index 000000000000..0a335de3177f --- /dev/null +++ b/pkgs/development/python-modules/sleepyq/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, inflection +, requests +}: + +buildPythonPackage rec { + pname = "sleepyq"; + version = "0.8.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1bhzrxpzglfw4qbqfzyxr7dmmavzq4pq0h90jh0aa8vdw7iy7g7v"; + }; + + propagatedBuildInputs = [ + inflection + requests + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "sleepyq" ]; + + meta = with lib; { + description = "Python module for SleepIQ API"; + homepage = "https://github.com/technicalpickles/sleepyq"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/snitun/default.nix b/pkgs/development/python-modules/snitun/default.nix index 901987fbff66..10eada9f0955 100644 --- a/pkgs/development/python-modules/snitun/default.nix +++ b/pkgs/development/python-modules/snitun/default.nix @@ -22,6 +22,8 @@ buildPythonPackage rec { # port binding conflicts "test_snitun_single_runner_timeout" "test_snitun_single_runner_throttling" + # ConnectionResetError: [Errno 54] Connection reset by peer + "test_peer_listener_timeout" ]; meta = with lib; { diff --git a/pkgs/development/python-modules/transformers/default.nix b/pkgs/development/python-modules/transformers/default.nix index 19dcc708651d..c5bd0ad11145 100644 --- a/pkgs/development/python-modules/transformers/default.nix +++ b/pkgs/development/python-modules/transformers/default.nix @@ -8,6 +8,7 @@ , regex , requests , numpy +, packaging , protobuf , sacremoses , tokenizers @@ -25,6 +26,8 @@ buildPythonPackage rec { hash = "sha256-kl1Z2FBo+yqVXUqLaUtet6IycmdcAtfydNTI4MNNrkc="; }; + nativeBuildInputs = [ packaging ]; + propagatedBuildInputs = [ cookiecutter filelock diff --git a/pkgs/development/python-modules/twilio/default.nix b/pkgs/development/python-modules/twilio/default.nix index 56f3ba29ddf1..a010c43e21e2 100644 --- a/pkgs/development/python-modules/twilio/default.nix +++ b/pkgs/development/python-modules/twilio/default.nix @@ -12,19 +12,28 @@ buildPythonPackage rec { pname = "twilio"; - version = "6.51.1"; + version = "6.56.0"; + - # tests not included in PyPi, so fetch from github instead src = fetchFromGitHub { owner = "twilio"; repo = "twilio-python"; rev = version; - sha256 = "sha256-OHtmUFm/9GkpIzz0DdSdlHyBFRIgu8GxQ4S4VMJik9o="; + sha256 = "sha256-vVJuuPxVyOqnplPYrjCjIm5IyIFZvsCMoDLrrHpHK+4="; }; - buildInputs = [ nose mock ]; + propagatedBuildInputs = [ + pyjwt + pysocks + pytz + requests + six + ]; - propagatedBuildInputs = [ pyjwt pysocks pytz six requests ]; + checkInputs = [ + mock + nose + ]; pythonImportsCheck = [ "twilio" ]; diff --git a/pkgs/development/python-modules/wakeonlan/default.nix b/pkgs/development/python-modules/wakeonlan/default.nix index 36689eb13a16..9499254ae4c2 100644 --- a/pkgs/development/python-modules/wakeonlan/default.nix +++ b/pkgs/development/python-modules/wakeonlan/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , poetry-core , pytestCheckHook , pythonOlder @@ -9,7 +8,7 @@ buildPythonPackage rec { pname = "wakeonlan"; - version = "2.0.0"; + version = "2.0.1"; disabled = pythonOlder "3.6"; format = "pyproject"; @@ -17,7 +16,7 @@ buildPythonPackage rec { owner = "remcohaszing"; repo = "pywakeonlan"; rev = version; - sha256 = "0p9jyiv0adcymbnmbay72g9phlbhsr4kmrwxscbdjq81gcmxsi0y"; + sha256 = "sha256-WgoL8ntfEaHcvVbJjdewe0wE31Lq7WBj8Bppeq1uJx8="; }; nativeBuildInputs = [ @@ -28,15 +27,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Switch to poetry-core, https://github.com/remcohaszing/pywakeonlan/pull/19 - (fetchpatch { - name = "switch-to-poetry-core.patch"; - url = "https://github.com/remcohaszing/pywakeonlan/commit/6aa5050ed94ef718dfcd0b946546b6a738f47ee3.patch"; - sha256 = "1xzj2464ziwm7bp05bzbjwjp9whmgp1py3isr41d92qvnil86vm6"; - }) - ]; - pytestFlagsArray = [ "test_wakeonlan.py" ]; pythonImportsCheck = [ "wakeonlan" ]; diff --git a/pkgs/development/tools/air/default.nix b/pkgs/development/tools/air/default.nix index 912328ead267..c058a3fec238 100644 --- a/pkgs/development/tools/air/default.nix +++ b/pkgs/development/tools/air/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "air"; - version = "1.15.1"; + version = "1.25"; src = fetchFromGitHub { owner = "cosmtrek"; repo = "air"; rev = "v${version}"; - sha256 = "0d34k8hyag84j24bhax4gvg8mkzqyhdqd16rfirpfjiqvqh0vdkz"; + sha256 = "sha256-on9Rb+QGFWx7/k9xD+tcaPu6YNaBBkFBHHMSWJbZpWM="; }; - vendorSha256 = "0k28rxnd0vyb6ljbi83bm1gl7j4r660a3ckjxnzc2qzwvfj69g53"; + vendorSha256 = "sha256-B7AgUFjiW3P1dU88u3kswbCQJ7Qq7rgPlX+b+3Pq1L4="; subPackages = [ "." ]; diff --git a/pkgs/development/tools/analysis/rizin/cutter.nix b/pkgs/development/tools/analysis/rizin/cutter.nix index 55795b9830cd..a4c2d0d45c1f 100644 --- a/pkgs/development/tools/analysis/rizin/cutter.nix +++ b/pkgs/development/tools/analysis/rizin/cutter.nix @@ -11,13 +11,13 @@ mkDerivation rec { pname = "cutter"; - version = "2.0.0"; + version = "2.0.1"; src = fetchFromGitHub { owner = "rizinorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "sha256-uIN/NR+swu9Ie0wP2aBhw5WBvTe9NDmzSs+lQMCeavc="; + sha256 = "sha256-IQCJOUgefSdMSa27E6I/CL35Kx5pHq/u+5Q0FHUAR1E="; fetchSubmodules = true; }; diff --git a/pkgs/development/tools/analysis/rizin/default.nix b/pkgs/development/tools/analysis/rizin/default.nix index fdc8da7b5f80..20184ac53a15 100644 --- a/pkgs/development/tools/analysis/rizin/default.nix +++ b/pkgs/development/tools/analysis/rizin/default.nix @@ -18,29 +18,42 @@ , ninja , capstone , tree-sitter +, python3 }: stdenv.mkDerivation rec { pname = "rizin"; - version = "0.1.2"; + version = "0.2.0"; src = fetchurl { - url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-${version}.tar.xz"; - sha256 = "sha256-npUp8wJiKAaQKSigXtndhJLTJ4+pyFqa0FwDLBqR/sE="; + url = "https://github.com/rizinorg/rizin/releases/download/v${version}/rizin-src-v${version}.tar.xz"; + sha256 = "sha256-CGHeo247syha+rVtiAQz0XkEYK9p4DHTnLK2FhBOvE8="; }; mesonFlags = [ - "-Duse_sys_capstone=true" - "-Duse_sys_magic=true" - "-Duse_sys_libzip=true" - "-Duse_sys_zlib=true" - "-Duse_sys_xxhash=true" - "-Duse_sys_lz4=true" - "-Duse_sys_openssl=true" - "-Duse_sys_tree_sitter=true" + "-Duse_sys_capstone=enabled" + "-Duse_sys_magic=enabled" + "-Duse_sys_libzip=enabled" + "-Duse_sys_zlib=enabled" + "-Duse_sys_xxhash=enabled" + "-Duse_sys_lz4=enabled" + "-Duse_sys_openssl=enabled" + "-Duse_sys_tree_sitter=enabled" ]; - nativeBuildInputs = [ pkg-config meson ninja cmake ]; + nativeBuildInputs = [ pkg-config meson ninja cmake (python3.withPackages (ps: [ ps.setuptools ])) ]; + + # meson's find_library seems to not use our compiler wrapper if static paraemter + # is either true/false... We work around by also providing LIBRARY_PATH + preConfigure = '' + LIBRARY_PATH="" + for b in ${toString (map lib.getLib buildInputs)}; do + if [[ -d "$b/lib" ]]; then + LIBRARY_PATH="$b/lib''${LIBRARY_PATH:+:}$LIBRARY_PATH" + fi + done + export LIBRARY_PATH + ''; buildInputs = [ file diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index 441254ce263c..e181917c417a 100644 --- a/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -1,19 +1,23 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "bazel-buildtools"; - version = "3.5.0"; - - goPackagePath = "github.com/bazelbuild/buildtools"; + version = "4.0.1"; src = fetchFromGitHub { owner = "bazelbuild"; repo = "buildtools"; rev = version; - sha256 = "179k0kwh7i2azkhk8dw7ac50a05q7n3i29pqaf69yw7jrpbf8k85"; + sha256 = "0q7b9zh38vblqs5lwhjk28km89p706aky4wv6bwz2vg9gl6bfclq"; }; - goDeps = ./deps.nix; + vendorSha256 = "1w6i1lb72mfdyb901gpl9yc6ql73j5kik6li0j5jv5ab2m3j9qvf"; + + preBuild = '' + rm -r warn/docs + ''; + + doCheck = false; excludedPackages = [ "generatetables" ]; diff --git a/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix b/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix deleted file mode 100644 index a64f96d2c072..000000000000 --- a/pkgs/development/tools/build-managers/bazel/buildtools/deps.nix +++ /dev/null @@ -1,20 +0,0 @@ -[ - { - goPackagePath = "github.com/golang/protobuf"; - fetch = { - type = "git"; - url = "https://github.com/golang/protobuf"; - rev = "84668698ea25b64748563aa20726db66a6b8d299"; - sha256 = "1gkd1942vk9n8kfzdwy1iil6wgvlwjq7a3y5jc49ck4lz9rhmgkq"; - }; - } - { - goPackagePath = "go.starlark.net"; - fetch = { - type = "git"; - url = "https://github.com/google/starlark-go"; - rev = "6677ee5c7211380ec7e6a1b50dc45287e40ca9e1"; - sha256 = "1dl8q1lwvmm38w2lzfwray2djdcq40z89yy6vzy387w0xrax0jj0"; - }; - } -] diff --git a/pkgs/development/tools/clpm/default.nix b/pkgs/development/tools/clpm/default.nix index 0dfa99367ac6..ae2e1011ae25 100644 --- a/pkgs/development/tools/clpm/default.nix +++ b/pkgs/development/tools/clpm/default.nix @@ -2,7 +2,7 @@ , stdenv , fetchgit , wrapLisp -, sbcl +, sbcl_2_0_9 , openssl }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - (wrapLisp sbcl) + (wrapLisp sbcl_2_0_9) openssl ]; diff --git a/pkgs/development/tools/github-commenter/default.nix b/pkgs/development/tools/github-commenter/default.nix index 05784c47eff1..b1c247c70f97 100644 --- a/pkgs/development/tools/github-commenter/default.nix +++ b/pkgs/development/tools/github-commenter/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "github-commenter"; - version = "0.8.0"; + version = "0.9.0"; src = fetchFromGitHub { owner = "cloudposse"; repo = pname; rev = version; - sha256 = "HgiCgyig+49g275G6zZ0kGTxt1TSfFK8kt+SOf4ei74="; + sha256 = "sha256-IBo4FAoYX1FmrmQ9mlyyu1TGLY7dlH7pWalBoRb2puE="; }; - vendorSha256 = "Gw+cR5sA5MGuclcvur8olmRtK04LDP5vKJ5k7yZO3B0="; + vendorSha256 = "sha256-H1SnNG+/ALYs7h/oT8zWBhAXOuCFY0Sto2ATBBZg2ek="; meta = with lib; { description = "Command line utility for creating GitHub comments on Commits, Pull Request Reviews or Issues"; diff --git a/pkgs/development/tools/jbang/default.nix b/pkgs/development/tools/jbang/default.nix index de3672df3d9d..dfef3906602c 100644 --- a/pkgs/development/tools/jbang/default.nix +++ b/pkgs/development/tools/jbang/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, fetchzip, jdk, makeWrapper, coreutils, curl }: stdenv.mkDerivation rec { - version = "0.69.2"; + version = "0.70.0"; pname = "jbang"; src = fetchzip { url = "https://github.com/jbangdev/jbang/releases/download/v${version}/${pname}-${version}.tar"; - sha256 = "sha256-MsVmsZOupkJWGyoTxxQavcO78X4MMuIqJXaPSbd/Tgg="; + sha256 = "sha256-Fy7TvWJVRJI5fhfZzMuW+KBLaVLWKjk/I3Kx60Wazyo="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 0cf98d651c5b..4128118decf6 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -13,19 +13,29 @@ let ccache = stdenv.mkDerivation rec { pname = "ccache"; - version = "4.2"; + version = "4.2.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "1lr9804xyzbs72f9jbbzy1fjqxwrwpb4rp431wqialvms4251d8f"; + hash = "sha256-AmgJpW7AGCSggbHp1fLO5yhXS9LIm7O77nQdDERJYAA="; }; - patches = lib.optional stdenv.isDarwin (substituteAll { - src = ./force-objdump-on-darwin.patch; - objdump = "${binutils.bintools}/bin/objdump"; - }); + patches = [ + # test/run use compgen to get environment variable names, but + # compgen isn't available in non-interactive bash. + ./env-instead-of-compgen.patch + + # When building for Darwin, test/run uses dwarfdump, whereas on + # Linux it uses objdump. We don't have dwarfdump packaged for + # Darwin, so this patch updates the test to also use objdump on + # Darwin. + (substituteAll { + src = ./force-objdump-on-darwin.patch; + objdump = "${binutils.bintools}/bin/objdump"; + }) + ]; nativeBuildInputs = [ asciidoc cmake perl ]; @@ -38,7 +48,7 @@ let ccache = stdenv.mkDerivation rec { checkPhase = '' export HOME=$(mktemp -d) ctest --output-on-failure ${lib.optionalString stdenv.isDarwin '' - -E '^(test.nocpp2|test.modules)$' + -E '^(test.nocpp2|test.basedir|test.multi_arch)$' ''} ''; diff --git a/pkgs/development/tools/misc/ccache/env-instead-of-compgen.patch b/pkgs/development/tools/misc/ccache/env-instead-of-compgen.patch new file mode 100644 index 000000000000..313de0fa58c3 --- /dev/null +++ b/pkgs/development/tools/misc/ccache/env-instead-of-compgen.patch @@ -0,0 +1,18 @@ +diff --git a/test/run b/test/run +index cbdd98f0..bc930200 100755 +--- a/test/run ++++ b/test/run +@@ -346,11 +346,11 @@ expect_perm() { + } + + reset_environment() { +- while IFS= read -r name; do ++ while IFS='=' read -r name value; do + if [[ $name =~ ^CCACHE_[A-Z0-9_]*$ ]]; then + unset $name + fi +- done < <(compgen -e) ++ done < <(env) + + unset GCC_COLORS + unset TERM diff --git a/pkgs/development/tools/misc/openfpgaloader/default.nix b/pkgs/development/tools/misc/openfpgaloader/default.nix index 9537e11e1127..1e3b3469dca3 100644 --- a/pkgs/development/tools/misc/openfpgaloader/default.nix +++ b/pkgs/development/tools/misc/openfpgaloader/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "openfpgaloader"; - version = "0.2.5"; + version = "0.2.6"; src = fetchFromGitHub { owner = "trabucayre"; repo = "openFPGALoader"; rev = "v${version}"; - sha256 = "sha256-Qbw+vmpxiZXTGM0JwpS5mGzcsSJNegsvmncm+cOVrVE="; + sha256 = "sha256-OWRMWNOPm6flgeTKYWYE+LcG3HW6i8s2NQ1dr/oeOEw="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/pkgs/development/tools/ocaml/ocp-indent/default.nix b/pkgs/development/tools/ocaml/ocp-indent/default.nix index 675f66dcf474..2d52cda7cbdb 100644 --- a/pkgs/development/tools/ocaml/ocp-indent/default.nix +++ b/pkgs/development/tools/ocaml/ocp-indent/default.nix @@ -4,6 +4,8 @@ buildDunePackage rec { version = "1.8.2"; pname = "ocp-indent"; + useDune2 = true; + src = fetchzip { url = "https://github.com/OCamlPro/ocp-indent/archive/${version}.tar.gz"; sha256 = "1dvcl108ir9nqkk4mjm9xhhj4p9dx9bmg8bnms54fizs1x3x8ar3"; diff --git a/pkgs/development/tools/rust/cargo-deny/default.nix b/pkgs/development/tools/rust/cargo-deny/default.nix index 73e3cfd3c4ce..955df96b2284 100644 --- a/pkgs/development/tools/rust/cargo-deny/default.nix +++ b/pkgs/development/tools/rust/cargo-deny/default.nix @@ -7,16 +7,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-deny"; - version = "0.9.0"; + version = "0.9.1"; src = fetchFromGitHub { owner = "EmbarkStudios"; repo = pname; rev = version; - sha256 = "sha256-ZjXAZN93ij42WVYSOgvKAzFZ/cZ2RTFKT2sr44j7TVc="; + sha256 = "sha256-v7Gdemn0IeO6lOg/kT6VKuL5ZSOqA9A721Wv5QStO2Q="; }; - cargoSha256 = "sha256-eQv9pFegHTjjjFURiD/yN/srtONAwAH3vwfrSY/LM/Q="; + cargoSha256 = "sha256-SF7LfxmUMX7f+9BmYTzdjTFplXj5j0e181yRVTIEGH4="; doCheck = false; diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index f5677b142e28..54e1646fcae5 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -3,14 +3,14 @@ let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "2.1.40"; + version = "2.1.43"; unpacked = stdenv.mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux.tar.bz2"; - sha256 = "0zcvjm0dv3mjln2npv415yfaa1fykif738qkis52x3pq1by2aiam"; + sha256 = "0kadv3fxi76h7xxmb4lckkgcwiv0b7cn630l62dxa2abxibans29"; }; installPhase = '' @@ -49,7 +49,7 @@ if stdenv.isLinux then buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // { src = fetchurl { url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac.dmg"; - sha256 = "14f0sp9h963qix4wa0kg7z8a2nhch9aybv736rm55aqk6mady6vi"; + sha256 = "0vvgiybq1ygq7cly1r4ircgzg2cpprindr7nnlbnrmandjy2kw49"; }; nativeBuildInputs = [ undmg ]; diff --git a/pkgs/games/r2mod_cli/default.nix b/pkgs/games/r2mod_cli/default.nix index f45dd3948626..4cdca333d7f7 100644 --- a/pkgs/games/r2mod_cli/default.nix +++ b/pkgs/games/r2mod_cli/default.nix @@ -1,4 +1,5 @@ { fetchFromGitHub +, bashInteractive , jq , makeWrapper , p7zip @@ -16,6 +17,8 @@ stdenv.mkDerivation rec { sha256 = "0as3nl9qiyf9daf2n78lyish319qclf2gbhr20mdd5wnqmxpk276"; }; + buildInputs = [ bashInteractive ]; + nativeBuildInputs = [ makeWrapper ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/misc/emulators/yapesdl/default.nix b/pkgs/misc/emulators/yapesdl/default.nix new file mode 100644 index 000000000000..307068cde045 --- /dev/null +++ b/pkgs/misc/emulators/yapesdl/default.nix @@ -0,0 +1,41 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, SDL2 +}: + +stdenv.mkDerivation rec { + pname = "yapesdl"; + version = "0.70.2"; + + src = fetchFromGitHub { + owner = "calmopyrin"; + repo = pname; + rev = "v${version}"; + hash = "sha256-51P6wNaSfVA3twu+yRUKXguEmVBvuuEnHxH1Zl1vsCc="; + }; + + nativeBuildInputs = [ + pkg-config + ]; + buildInputs = [ + SDL2 + ]; + + installPhase = '' + runHook preInstall + install --directory $out/bin $out/share/doc/$pname + install yapesdl $out/bin/ + install README.SDL $out/share/doc/$pname/ + runHook postInstall + ''; + + meta = with lib; { + homepage = "http://yape.plus4.net/"; + description = "Multiplatform Commodore 64 and 264 family emulator"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ AndersonTorres ]; + platforms = platforms.unix; + }; +} diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 20b72a0c7ff2..55794fbaf540 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-04-07"; + version = "2021-04-10"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "f0887d3e6178482255f11aa378124aef3699245f"; - sha256 = "0kyfvpwfy4x7mnyb0v8cnjb9byjdj48czd3mzkd1yfpdmz4wgxsg"; + rev = "686c8c5e0acbf3cbf50f1b11eafadd759b017f4a"; + sha256 = "1bwv9yzvlj7ab0ybjrdjhhhqwmg1hjld9m2kb1hq8mgvdc9rsa4c"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -101,12 +101,12 @@ let ansible-vim = buildVimPluginFrom2Nix { pname = "ansible-vim"; - version = "2021-02-20"; + version = "2021-04-11"; src = fetchFromGitHub { owner = "pearofducks"; repo = "ansible-vim"; - rev = "de933417e5d37b10d1834095fcd0a1c8c360d34a"; - sha256 = "1fwjpkzkpwy808949iqbsgi6kxyglfyzr1d5hc1911vbayn8wyjy"; + rev = "bc9c3bf48961f5babb24243bd407c715ce551210"; + sha256 = "1pvjjxw3nz3s11f83rbmdhad5rvks0q2am09sfxns0x4rwiwcyrk"; }; meta.homepage = "https://github.com/pearofducks/ansible-vim/"; }; @@ -209,12 +209,12 @@ let auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2021-04-07"; + version = "2021-04-09"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "f6cfd92e96e9efb7e3e5249a4e45054fb7dc629b"; - sha256 = "04771631jgm4f76vpmp5mwwf0nidvbw345ajk3nl5xd8lsq9zp3w"; + rev = "49e2a0ef443eb0578c2b884a7b85f9f4e4c08fde"; + sha256 = "1xsb3346qgggpzfln3z1skk4d4hvss3qfck0h5ylpbcbh3f8dxyb"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -389,12 +389,12 @@ let chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-04-08"; + version = "2021-04-11"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "012e3f21bf60858308db77f68ef3ee83a333587c"; - sha256 = "1q6f0z0mnwg43ri4dzpdzx8n88hr1j32hp3x06zsmfq47rlf4iij"; + rev = "ce6ff8e0f321b1fb3bfd4befaeeb9c97521eba9b"; + sha256 = "0bl914jyw84ya9hay50jk7zdqiw7raxnr2zq8iz6kz8s1zh8r928"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -894,12 +894,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2021-04-08"; + version = "2021-04-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "981804894051a6006b9337978a4f939a46b0c254"; - sha256 = "05a9cv86qazfgpm4nhw6x9pvpj646i7n9jsbk6qn9jmrq7rm0whp"; + rev = "94a655cd9993b152feb6de4d6168d234d4b3f14b"; + sha256 = "0kram585pmj88gvfs71k50lgawg87qbiisw0plzp41hjrgs0ymkz"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1268,12 +1268,12 @@ let echodoc-vim = buildVimPluginFrom2Nix { pname = "echodoc-vim"; - version = "2021-02-23"; + version = "2021-04-11"; src = fetchFromGitHub { owner = "Shougo"; repo = "echodoc.vim"; - rev = "af235aaaa74f41cd83181a16b9f17c16e56afc47"; - sha256 = "1jzn7w6rv2bl1m4aqm716flg28jdjsgkikfjjjiz4if5vjsfj0lw"; + rev = "da1704818a342c4ad17abdc6886836ae61aa6b2a"; + sha256 = "0k1gzajn335518vz1ga957i91pfb04bmhhmzc96l617qdkp3ij30"; }; meta.homepage = "https://github.com/Shougo/echodoc.vim/"; }; @@ -1547,12 +1547,12 @@ let galaxyline-nvim = buildVimPluginFrom2Nix { pname = "galaxyline-nvim"; - version = "2021-04-05"; + version = "2021-04-10"; src = fetchFromGitHub { owner = "glepnir"; repo = "galaxyline.nvim"; - rev = "505bd8a2912f75b3c9cc439db3bd31ae514230cd"; - sha256 = "0w2prdcp48z15r9j9z20y6kgasnzjhfk0d3pig560ifk0x33n4ba"; + rev = "cbf64bd4869c810b92f6450ed8763456c489be87"; + sha256 = "0c7xgracnl92psc5b7m90ys9v5p20hipli8q797r495r59wnza20"; }; meta.homepage = "https://github.com/glepnir/galaxyline.nvim/"; }; @@ -1607,12 +1607,12 @@ let git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame-nvim"; - version = "2021-03-18"; + version = "2021-04-10"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "c6515f6de67f50448a0f865b39c3c459b40856f5"; - sha256 = "1cm6x58qm5jzgncrpwixcvs7cfdv02gf13zz1v4gxicxlllrh70f"; + rev = "bcfb85765903865fbe0a47682ed66dfc51bbcf28"; + sha256 = "1zc6bsli8bpks3c23vpia38nr02mncmnldwvhip1hghphnf3crwr"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -1643,12 +1643,12 @@ let gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-04-06"; + version = "2021-04-10"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "5be4faafe18dc808878e127d69b9cd1883b03bee"; - sha256 = "0k0z9bgrcidk8m1lckh3kkz0i6w6whrlc22v4vf8yfkqa8g7vai1"; + rev = "bfd9dcd323e7ec35f34407fc3cfd5700400c88af"; + sha256 = "0w05afpbys8mkqzl13ygzh9c3rcml9q746v3snl2vamm3fjyhmzn"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2076,24 +2076,24 @@ let julia-vim = buildVimPluginFrom2Nix { pname = "julia-vim"; - version = "2021-04-08"; + version = "2021-04-10"; src = fetchFromGitHub { owner = "JuliaEditorSupport"; repo = "julia-vim"; - rev = "d589986c9dbb95ef08a1f5a01197fd43687e7031"; - sha256 = "04hrc9wgdk0rjzx23dhnvjyybkpa7m8lf4p7cqmg5sdhlahqicjr"; + rev = "b04bdfee67a62e225fb36aa49a4806bb8c74b5aa"; + sha256 = "0cq58f634qp67xbfd4hwbg8wm2pq2wk05cp2dn6ja2k5vnqymn99"; }; meta.homepage = "https://github.com/JuliaEditorSupport/julia-vim/"; }; kotlin-vim = buildVimPluginFrom2Nix { pname = "kotlin-vim"; - version = "2021-03-11"; + version = "2021-04-11"; src = fetchFromGitHub { owner = "udalov"; repo = "kotlin-vim"; - rev = "4e94ec5d3c821daaeac40c4d243cb55d07924fd2"; - sha256 = "1vj3pcxn1byggbfqv2k5m09cwpbsphivdbzpw8qs111hda0cv61s"; + rev = "ea258abc437d3615236d72c8b354de39b409a249"; + sha256 = "1r6wc5nnx6lxc7cyxp5dwzwxgmdrqzxl63m0807sl69rgl2444rq"; }; meta.homepage = "https://github.com/udalov/kotlin-vim/"; }; @@ -2304,12 +2304,12 @@ let lsp-status-nvim = buildVimPluginFrom2Nix { pname = "lsp-status-nvim"; - version = "2021-04-03"; + version = "2021-04-09"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "lsp-status.nvim"; - rev = "60a3ad9dc2f43e0e512c242411541846a86eb7de"; - sha256 = "08x8k06i6gl802fsp4sgvdcml35n4hnljwwxsgfyzwlcwx9llxlw"; + rev = "7c376c3924d4f807d6ce49450fdeaa18720349c9"; + sha256 = "0lf71qxg9hs3r4nwsla085fk5jkqzppj2r57w9imz4wqzb201bd7"; }; meta.homepage = "https://github.com/nvim-lua/lsp-status.nvim/"; }; @@ -2340,24 +2340,24 @@ let lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga-nvim"; - version = "2021-03-28"; + version = "2021-04-09"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "27c7a4796869e155ecec48eb3f8e66694c1708e2"; - sha256 = "1kdj6b7ph4111spwr55d6a0jjyrr18fbxyl3yi2nb5h75vm2hisj"; + rev = "b77a08be564ccba4bd8c68cca89aa87e5520b3c3"; + sha256 = "0hwngd27cdfbcw8l8x4ri93749v5r6z3q9s5h6av27zdb4gbvddd"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-04-08"; + version = "2021-04-11"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "2b32fb090fa09d68e8e5a222646979fa1d54f899"; - sha256 = "0vkskwgi8vw06j9nv97ndwli3xrvgd4sl046yk3xf3x3ph890wpj"; + rev = "1b81b0021fa133ef6536faacb1789f170b9b4721"; + sha256 = "055hw2z4h24gy74x2svkd0kgcyzdkscbpvcz867ar9f9r9cdf7ah"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; @@ -2436,12 +2436,12 @@ let mkdx = buildVimPluginFrom2Nix { pname = "mkdx"; - version = "2021-04-08"; + version = "2021-04-09"; src = fetchFromGitHub { owner = "SidOfc"; repo = "mkdx"; - rev = "186cf8cf96777ebdc4976c2de08e7b62a248d2da"; - sha256 = "01clzfnk86acpm24kfz3xwsy4xcqbx8ar4n0i1i6vvn8hq602mbv"; + rev = "7fc33a899acfbc172d8e12059c1ca18696346a89"; + sha256 = "05fhqvr9pinw6zfbjcdbm31c27wd94z7nyzp9f4vi8m1yhp4h6mk"; }; meta.homepage = "https://github.com/SidOfc/mkdx/"; }; @@ -2988,12 +2988,12 @@ let nvcode-color-schemes-vim = buildVimPluginFrom2Nix { pname = "nvcode-color-schemes-vim"; - version = "2021-04-07"; + version = "2021-04-09"; src = fetchFromGitHub { owner = "ChristianChiarulli"; repo = "nvcode-color-schemes.vim"; - rev = "383aed3efefb81168a607012006fb4bdcf918956"; - sha256 = "1mbzcb9iqjia6mwfkznm8bh3c5mvsfnz2ysrvhhr3143nh71m2np"; + rev = "90ee71d66da58d57f0cb4a59103874bb519c79d4"; + sha256 = "0sabb0iyrmfwfld57d1mf44k69bf8pk0c1ilfi3vz2hz04imxgab"; }; meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; @@ -3072,12 +3072,12 @@ let nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-04-08"; + version = "2021-04-09"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "e2f1caba42f5b1af07ef9d729ae75d74855ac5d4"; - sha256 = "0xk8hm3m8aywky7p2jm36a9sf495pa52lixmp14c7qj2s0wrki1c"; + rev = "f167a1384c47d7eb632eb27e90cdf7dfdb7169ff"; + sha256 = "1ggwfl8w85di63skxpm75gm3arbhlph9bv6iyiws9c0x79zf5c8j"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3096,12 +3096,12 @@ let nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-04-07"; + version = "2021-04-10"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "06e201849605dabf5dd28f972d2b7c507a8aff1f"; - sha256 = "19mk9r2h491gqf0q9jv3yrlznfxwfz2q4h7jqq6yai740nx5yhzj"; + rev = "855b507a3c3608b181c761fd10beb1a4a073e0fb"; + sha256 = "15qnhf1hs8xb97xi21z1g222v77gfbvrcha588rb692qvwxsrwfr"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -3192,12 +3192,12 @@ let nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-04-06"; + version = "2021-04-10"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "225859876bb8f9df7417f008ca790e0b2753eeab"; - sha256 = "0ca67kb4706adihsyk6gdx0rf8wslw1ph82dprszpqla2gf1gqjn"; + rev = "8924812e0d114b67dca376533bef2ac5bb054f8b"; + sha256 = "1dlx2bhvsdm9s5ivpkw5ikhkw6b99zng4p9qdh8ki49f644w5jsr"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3276,36 +3276,36 @@ let nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-04-06"; + version = "2021-04-08"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "bbb8d6070f2a35ae85d1790fa3f8fff56c06d4ec"; - sha256 = "0xsvbpq8sygl6d8nkw4vaj20bdnrx1x97sjr8y4p76kmqqrch09s"; + rev = "82b20f5b5ed741d2e6360990ee11a50f0cd253a4"; + sha256 = "0il4z9ch5jmrwp5c51lxgrj8w3d5av3z5pkwjclh8gwpvm7siwvr"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-04-08"; + version = "2021-04-10"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "1f00ecdfa36ef5e43a4feaf189e8c2c003118c00"; - sha256 = "1fidjwl7w1msg38b470cahjblcy7lgg885wbmswl380kf9c8118l"; + rev = "615afe3541eec0b338b4ff5b6738f69c7f6f8860"; + sha256 = "14n9q9fnfys8vj7m4fbngybcz9f2vzr8f67r5m7nd3lljn2389dg"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2021-04-03"; + version = "2021-04-09"; src = fetchFromGitHub { owner = "romgrk"; repo = "nvim-treesitter-context"; - rev = "5bc62fd2b09f4ddaf8d300c63d79140789797020"; - sha256 = "1p97llbki41mwicsmqdly6lns7vfn9pgd961jpc980pj0df792gq"; + rev = "6855cc725ee7d98dff00886d22d687ef7ba82c4f"; + sha256 = "1y2vpgmc2c2fpdxfpxlmz69f36wnp9q0yff6cidal61xaj28w71w"; }; meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/"; }; @@ -3336,12 +3336,12 @@ let nvim-ts-rainbow = buildVimPluginFrom2Nix { pname = "nvim-ts-rainbow"; - version = "2021-04-08"; + version = "2021-04-09"; src = fetchFromGitHub { owner = "p00f"; repo = "nvim-ts-rainbow"; - rev = "97798465743459cb5f7d82e54c693bebc84e73f8"; - sha256 = "0wibgcrpxb5hqbjig1sgisnxik0f8wv7ap4l2xv5mhwm8yz6x4gn"; + rev = "445c02bb35e350df733af3ec70a0a7dea5dbcf43"; + sha256 = "0sh23vfk30492agc0a8jlcsksgw2ny0s3ngmxxy60xs8j4dpfhjs"; }; meta.homepage = "https://github.com/p00f/nvim-ts-rainbow/"; }; @@ -3552,36 +3552,36 @@ let plantuml-syntax = buildVimPluginFrom2Nix { pname = "plantuml-syntax"; - version = "2020-07-03"; + version = "2021-04-08"; src = fetchFromGitHub { owner = "aklt"; repo = "plantuml-syntax"; - rev = "eb3df3092a767c844db3f3ff355da840abd0aa97"; - sha256 = "02psvyxli5gs2cx2sha33mk98ivllb8zr1jwgv4hgi5bh6qd7wg3"; + rev = "a26961c0b729c6ec4d40a08d30e1c4256964744b"; + sha256 = "1llrk17iihb80lnag136sy5vayqp2zd4imh3hp7msbns8dvp3hfy"; }; meta.homepage = "https://github.com/aklt/plantuml-syntax/"; }; playground = buildVimPluginFrom2Nix { pname = "playground"; - version = "2021-03-22"; + version = "2021-04-11"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "playground"; - rev = "d96cef521d22afd1a409449a890f20f50b436ee1"; - sha256 = "1j1iqzi9q8fnl02hvazl8szg84iz8dqy0n52ngh1lvl78s9qa393"; + rev = "1bf0f79cb461b11196cc9f419763be3373db2848"; + sha256 = "15b1lszshsf9jz2lb3q2045pjpjig3a6nkz9zvvjh7gwh6xywlv4"; }; meta.homepage = "https://github.com/nvim-treesitter/playground/"; }; plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-04-08"; + version = "2021-04-10"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "d0d291f87bed757f6be05c8bf753cb0e9602a478"; - sha256 = "0xjz85yzcvxd0dynygxdb1b9jkzmy1m52s4rc5w67jidqc7hs8ii"; + rev = "a3276a4752e66a2264988a171d06433b104c9351"; + sha256 = "005xf3g9b38x6b29q9csbr2yyxvpw6f3nr6npygr65a2z4f1cjak"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -3793,12 +3793,12 @@ let registers-nvim = buildVimPluginFrom2Nix { pname = "registers-nvim"; - version = "2021-04-07"; + version = "2021-04-10"; src = fetchFromGitHub { owner = "tversteeg"; repo = "registers.nvim"; - rev = "105200aea2edd8c7ba995a76789a03e7dab83a85"; - sha256 = "0vvr1mdrnybgrbvs7r5yrzwab35viz488gyibzdjl3b5wisxqwxh"; + rev = "0a437a3831b4fdaf370c664f54653dcc5aea71fc"; + sha256 = "00q49377fwgy7f6fqqarqwq5m2aqx1clrq63zla72ghai66kmfhc"; }; meta.homepage = "https://github.com/tversteeg/registers.nvim/"; }; @@ -3877,12 +3877,12 @@ let rust-tools-nvim = buildVimPluginFrom2Nix { pname = "rust-tools-nvim"; - version = "2021-04-08"; + version = "2021-04-11"; src = fetchFromGitHub { owner = "simrat39"; repo = "rust-tools.nvim"; - rev = "ea210456f8eac176822c8777619d2f05797dc708"; - sha256 = "14ygid112wwpgf429j1i65k72a1bn3pd6b7c1vpvyvvzdyfwnhiw"; + rev = "7f5295d3ec13d4d2769092a9e3dc849d56e6a7e7"; + sha256 = "0xzi6p895l7hmqpp0lqnn6a85fb5795i582fiahbvn4nkpsksk0s"; }; meta.homepage = "https://github.com/simrat39/rust-tools.nvim/"; }; @@ -3985,12 +3985,12 @@ let sideways-vim = buildVimPluginFrom2Nix { pname = "sideways-vim"; - version = "2021-03-21"; + version = "2021-04-10"; src = fetchFromGitHub { owner = "AndrewRadev"; repo = "sideways.vim"; - rev = "171d6a39eb46973b229aaf1d88691e40d45f64ad"; - sha256 = "097f0il1dcn2kshsngvklgwlhac86cjwxxagqvcz3yiaa1qpzhlp"; + rev = "a36b8f129e99becc5e00ee3267695f62c3937a2f"; + sha256 = "0sk8xkqi3bciqwdd71z51mrx4dhy2i5nrf0b1c1xbzxbg3vkbvc3"; }; meta.homepage = "https://github.com/AndrewRadev/sideways.vim/"; }; @@ -4057,12 +4057,12 @@ let sonokai = buildVimPluginFrom2Nix { pname = "sonokai"; - version = "2021-03-22"; + version = "2021-04-10"; src = fetchFromGitHub { owner = "sainnhe"; repo = "sonokai"; - rev = "78f1b14ad18b043eb888a173f4c431dbf79462d8"; - sha256 = "0spnpzr874ad9jpawcgydfm242wq55ychcky14f1qa09svsrdiv0"; + rev = "7a89d2d7ab1d8a92d137cdb358e7c5d661e7ceb3"; + sha256 = "0yk79151fwbjdf2sy5ri2gg58g052y31dml9ilbwdq7f4jncgljk"; }; meta.homepage = "https://github.com/sainnhe/sonokai/"; }; @@ -4407,12 +4407,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-04-08"; + version = "2021-04-09"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "64e59060b1750d0c86761693b6847c3db07afcd2"; - sha256 = "0racv0zqklfn3dh7jvkw8hx9rh85mkrljixjh528h12qfv53arw7"; + rev = "5bd6f5ca9828ea02f2c54d616ad65c72a5cdd7fb"; + sha256 = "0h47x7nqhr3wvxspymvgbyngqickvbxg13l1j525f3y68j4b2arg"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -4588,12 +4588,12 @@ let ultisnips = buildVimPluginFrom2Nix { pname = "ultisnips"; - version = "2021-04-03"; + version = "2021-04-11"; src = fetchFromGitHub { owner = "SirVer"; repo = "ultisnips"; - rev = "b974a13328071de45a85c62ab65c8bfed0142728"; - sha256 = "1p93dmmprn415y8z44fl697wvh446w7dpskniissxwq4hfyqqgxh"; + rev = "3ccb1a7e75b31add82730f3b95c2be5c130b7ce4"; + sha256 = "0rhkpzz0ss8sb6jf3ygvavygmqiy8a418685izanvyplwhqi5zy4"; }; meta.homepage = "https://github.com/SirVer/ultisnips/"; }; @@ -5656,12 +5656,12 @@ let vim-elixir = buildVimPluginFrom2Nix { pname = "vim-elixir"; - version = "2021-03-01"; + version = "2021-04-10"; src = fetchFromGitHub { owner = "elixir-editors"; repo = "vim-elixir"; - rev = "527e6fd8798638a79621e0b5c788b67b2b4b4dbc"; - sha256 = "02ncqbxlncm9gz7dvxv6lv9zsnfhqmqq05m95lh95l3lm0gs44ph"; + rev = "5a1811c3c70adeee42d9dc5faae1cba1d57461f9"; + sha256 = "03cqsv2y1zns2sj6i9afxb4yjnzd42nmwijdlbwbqnnjp03xq1ns"; }; meta.homepage = "https://github.com/elixir-editors/vim-elixir/"; }; @@ -5920,12 +5920,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-04-07"; + version = "2021-04-11"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "8ede0aaf57e1dbb5416ddbe30d0bfdde762e90bf"; - sha256 = "1aa7cqkp2pkpn175y67gfjbd0p3jxca42n7iysykzi9hcgkshqm2"; + rev = "94bc89da0fe7083cfda9c1585f3fafb106692769"; + sha256 = "17gy7yiipr5ql888z4zg1la93c8jjgyw7sc7kshvric5906bsxl3"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -6317,12 +6317,12 @@ let vim-illuminate = buildVimPluginFrom2Nix { pname = "vim-illuminate"; - version = "2021-03-31"; + version = "2021-04-09"; src = fetchFromGitHub { owner = "RRethy"; repo = "vim-illuminate"; - rev = "43bccb5ceb400fd0cb8c2903f9d174d1bc8b64d4"; - sha256 = "07cg09vzqpyg3ql8vl3gvr1sy0bzw55xwbhhipbpz2127a92pk00"; + rev = "fe491924a7cf08bd839236a74f0c39bf0abf0fd2"; + sha256 = "0c6vqfwrbw0z036y41kf03syixnp58g1pwghm1d7frz2adn6mlvb"; }; meta.homepage = "https://github.com/RRethy/vim-illuminate/"; }; @@ -6785,6 +6785,18 @@ let meta.homepage = "https://github.com/euclio/vim-markdown-composer/"; }; + vim-markdown-toc = buildVimPluginFrom2Nix { + pname = "vim-markdown-toc"; + version = "2021-03-02"; + src = fetchFromGitHub { + owner = "mzlogin"; + repo = "vim-markdown-toc"; + rev = "b7bb6c37033d3a6c93906af48dc0e689bd948638"; + sha256 = "026xf2gid4qivwawh7if3nfk7zja9di0flhdzdx82lvil9x48lyz"; + }; + meta.homepage = "https://github.com/mzlogin/vim-markdown-toc/"; + }; + vim-matchup = buildVimPluginFrom2Nix { pname = "vim-matchup"; version = "2021-04-03"; @@ -7495,12 +7507,12 @@ let vim-racket = buildVimPluginFrom2Nix { pname = "vim-racket"; - version = "2020-07-24"; + version = "2021-04-11"; src = fetchFromGitHub { owner = "wlangstroth"; repo = "vim-racket"; - rev = "bca2643c3d8bd0fcd46ab73bee69023a5da1964b"; - sha256 = "059a79d66yxhhwq127sjl84ky1153im7mm5ixjcsgg9glgvd39jy"; + rev = "32ad23165c96d05da7f3b9931d2889b7e39dcb86"; + sha256 = "1yyqx471p11vj6gya4yzkiy07vfwzpx10bf6s7dh2h7zp2nz10br"; }; meta.homepage = "https://github.com/wlangstroth/vim-racket/"; }; @@ -8228,12 +8240,12 @@ let vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2021-03-24"; + version = "2021-04-10"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "b36abe2613191912e12b9562b209f157a8b927de"; - sha256 = "1ly3iy1c05ry7yfsph0rribiagcyw07daj2dbfj0la3pbfmvip24"; + rev = "be39204b64ac6d285d735166b94a28c218f1e4bc"; + sha256 = "0ghw3vzk6rjw5sfahrhfiisvm38zvn67ddvqg7l1h3hq411i0f2g"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -8636,12 +8648,12 @@ let vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2021-04-07"; + version = "2021-04-09"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "7d83419a4f813aee826eee994b8e419b6ff102b0"; - sha256 = "05xlpf3rm54kb6vxkm4gngbxabd58736najdawjxf8y7b6ajv39z"; + rev = "6709b45c770dca735265ef8d5e30f9f4e602cfd0"; + sha256 = "0ddgyhlrvij630fyx8hx63xk8qqmskgbx1iwjhazhifrflm9gcw7"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -8649,24 +8661,24 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-04-07"; + version = "2021-04-11"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "83b8e2998c6f0554b7eb4a04cfe783b8eab86c88"; - sha256 = "08k9in6xg0vbihwgcyy2c3gfsc91iz3lw2r3awg0zwgd41699qby"; + rev = "e6c03a17611a71ab1fc12ed0e9b4c32bf9ca826b"; + sha256 = "1g4vl0lxq7rvl064pf11n4r69z78c5k77qd987mm4hajbvmkbjqi"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; vimux = buildVimPluginFrom2Nix { pname = "vimux"; - version = "2021-03-18"; + version = "2021-04-10"; src = fetchFromGitHub { owner = "preservim"; repo = "vimux"; - rev = "708ce200d56d6fc326a8c1acd7f0f4f7c6a9e552"; - sha256 = "0wkxq1a3phmxskmqcn3067s56k6n9v8k9qqy0mwhxhp2d53asxpf"; + rev = "ee3075ad30560ffba20c695124c60faef97ec4a4"; + sha256 = "19plkjvifvbfnq56vcmzl0q3hxmcbd7q5f5cxk42jp038cry26ay"; }; meta.homepage = "https://github.com/preservim/vimux/"; }; @@ -8830,12 +8842,12 @@ let YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2021-03-22"; + version = "2021-04-09"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "ed423e8a1d2a5842a126d33b824ad3b65f85f3ba"; - sha256 = "19c238sdc6i3ky374v52g13csnbmdcm9d97iji6fmklmzsyrq4cr"; + rev = "a3d02238ca5c19a64ff3336087fe016a4137fde9"; + sha256 = "05sfyqynqliyz2w2ams2a5rqi8v0i65iz5jfk2vsy9qcn94i2sr6"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -8879,12 +8891,12 @@ let zephyr-nvim = buildVimPluginFrom2Nix { pname = "zephyr-nvim"; - version = "2021-04-03"; + version = "2021-04-10"; src = fetchFromGitHub { owner = "glepnir"; repo = "zephyr-nvim"; - rev = "782b1986adafe4b17ea8a0f9aca375f37029bd2b"; - sha256 = "0chrbn917yzvc5rcz6ajzp36598c8lwc1wpdp3qwl34k2vp4r1ia"; + rev = "057ee834776939bf76c4ae6c71e94e911014a172"; + sha256 = "0x1da7ihyrcrr3msy1jds566506k0jbsap5fk1w823cm8m0mwqn9"; }; meta.homepage = "https://github.com/glepnir/zephyr-nvim/"; }; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 82b6543b4188..6258e4334b05 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -380,6 +380,7 @@ motus/pig.vim mpickering/hlint-refactor-vim ms-jpq/chadtree@chad mtikekar/vim-bsv +mzlogin/vim-markdown-toc nanotech/jellybeans.vim natebosch/vim-lsc nathanaelkane/vim-indent-guides diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index efb87df6c970..0aad78531ba0 100644 --- a/pkgs/os-specific/linux/kernel/linux-xanmod.nix +++ b/pkgs/os-specific/linux/kernel/linux-xanmod.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildLinux, fetchFromGitHub, ... } @ args: let - version = "5.11.12"; + version = "5.11.13"; suffix = "xanmod1-cacule"; in buildLinux (args // rec { @@ -12,7 +12,7 @@ in owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-omRZ9oAmW3mauUolPf/lgMFMwUCYU4YaZ+OS75Ag+lM="; + sha256 = "sha256-LUbkccAfDS0/FnNhHn64bkC8qwBD0NKcdZRzNoSw4uA="; extraPostFetch = '' rm $out/.config ''; diff --git a/pkgs/os-specific/linux/mdevd/default.nix b/pkgs/os-specific/linux/mdevd/default.nix new file mode 100644 index 000000000000..b88e3ad1e6f0 --- /dev/null +++ b/pkgs/os-specific/linux/mdevd/default.nix @@ -0,0 +1,28 @@ +{ lib, skawarePackages }: + +with skawarePackages; + +buildPackage { + pname = "mdevd"; + version = "0.1.3.0"; + sha256 = "0spvw27xxd0m6j8bl8xysmgsx18fl769smr6dsh25s2d5h3sp2dy"; + + description = "mdev-compatible Linux hotplug manager daemon"; + platforms = lib.platforms.linux; + + outputs = [ "bin" "out" "dev" "doc" ]; + + configureFlags = [ + "--with-sysdeps=${skalibs.lib}/lib/skalibs/sysdeps" + "--with-include=${skalibs.dev}/include" + "--with-lib=${skalibs.lib}/lib" + ]; + + postInstall = '' + # remove all mdevd executables from build directory + rm $(find -type f -mindepth 1 -maxdepth 1 -executable) + + mv doc $doc/share/doc/mdevd/html + mv examples $doc/share/doc/mdevd/examples + ''; +} diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index dad656d16383..95098ddc6670 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -122,7 +122,7 @@ "clickatell" = ps: with ps; [ ]; "clicksend" = ps: with ps; [ ]; "clicksend_tts" = ps: with ps; [ ]; - "climacell" = ps: with ps; [ ]; # missing inputs: pyclimacell + "climacell" = ps: with ps; [ pyclimacell ]; "climate" = ps: with ps; [ ]; "cloud" = ps: with ps; [ aiohttp-cors hass-nabucasa ]; "cloudflare" = ps: with ps; [ pycfdns ]; @@ -147,7 +147,7 @@ "cups" = ps: with ps; [ pycups ]; "currencylayer" = ps: with ps; [ ]; "daikin" = ps: with ps; [ pydaikin ]; - "danfoss_air" = ps: with ps; [ ]; # missing inputs: pydanfossair + "danfoss_air" = ps: with ps; [ pydanfossair ]; "darksky" = ps: with ps; [ python-forecastio ]; "datadog" = ps: with ps; [ datadog ]; "ddwrt" = ps: with ps; [ ]; @@ -751,7 +751,7 @@ "skybeacon" = ps: with ps; [ ]; # missing inputs: pygatt[GATTTOOL] "skybell" = ps: with ps; [ skybellpy ]; "slack" = ps: with ps; [ ]; # missing inputs: slackclient - "sleepiq" = ps: with ps; [ ]; # missing inputs: sleepyq + "sleepiq" = ps: with ps; [ sleepyq ]; "slide" = ps: with ps; [ ]; # missing inputs: goslide-api "sma" = ps: with ps; [ pysma ]; "smappee" = ps: with ps; [ aiohttp-cors pysmappee ]; diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index e0f7db7a5770..f71a5018291a 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -315,6 +315,7 @@ in with py.pkgs; buildPythonApplication rec { "shopping_list" "simplisafe" "simulated" + "sleepiq" "sma" "sensor" "smarttub" diff --git a/pkgs/servers/monitoring/prometheus/promscale.nix b/pkgs/servers/monitoring/prometheus/promscale.nix index 98ad9cd62260..81240072d42d 100644 --- a/pkgs/servers/monitoring/prometheus/promscale.nix +++ b/pkgs/servers/monitoring/prometheus/promscale.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "promscale"; - version = "0.2.1"; + version = "0.3.0"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = version; - sha256 = "sha256-f/fpCyAw9BQ6ccEZm/xsTCjINjFtX3Q6SmPuJNVSJVI="; + sha256 = "sha256-kZYFOuY6FFM35mP+o/YU5SM5H9ziOq9BQ8T1RX7rhGE="; }; - vendorSha256 = "sha256-/woSbtrOI3BVBhh+A2kO1CB1BLzBciwOqvSbGkFeMEU="; + vendorSha256 = "sha256-1VOhDOfFE4BpDR4XfhLoXJFuTDkG1nx88tVvTF3ZVxU="; buildFlagsArray = [ "-ldflags=-s -w -X github.com/timescale/promscale/pkg/version.Version=${version} -X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ]; diff --git a/pkgs/servers/rtsp-simple-server/default.nix b/pkgs/servers/rtsp-simple-server/default.nix index 76ddcf3346e4..baf364cfece8 100644 --- a/pkgs/servers/rtsp-simple-server/default.nix +++ b/pkgs/servers/rtsp-simple-server/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rtsp-simple-server"; - version = "0.15.3"; + version = "0.15.4"; src = fetchFromGitHub { owner = "aler9"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eY3XtGmHp7TM+lXC9tdd51x7sLuuZfBDJxTZ79Ye0Qs="; + sha256 = "sha256-6XdX4HEjDRt9WtqyHIv/NLt7IytNDeJLgCeTHTGybRI="; }; - vendorSha256 = "sha256-SiWcOI1XxrwwTAzp8HC5zOO5e2oSWBMFRYsW2RwPA5I="; + vendorSha256 = "sha256-T5LWbxYsKnG5eaYLR/rms6+2DXv2lV9o39BvF7HapZY="; # Tests need docker doCheck = false; diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 707aff2011b7..5a1dcfe16ecc 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,20 +1,20 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "2.23.2"; + version = "2.24.1"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.23.2-linux-x64.tar.gz"; - sha256 = "0bg90kj8lb1bw3vx0672rbzmc5wylx90cad3h93qlwxsfvijmk7x"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.24.1-linux-x64.tar.gz"; + sha256 = "1c3a0ibwchl0lmcb8hr4j0x9b7hfsd0pfg6ay808zg1v8ddrj3xm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.9.1-linux-amd64.tar.gz"; - sha256 = "084l6si66sxy55i4y14rn287v69vli17n283s718v00zrmgdah35"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.10.0-linux-amd64.tar.gz"; + sha256 = "1gqbs33mqqssymn48glm9h5qfkc1097ygk0mdanfigyhwv6rdmnc"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.34.2-linux-amd64.tar.gz"; - sha256 = "1xpil1a7gwcmjb3my9s37gf45i17l5mnxh0bkfbfwiw5znv7cjqa"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.36.0-linux-amd64.tar.gz"; + sha256 = "0dg5szlslp863slv6lfd8g98946ljvxhvq64b3j4zk6rsn0badvh"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.14.2-linux-amd64.tar.gz"; @@ -29,20 +29,20 @@ sha256 = "0b3bz952wz7fsbk51j0mlfsyyg9ymc9wnq8kgm7dvs1p5zgzv4ni"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.6.1-linux-amd64.tar.gz"; - sha256 = "114r26ncf3rlw6h0wsmyxhpcxb5hy20fk8kav858hvqacby5w6sq"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.7.0-linux-amd64.tar.gz"; + sha256 = "0l1y8fckx7k3lasb6rzy3v58cl1x3qzbb999wi14z16z2a63zwsw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.9.1-linux-amd64.tar.gz"; sha256 = "178l4h7wj9pn1283zajaqm7fwcfwzpzq7swrgr8q880qsa611gjs"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.17.0-linux-amd64.tar.gz"; - sha256 = "0xzix9mn3n3n4y7l6xl0bn2xq338436ykb34j2fi20wxg5wb99lf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.19.0-linux-amd64.tar.gz"; + sha256 = "0iliagpyvzn63pwcdq74w8ag9vc7asqpq658b19zly4jd6z3cwkd"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v3.3.1-linux-amd64.tar.gz"; - sha256 = "1pg1q70gkp300swl5hnjdx7s9yjg0d88r280ylga73syncms4s3w"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v3.4.0-linux-amd64.tar.gz"; + sha256 = "0zp3rwhngj009a9s6w2vyvgyhj7nd03mwm44x62ikhnz6f414kr9"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.8.1-linux-amd64.tar.gz"; @@ -73,8 +73,8 @@ sha256 = "0glbjhgrb2hiyhd6kwmy7v384j8zw641pw9737g1fczv3x16a3s3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.8.1-linux-amd64.tar.gz"; - sha256 = "05rcvp2gkx14gy46a0vx9ch3xysnn0wlgsn80rfav35v932x9f3g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.9.0-linux-amd64.tar.gz"; + sha256 = "0n486h5f683yq6z53s9l9x5air1vk4nz1skiirsprz7a12cy2xkn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.1.1-linux-amd64.tar.gz"; @@ -91,16 +91,16 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v2.23.2-darwin-x64.tar.gz"; - sha256 = "19g3bsmrjwfbnmw20zh0cqnhz83jl4ikfwg4rhdxsvazdmbym905"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v2.24.1-darwin-x64.tar.gz"; + sha256 = "1x6z0drvaxrps47nisvw513vgskaf86mz8fzlhqfkddp2k5la5j1"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.9.1-darwin-amd64.tar.gz"; - sha256 = "1jkw0pvwz25dvxva7dipdxf4lppgr2m8ynbjl32fijzqs61y690m"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-auth0-v1.10.0-darwin-amd64.tar.gz"; + sha256 = "05cz7b738bcai4aiya4rkjhmkh9pg6za4xp2snb9nx0jkw2vw2ms"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.34.2-darwin-amd64.tar.gz"; - sha256 = "0chjps0m203xb1ybky77lg1miv7d4cp1z8xxqhymrylfqaz4xj8q"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v3.36.0-darwin-amd64.tar.gz"; + sha256 = "0k74x9a6b9xngrp1cgdal86h23m95r5sa3q036ms4py0phq47r2w"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-cloudflare-v2.14.2-darwin-amd64.tar.gz"; @@ -115,20 +115,20 @@ sha256 = "09nd5nfvjqgpbjs82bm5ym5wdg37mg863wvdp8s3fd8id4gdqb24"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.6.1-darwin-amd64.tar.gz"; - sha256 = "1f3mfgh24h2hwmshs4qpplgrxplxl7iab29xp4c7p1g573na3b7a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-digitalocean-v3.7.0-darwin-amd64.tar.gz"; + sha256 = "0iflll8lkk3s3dx3xl0iqmxac9nlspjnv8gmjfqwpryzk8h1fmzy"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-docker-v2.9.1-darwin-amd64.tar.gz"; sha256 = "10vp75fc41yk9lg5x7wyhs4mn2f4krfnw4jn5xys7dd475blm6rh"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.17.0-darwin-amd64.tar.gz"; - sha256 = "0cl7im10is9wvw3ygis9xy3f77npijsf1dsb49ww057kqhgv1v3i"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v4.19.0-darwin-amd64.tar.gz"; + sha256 = "061s8snsgz044ilh2s48810bmayypdyq9aqkhgal6v3l86jl8m95"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v3.3.1-darwin-amd64.tar.gz"; - sha256 = "1b7azajh9kzq8akyf5pf16hh3had8iwph6cw06b7mv1wqyd01k6z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v3.4.0-darwin-amd64.tar.gz"; + sha256 = "1p6xxhy30qzprxk3kwiwimw5m0c73fk7c9j4vrzj2z4kpgj8qx7w"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gitlab-v3.8.1-darwin-amd64.tar.gz"; @@ -159,8 +159,8 @@ sha256 = "0621njipng32x43lw8n49mapq10lnvibg8vlvgciqsfvrbpz1yp5"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.8.1-darwin-amd64.tar.gz"; - sha256 = "1r5rhn1yjjr0rw7qm2n8dqyqk1r1hkgvdmdq2x9smnvd2mwwjfah"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-postgresql-v2.9.0-darwin-amd64.tar.gz"; + sha256 = "08af55rrzpm42vx7w1i1cmfk48czjfwln737prp5mwcvddmg5s1g"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-random-v3.1.1-darwin-amd64.tar.gz"; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index af65df8daebd..31ac38ab2756 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -3,20 +3,20 @@ # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="2.23.2" +VERSION="2.24.1" # Grab latest release ${VERSION} from # https://github.com/pulumi/pulumi-${NAME}/releases plugins=( - "auth0=1.9.1" - "aws=3.34.2" + "auth0=1.10.0" + "aws=3.36.0" "cloudflare=2.14.2" "consul=2.9.1" "datadog=2.17.1" - "digitalocean=3.6.1" + "digitalocean=3.7.0" "docker=2.9.1" - "gcp=4.17.0" - "github=3.3.1" + "gcp=4.19.0" + "github=3.4.0" "gitlab=3.8.1" "hcloud=0.7.1" "kubernetes=2.8.3" @@ -24,7 +24,7 @@ plugins=( "mysql=2.5.1" "openstack=2.17.1" "packet=3.2.2" - "postgresql=2.8.1" + "postgresql=2.9.0" "random=3.1.1" "vault=3.5.1" "vsphere=2.13.1" diff --git a/pkgs/tools/graphics/wdisplays/default.nix b/pkgs/tools/graphics/wdisplays/default.nix index 2640769d186b..073a3b1b6d47 100644 --- a/pkgs/tools/graphics/wdisplays/default.nix +++ b/pkgs/tools/graphics/wdisplays/default.nix @@ -1,36 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gtk3, epoxy, wayland, wrapGAppsHook -, fetchpatch -}: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, gtk3, epoxy, wayland, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "wdisplays"; - version = "1.0"; + version = "unstable-2021-04-03"; nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; buildInputs = [ gtk3 epoxy wayland ]; src = fetchFromGitHub { - owner = "cyclopsian"; + owner = "luispabon"; repo = "wdisplays"; - rev = version; - sha256 = "1xhgrcihja2i7yg54ghbwr1v6kf8jnsfcp364yb97vkxskc4y21y"; + rev = "7f2eac0d2aa81b5f495da7950fd5a94683f7868e"; + sha256 = "sha256-cOF3+T34zPro58maWUouGG+vlLm2C5NfcH7PZhSvApE="; }; - patches = [ - # Fixes `Gdk-Message: 10:26:38.752: Error reading events from display: Success` - # https://github.com/cyclopsian/wdisplays/pull/20 - (fetchpatch { - url = "https://github.com/cyclopsian/wdisplays/commit/5198a9c94b40ff157c284df413be5402f1b75118.patch"; - sha256 = "1xwphyn0ksf8isy9dz3mfdhmsz4jv02870qz5615zs7aqqfcwn85"; - }) - ]; - meta = with lib; { description = "A graphical application for configuring displays in Wayland compositors"; - homepage = "https://github.com/cyclopsian/wdisplays"; - maintainers = with lib.maintainers; [ lheckemann ma27 ]; - license = lib.licenses.mit; - platforms = lib.platforms.linux; + homepage = "https://github.com/luispabon/wdisplays"; + maintainers = with maintainers; [ lheckemann ma27 ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix index 560393b31939..f4df324fa058 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-lua.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "fcitx5-lua"; - version = "5.0.3"; + version = "5.0.4"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-lua"; rev = version; - sha256 = "sha256-46s3F3NHGuef0wPhYiPocms0jv5Vo+cVRd5FzlfjMZY="; + sha256 = "sha256-1gKfFq+x/tCOYqESO49Qddp5z6zXO7ULjTJgDEl8BqI="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix index bfb06a98e8fd..b24dac6886d9 100644 --- a/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix +++ b/pkgs/tools/inputmethods/fcitx5/fcitx5-qt.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "fcitx5-qt"; - version = "5.0.2"; + version = "5.0.4"; src = fetchFromGitHub { owner = "fcitx"; repo = "fcitx5-qt"; rev = version; - sha256 = "sha256-QylvjhjiIujYGKFtL4bKVXpobkN5t6Q2MGf16dsL24A="; + sha256 = "sha256-PZbnxt30Tv7i+Q6G9UpGgWDs65rn0MZVe1ybhz4vN9I="; }; preConfigure = '' diff --git a/pkgs/tools/misc/watchexec/default.nix b/pkgs/tools/misc/watchexec/default.nix index 5f80dad854e3..5a264db2d4d2 100644 --- a/pkgs/tools/misc/watchexec/default.nix +++ b/pkgs/tools/misc/watchexec/default.nix @@ -1,21 +1,21 @@ -{ lib, stdenv, rustPlatform, fetchFromGitHub, CoreServices, installShellFiles }: +{ lib, stdenv, rustPlatform, fetchFromGitHub, CoreServices, installShellFiles, libiconv }: rustPlatform.buildRustPackage rec { pname = "watchexec"; - version = "1.14.1"; + version = "1.15.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0m4hipjgg64572lzqy9hz4iq9c4awc93c9rmnpap5iyi855x7idj"; + sha256 = "1b0ds04q4g8xcgwkziwb5hsi7v73w9y0prvhxz880zzh930652n2"; }; - cargoSha256 = "0035pqr61mdx699hd4f8hnxknvsdg67l6ys7gxym3fzd9dcmqqff"; + cargoSha256 = "0jpfgyz5l4fdb5cnqmadzjzrvc6dwgray4b0mx80pghpjw8a8qfb"; nativeBuildInputs = [ installShellFiles ]; - buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices libiconv ]; postInstall = '' installManPage doc/watchexec.1 @@ -27,6 +27,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/watchexec/watchexec"; license = with licenses; [ asl20 ]; maintainers = [ maintainers.michalrus ]; - platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index 286b3207347b..5b5d8ee1545e 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.10.3"; + version = "1.10.5"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - sha256 = "1ds2270pw187hbg01lcqxw0631m0ypvbza47z5ndgn6dxprga9wk"; + sha256 = "0nagn7792qniczzv0912h89bn8rm8hyikdiw7cqwknx0hw8dwz1z"; }; - cargoSha256 = "0aarhv78ab3z893cgiixxjpxl6xcwi96saavnzw4zd68988lb24r"; + cargoSha256 = "0arqc0wnvfkmk8xzsdc6fvd1adazrw950ld8xyh7r588pyphjmhn"; RUSTC_BOOTSTRAP = 1; diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 71c435df0c58..f1fe05276396 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -1,22 +1,14 @@ -{ lib, stdenv, fetchurl, libpcap, perl, fetchpatch }: +{ lib, stdenv, fetchurl, libpcap, perl }: stdenv.mkDerivation rec { pname = "tcpdump"; - version = "4.9.3"; + version = "4.99.0"; src = fetchurl { url = "http://www.tcpdump.org/release/${pname}-${version}.tar.gz"; - sha256 = "0434vdcnbqaia672rggjzdn4bb8p8dchz559yiszzdk0sjrprm1c"; + sha256 = "0hmqh2fx8rgs9v1mk3vpywj61xvkifz260q685xllxr8jmxg3wlc"; }; - patches = [ - # Patch for CVE-2020-8037 - (fetchpatch { - url = "https://github.com/the-tcpdump-group/tcpdump/commit/32027e199368dad9508965aae8cd8de5b6ab5231.patch"; - sha256 = "sha256-bO3aV032ru9+M/9isBRjmH8jTZLKj9Zf9ha2rmOaZwc="; - }) - ]; - postPatch = '' patchShebangs tests ''; @@ -29,11 +21,11 @@ stdenv.mkDerivation rec { (stdenv.hostPlatform != stdenv.buildPlatform) "ac_cv_linux_vers=2"; - meta = { + meta = with lib; { description = "Network sniffer"; - homepage = "http://www.tcpdump.org/"; - license = "BSD-style"; - maintainers = with lib.maintainers; [ globin ]; - platforms = lib.platforms.unix; + homepage = "https://www.tcpdump.org/"; + license = licenses.bsd3; + maintainers = with maintainers; [ globin ]; + platforms = platforms.unix; }; } diff --git a/pkgs/tools/security/chipsec/compile-ko.diff b/pkgs/tools/security/chipsec/compile-ko.diff new file mode 100644 index 000000000000..0ab2c80a6251 --- /dev/null +++ b/pkgs/tools/security/chipsec/compile-ko.diff @@ -0,0 +1,13 @@ +diff --git i/setup.py w/setup.py +index cfe2665..5795874 100755 +--- i/setup.py ++++ w/setup.py +@@ -179,7 +179,7 @@ class build_ext(_build_ext): + driver_build_function = self._build_win_driver + self._build_win_compression() + +- if not self.skip_driver: ++ if True: + driver_build_function() + + def get_source_files(self): diff --git a/pkgs/tools/security/chipsec/default.nix b/pkgs/tools/security/chipsec/default.nix index 7e00c0b07cf7..fbb9c421e353 100644 --- a/pkgs/tools/security/chipsec/default.nix +++ b/pkgs/tools/security/chipsec/default.nix @@ -1,29 +1,54 @@ -{ stdenv, lib, fetchFromGitHub, python2Packages, nasm, libelf -, kernel ? null, withDriver ? false }: -python2Packages.buildPythonApplication rec { +{ lib +, stdenv +, fetchFromGitHub +, kernel ? null +, libelf +, nasm +, python3 +, withDriver ? false +}: + +python3.pkgs.buildPythonApplication rec { pname = "chipsec"; - version = "1.5.1"; + version = "1.6.1"; + disabled = !stdenv.isLinux; src = fetchFromGitHub { owner = "chipsec"; repo = "chipsec"; rev = version; - sha256 = "1rxr9i08a22m15slvlkrhnki30jixi2ds096kmmc2nqzfr9yibmb"; + sha256 = "01sp24z63r3nqxx57zc4873b8i5dqipy7yrxzrwjns531vznhiy2"; }; - disabled = !stdenv.isLinux; + patches = lib.optionals withDriver [ ./ko-path.diff ./compile-ko.diff ]; + + KSRC = lib.optionalString withDriver "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; nativeBuildInputs = [ - nasm libelf + libelf + nasm ]; - setupPyBuildFlags = lib.optional (!withDriver) "--skip-driver"; + checkInputs = [ + python3.pkgs.distro + python3.pkgs.pytestCheckHook + ]; + + preBuild = lib.optionalString withDriver '' + export CHIPSEC_BUILD_LIB=$(mktemp -d) + mkdir -p $CHIPSEC_BUILD_LIB/chipsec/helper/linux + ''; + + preInstall = lib.optionalString withDriver '' + mkdir -p $out/${python3.pkgs.python.sitePackages}/drivers/linux + mv $CHIPSEC_BUILD_LIB/chipsec/helper/linux/chipsec.ko \ + $out/${python3.pkgs.python.sitePackages}/drivers/linux/chipsec.ko + ''; - checkPhase = "python setup.py build " - + lib.optionalString (!withDriver) "--skip-driver " - + "test"; + setupPyBuildFlags = [ "--build-lib=$CHIPSEC_BUILD_LIB" ] + ++ lib.optional (!withDriver) "--skip-driver"; - KERNEL_SRC_DIR = lib.optionalString withDriver "${kernel.dev}/lib/modules/${kernel.modDirVersion}/build"; + pythonImportsCheck = [ "chipsec" ]; meta = with lib; { description = "Platform Security Assessment Framework"; @@ -34,7 +59,7 @@ python2Packages.buildPythonApplication rec { interfaces, and forensic capabilities. It can be run on Windows, Linux, Mac OS X and UEFI shell. ''; - license = licenses.gpl2; + license = licenses.gpl2Only; homepage = "https://github.com/chipsec/chipsec"; maintainers = with maintainers; [ johnazoidberg ]; platforms = if withDriver then [ "x86_64-linux" ] else platforms.all; diff --git a/pkgs/tools/security/chipsec/ko-path.diff b/pkgs/tools/security/chipsec/ko-path.diff new file mode 100644 index 000000000000..ad26d232d964 --- /dev/null +++ b/pkgs/tools/security/chipsec/ko-path.diff @@ -0,0 +1,13 @@ +diff --git c/chipsec/helper/linux/linuxhelper.py i/chipsec/helper/linux/linuxhelper.py +index c51b5e6..4be05ea 100644 +--- c/chipsec/helper/linux/linuxhelper.py ++++ i/chipsec/helper/linux/linuxhelper.py +@@ -152,7 +152,7 @@ class LinuxHelper(Helper): + else: + a2 = "a2=0x{}".format(phys_mem_access_prot) + +- driver_path = os.path.join(chipsec.file.get_main_dir(), "chipsec", "helper", "linux", "chipsec.ko" ) ++ driver_path = os.path.join(chipsec.file.get_main_dir(), "drivers", "linux", "chipsec.ko" ) + if not os.path.exists(driver_path): + driver_path += ".xz" + if not os.path.exists(driver_path): diff --git a/pkgs/tools/security/clevis/default.nix b/pkgs/tools/security/clevis/default.nix index 36b5ab47304c..7f26dcabb7db 100644 --- a/pkgs/tools/security/clevis/default.nix +++ b/pkgs/tools/security/clevis/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "clevis"; - version = "15"; + version = "16"; src = fetchFromGitHub { owner = "latchset"; repo = pname; rev = "v${version}"; - sha256 = "0wfgd2v1r47ckh5qp60b903191fx0fa27zyadxlsb8riqszhmwvz"; + sha256 = "sha256-DWrxk+Nb2ptF5nCaXYvRY8hAFa/n+6OGdKWO+Sq61yk="; }; nativeBuildInputs = [ meson ninja pkg-config asciidoc ]; diff --git a/pkgs/tools/security/hfinger/default.nix b/pkgs/tools/security/hfinger/default.nix new file mode 100644 index 000000000000..9e053276ecf7 --- /dev/null +++ b/pkgs/tools/security/hfinger/default.nix @@ -0,0 +1,36 @@ +{ lib +, fetchFromGitHub +, python3 +, wireshark-cli +}: + +python3.pkgs.buildPythonApplication rec { + pname = "hfinger"; + version = "0.2.0"; + disabled = python3.pythonOlder "3.3"; + + src = fetchFromGitHub { + owner = "CERT-Polska"; + repo = pname; + rev = "v${version}"; + sha256 = "1vz8mf572qyng684fvb9gdwaaiybk7mjmikbymvjvy24d10raak1"; + }; + + propagatedBuildInputs = with python3.pkgs; [ + fnvhash + python_magic + ] ++ [ + wireshark-cli + ]; + + # Project has no tests + doCheck = false; + pythonImportsCheck = [ "hfinger" ]; + + meta = with lib; { + description = "Fingerprinting tool for HTTP requests"; + homepage = "https://github.com/CERT-Polska/hfinger"; + license = with licenses; [ gpl3Only ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/text/amber/default.nix b/pkgs/tools/text/amber/default.nix index e9ceaffa7342..632a318e8620 100644 --- a/pkgs/tools/text/amber/default.nix +++ b/pkgs/tools/text/amber/default.nix @@ -4,16 +4,16 @@ rustPlatform.buildRustPackage rec { pname = "amber"; - version = "0.5.8"; + version = "0.5.9"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "0j9h9zzg6n4mhq2bqj71k5db595ilbgd9dn6ygmzsm74619q4454"; + sha256 = "sha256-mmgJCD7kJjvpxyagsoe5CSzqIEZcIiYMAMP3axRphv4="; }; - cargoSha256 = "0h47xqqq8f8m28rl1s6r305cf3dvk94aa86j6m0rk535i2jqfvhp"; + cargoSha256 = "sha256-opRinhTmhZxpAwHNiVOLXL8boQf09Y1NXrWQ6HWQYQ0="; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 720d2dcdd9e2..c1ec9f9d1143 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -729,6 +729,7 @@ mapAliases ({ sup = throw "sup was deprecated on 2019-09-10: abandoned by upstream"; swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23 swtpm-tpm2 = swtpm; # added 2021-02-26 + syncthing-cli = syncthing; # added 2021-04-06 system_config_printer = system-config-printer; # added 2016-01-03 systemd-cryptsetup-generator = throw "systemd-cryptsetup-generator is now included in the systemd package"; # added 2020-07-12 systemd_with_lvm2 = throw "systemd_with_lvm2 is obsolete, enabled by default via the lvm module"; # added 2020-07-12 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 32c6eb4ee80b..7f395b81856f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5491,6 +5491,8 @@ in idle3tools = callPackage ../tools/system/idle3tools { }; + ifcopenshell = with python3Packages; toPythonApplication ifcopenshell; + iftop = callPackage ../tools/networking/iftop { }; ifuse = callPackage ../tools/filesystems/ifuse { }; @@ -6029,7 +6031,9 @@ in inherit (python3Packages) ansi2html; }; - medfile = callPackage ../development/libraries/medfile { }; + medfile = callPackage ../development/libraries/medfile { + hdf5 = hdf5.override { usev110Api = true; }; + }; meilisearch = callPackage ../servers/search/meilisearch { inherit (darwin.apple_sdk.frameworks) IOKit Security; @@ -14758,6 +14762,8 @@ in hdt = callPackage ../misc/hdt {}; + hfinger = callPackage ../tools/security/hfinger { }; + herqq = libsForQt5.callPackage ../development/libraries/herqq { }; hidapi = callPackage ../development/libraries/hidapi { @@ -17270,6 +17276,7 @@ in s6-portable-utils = callPackage ../tools/misc/s6-portable-utils { }; s6-rc = callPackage ../tools/system/s6-rc { }; + mdevd = callPackage ../os-specific/linux/mdevd { }; nsss = callPackage ../development/libraries/nsss { }; utmps = callPackage ../development/libraries/utmps { }; sdnotify-wrapper = callPackage ../os-specific/linux/sdnotify-wrapper { }; @@ -20263,6 +20270,8 @@ in mdadm = mdadm4; mdadm4 = callPackage ../os-specific/linux/mdadm { }; + inherit (skawarePackages) mdevd; + metastore = callPackage ../os-specific/linux/metastore { }; mingetty = callPackage ../os-specific/linux/mingetty { }; @@ -25877,7 +25886,6 @@ in inherit (callPackages ../applications/networking/syncthing { }) syncthing - syncthing-cli syncthing-discovery syncthing-relay; @@ -30572,6 +30580,8 @@ in inherit (darwin.apple_sdk.frameworks) Carbon Cocoa OpenGL OpenAL; }; + yapesdl = callPackage ../misc/emulators/yapesdl { }; + x16-emulator = callPackage ../misc/emulators/commander-x16/emulator.nix { }; x16-rom = callPackage ../misc/emulators/commander-x16/rom.nix { }; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 87d4d52d3884..790f9c465f9d 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1255,32 +1255,31 @@ let janeStreet = if lib.versionOlder "4.08" ocaml.version then import ../development/ocaml-modules/janestreet/0.14.nix { - inherit alcotest angstrom angstrom-async base64 cryptokit ctypes - dune-configurator faraday inotify janePackage js_of_ocaml - js_of_ocaml-ppx lambdasoup magic-mime num octavius ounit - ppxlib re tyxml uri-sexp zarith; + inherit self; inherit (pkgs) openssl zstd; } else if lib.versionOlder "4.07" ocaml.version then import ../development/ocaml-modules/janestreet/0.12.nix { - inherit ctypes janePackage num octavius re; + self = self // { + ppxlib = ppxlib.override { version = "0.8.1"; }; + }; inherit (pkgs) openssl; - ppxlib = ppxlib.override { version = "0.8.1"; }; } else import ../development/ocaml-modules/janestreet { - inherit janePackage ocamlbuild angstrom ctypes cryptokit; - inherit magic-mime num ocaml-migrate-parsetree octavius ounit; - inherit ppx_deriving re; + self = self // { + ppxlib = ppxlib.override { version = "0.8.1"; }; + }; inherit (pkgs) openssl; - ppxlib = ppxlib.override { version = "0.8.1"; }; }; janeStreet_0_9_0 = import ../development/ocaml-modules/janestreet/old.nix { - janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix { defaultVersion = "0.9.0"; }; - inherit lib ocaml ocamlbuild ctypes cryptokit; - inherit magic-mime num ocaml-migrate-parsetree octavius ounit; - inherit ppx_deriving re zarith; - inherit (pkgs) stdenv openssl; + self = self.janeStreet_0_9_0; + super = self // { + janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix { + defaultVersion = "0.9.0"; + }; + }; + inherit (pkgs) stdenv lib openssl; }; js_build_tools = callPackage ../development/ocaml-modules/janestreet/js-build-tools.nix {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b59c818189b6..42c60ad5f353 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -245,6 +245,8 @@ in { aioeafm = callPackage ../development/python-modules/aioeafm { }; + aioemonitor = callPackage ../development/python-modules/aioemonitor { }; + aioesphomeapi = callPackage ../development/python-modules/aioesphomeapi { }; aioeventlet = callPackage ../development/python-modules/aioeventlet { }; @@ -339,6 +341,8 @@ in { aioswitcher = callPackage ../development/python-modules/aioswitcher { }; + aiosyncthing = callPackage ../development/python-modules/aiosyncthing { }; + aiounifi = callPackage ../development/python-modules/aiounifi { }; aiounittest = callPackage ../development/python-modules/aiounittest { }; @@ -2259,6 +2263,8 @@ in { exifread = callPackage ../development/python-modules/exifread { }; + expects = callPackage ../development/python-modules/expects { }; + expiringdict = callPackage ../development/python-modules/expiringdict { }; exrex = callPackage ../development/python-modules/exrex { }; @@ -3665,6 +3671,10 @@ in { kaptan = callPackage ../development/python-modules/kaptan { }; + karton-classifier = callPackage ../development/python-modules/karton-classifier { }; + + karton-core = callPackage ../development/python-modules/karton-core { }; + kazoo = callPackage ../development/python-modules/kazoo { }; kconfiglib = callPackage ../development/python-modules/kconfiglib { }; @@ -5607,6 +5617,8 @@ in { PyChromecast = callPackage ../development/python-modules/pychromecast { }; + pyclimacell = callPackage ../development/python-modules/pyclimacell { }; + pyclipper = callPackage ../development/python-modules/pyclipper { }; pycm = callPackage ../development/python-modules/pycm { }; @@ -5660,6 +5672,8 @@ in { pydaikin = callPackage ../development/python-modules/pydaikin { }; + pydanfossair = callPackage ../development/python-modules/pydanfossair { }; + pydantic = callPackage ../development/python-modules/pydantic { }; pydash = callPackage ../development/python-modules/pydash { }; @@ -7788,6 +7802,8 @@ in { sleekxmpp = callPackage ../development/python-modules/sleekxmpp { }; + sleepyq = callPackage ../development/python-modules/sleepyq { }; + slicedimage = callPackage ../development/python-modules/slicedimage { }; slicer = callPackage ../development/python-modules/slicer { }; |