diff options
-rw-r--r-- | nixos/lib/testing-python.nix | 9 | ||||
-rw-r--r-- | pkgs/applications/misc/fetchmail/default.nix | 4 | ||||
-rw-r--r-- | pkgs/applications/misc/logseq/default.nix | 4 | ||||
-rw-r--r-- | pkgs/data/fonts/overpass/default.nix | 12 | ||||
-rw-r--r-- | pkgs/data/themes/yaru/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/coq-modules/graph-theory/default.nix | 33 | ||||
-rw-r--r-- | pkgs/development/python-modules/nvchecker/default.nix | 13 | ||||
-rw-r--r-- | pkgs/development/python-modules/pytenable/default.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/gitlab-pages/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/misc/flameshot/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/security/exploitdb/default.nix | 4 | ||||
-rw-r--r-- | pkgs/top-level/coq-packages.nix | 1 |
12 files changed, 65 insertions, 33 deletions
diff --git a/nixos/lib/testing-python.nix b/nixos/lib/testing-python.nix index 768f1dc2a17..c703484666d 100644 --- a/nixos/lib/testing-python.nix +++ b/nixos/lib/testing-python.nix @@ -130,9 +130,12 @@ rec { nodeHostNames = map (c: c.config.system.name) (lib.attrValues nodes); + # TODO: This is an implementation error and needs fixing + # the testing famework cannot legitimately restrict hostnames further + # beyond RFC1035 invalidNodeNames = lib.filter (node: builtins.match "^[A-z_]([A-z0-9_]+)?$" node == null) - (builtins.attrNames nodes); + nodeHostNames; testScript' = # Call the test script with the computed nodes. @@ -146,7 +149,9 @@ rec { Cannot create machines out of (${lib.concatStringsSep ", " invalidNodeNames})! All machines are referenced as python variables in the testing framework which will break the script when special characters are used. - Please stick to alphanumeric chars and underscores as separation. + + This is an IMPLEMENTATION ERROR and needs to be fixed. Meanwhile, + please stick to alphanumeric chars and underscores as separation. '' else lib.warnIf skipLint "Linting is disabled" (runCommand testDriverName { diff --git a/pkgs/applications/misc/fetchmail/default.nix b/pkgs/applications/misc/fetchmail/default.nix index d1659822bb2..18ed79c99d6 100644 --- a/pkgs/applications/misc/fetchmail/default.nix +++ b/pkgs/applications/misc/fetchmail/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, openssl }: let - version = "6.4.16"; + version = "6.4.20"; in stdenv.mkDerivation { pname = "fetchmail"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; - sha256 = "sha256-BEuaCsA6+653RJed7+Pi4y45FBvKaP0Mje2i7UCIT7k="; + sha256 = "0xk171sbxcwjh1ibpipryw5sv4sy7jjfvhn5n373j04g5sp428f8"; }; buildInputs = [ openssl ]; diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 7367d18ddf8..559538cdccd 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.2.6"; + version = "0.2.10"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "/tpegRGyGPviYpaSbWw7fH9ntvR7vUSD5rmwDMST5+Y="; + sha256 = "1YVOyaHDcv+GKx5nQq3cUrViKZ6CEuHQPiDvK0Jv+Qc="; name = "${pname}-${version}.AppImage"; }; diff --git a/pkgs/data/fonts/overpass/default.nix b/pkgs/data/fonts/overpass/default.nix index 1d0cf04d756..120098fd67f 100644 --- a/pkgs/data/fonts/overpass/default.nix +++ b/pkgs/data/fonts/overpass/default.nix @@ -1,18 +1,20 @@ { lib, fetchzip }: let - version = "3.0.4"; + version = "3.0.5"; in fetchzip rec { name = "overpass-${version}"; - url = "https://github.com/RedHatBrand/Overpass/archive/${version}.zip"; + url = "https://github.com/RedHatOfficial/Overpass/releases/download/v${version}/overpass-${version}.zip"; postFetch = '' - mkdir -p $out/share/fonts/opentype ; unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype - mkdir -p $out/share/doc/${name} ; unzip -j $downloadedFile \*.md -d $out/share/doc/${name} + mkdir -p $out/share/fonts $out/share/doc + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + unzip -j $downloadedFile \*.md -d $out/share/doc/${name} ''; - sha256 = "13b4yam0nycclccxidzj2fa3nwms5qji7gfkixdnl4ybf0f56b64"; + sha256 = "1fpyhd6x3i3g0xxjmyfnjsri1kkvci15fv7jp1bnza7k0hz0bnha"; meta = with lib; { homepage = "https://overpassfont.org/"; diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index 40cfaee17df..05ddd5ad15d 100644 --- a/pkgs/data/themes/yaru/default.nix +++ b/pkgs/data/themes/yaru/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "yaru"; - version = "21.04.1"; + version = "21.10.1"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - sha256 = "0z6k8q9b5xjx6xwirqbsqq5jjxw79ar2d61r7cgipqmbjdsjfgjz"; + sha256 = "sha256-VcuH/lEnSeOYGFXr3OPw9PRUwHOVx4RjUQXblv6jdD8="; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; diff --git a/pkgs/development/coq-modules/graph-theory/default.nix b/pkgs/development/coq-modules/graph-theory/default.nix new file mode 100644 index 00000000000..5607d342a2e --- /dev/null +++ b/pkgs/development/coq-modules/graph-theory/default.nix @@ -0,0 +1,33 @@ +{ lib, mkCoqDerivation, coq, mathcomp-algebra, mathcomp-finmap +, hierarchy-builder, version ? null }: + +with lib; + +mkCoqDerivation { + pname = "graph-theory"; + + release."0.9".sha256 = "sha256-Hl3JS9YERD8QQziXqZ9DqLHKp63RKI9HxoFYWSkJQZI="; + + releaseRev = v: "v${v}"; + + inherit version; + defaultVersion = with versions; switch coq.coq-version [ + { case = isGe "8.13"; out = "0.9"; } + ] null; + + propagatedBuildInputs = [ mathcomp-algebra mathcomp-finmap hierarchy-builder ]; + + meta = { + description = "Library of formalized graph theory results in Coq"; + longDescription = '' + A library of formalized graph theory results, including various + standard results from the literature (e.g., Menger’s Theorem, Hall’s + Marriage Theorem, and the excluded minor characterization of + treewidth-two graphs) as well as some more recent results arising from + the study of relation algebra within the ERC CoVeCe project (e.g., + soundness and completeness of an axiomatization of graph isomorphism). + ''; + maintainers = with maintainers; [ siraben ]; + license = licenses.cecill-b; + }; +} diff --git a/pkgs/development/python-modules/nvchecker/default.nix b/pkgs/development/python-modules/nvchecker/default.nix index b3fd0384ef4..62942108ff4 100644 --- a/pkgs/development/python-modules/nvchecker/default.nix +++ b/pkgs/development/python-modules/nvchecker/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , pythonOlder , pytestCheckHook , setuptools @@ -21,24 +20,16 @@ buildPythonPackage rec { pname = "nvchecker"; - version = "2.3"; + version = "2.4"; # Tests not included in PyPI tarball src = fetchFromGitHub { owner = "lilydjwg"; repo = pname; rev = "v${version}"; - sha256 = "0ikqjlw6v7va69i8qskj1lf07ik84q4n3qgsb7khk520gv2ks3sx"; + sha256 = "0ys4shp7gz6aaxrbflwcz7yjbvdv2v8pgj047p4rnp8ascpxg044"; }; - patches = [ - # Fix test that fail in sandbox build. See https://github.com/lilydjwg/nvchecker/pull/179 - (fetchpatch { - url = "https://github.com/lilydjwg/nvchecker/commit/7366d82bfc3dcf231f7908e259bf2437cf7dafd5.patch"; - sha256 = "0pwrwa2wyy4i668lk2mqzzy6y3xi08mq3w520b4954kfm07g75a9"; - }) - ]; - nativeBuildInputs = [ installShellFiles docutils ]; propagatedBuildInputs = [ setuptools packaging toml structlog appdirs tornado pycurl aiohttp ]; checkInputs = [ pytestCheckHook pytest-asyncio flaky pytest-httpbin ]; diff --git a/pkgs/development/python-modules/pytenable/default.nix b/pkgs/development/python-modules/pytenable/default.nix index b547d030ced..d2e227c1b17 100644 --- a/pkgs/development/python-modules/pytenable/default.nix +++ b/pkgs/development/python-modules/pytenable/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "pytenable"; - version = "1.3.2"; + version = "1.3.3"; src = fetchFromGitHub { owner = "tenable"; repo = "pyTenable"; rev = version; - sha256 = "sha256-S39rl8bJsxYAmTcaZk9+s9G45lOvREjlGVBk1m30tJo="; + sha256 = "19vhy7mf972545abydywyig82gkxalp6sfwinvj71hzbihwwzjpq"; }; propagatedBuildInputs = [ diff --git a/pkgs/servers/http/gitlab-pages/default.nix b/pkgs/servers/http/gitlab-pages/default.nix index c62ad8b75c9..68aaeb16af7 100644 --- a/pkgs/servers/http/gitlab-pages/default.nix +++ b/pkgs/servers/http/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "1.40.0"; + version = "1.41.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "sha256-RgWDAvuxqZeFCU+Q2s+FDIM/AroIdnfVq/D5lG4XN7U="; + sha256 = "sha256-f/dmQvsWHlc9thJ9Ekp14VjdjW5+IMtD0vDMlYksUx4="; }; - vendorSha256 = "sha256-HbMM0IHw1DMDlNN1m2EHaG9CXnj9j9xROPQiT2xTGlM="; + vendorSha256 = "sha256-C/1CuUbZEfawzAasTM1VsbK3vVvuRAWUR3cBm5zGzXs="; subPackages = [ "." ]; meta = with lib; { diff --git a/pkgs/tools/misc/flameshot/default.nix b/pkgs/tools/misc/flameshot/default.nix index f9136f14e61..e2e066fd890 100644 --- a/pkgs/tools/misc/flameshot/default.nix +++ b/pkgs/tools/misc/flameshot/default.nix @@ -10,13 +10,13 @@ mkDerivation rec { pname = "flameshot"; - version = "0.10.0"; + version = "0.10.1"; src = fetchFromGitHub { owner = "flameshot-org"; repo = "flameshot"; rev = "v${version}"; - sha256 = "1m0mx8qhy9ycsqh5dj6c7mwwpbhqxlds31dqdxxk0krwl750smi2"; + sha256 = "1ncknjayl6am740f49g0lc28z1zsifbicxz1j1kwps3ksj15nl7a"; }; passthru = { diff --git a/pkgs/tools/security/exploitdb/default.nix b/pkgs/tools/security/exploitdb/default.nix index 5cd7f4f63bf..178d2d80a27 100644 --- a/pkgs/tools/security/exploitdb/default.nix +++ b/pkgs/tools/security/exploitdb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "exploitdb"; - version = "2021-07-27"; + version = "2021-07-28"; src = fetchFromGitHub { owner = "offensive-security"; repo = pname; rev = version; - sha256 = "077y7rzvmv0kzwrhm592fsjd2lv839b5wzf59vq9cd3j313bdaab"; + sha256 = "sha256-cM7VxZRIs5QktjI1YkJGtdxkA1/CXCCuVynyTVCILsI="; }; installPhase = '' diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 6fc0500ed53..35cde1b123e 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -42,6 +42,7 @@ let fourcolor = callPackage ../development/coq-modules/fourcolor {}; gappalib = callPackage ../development/coq-modules/gappalib {}; goedel = callPackage ../development/coq-modules/goedel {}; + graph-theory = callPackage ../development/coq-modules/graph-theory {}; heq = callPackage ../development/coq-modules/heq {}; hierarchy-builder = callPackage ../development/coq-modules/hierarchy-builder {}; HoTT = callPackage ../development/coq-modules/HoTT {}; |