diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 9028399571d8..34addb88c9fb 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -2421,6 +2421,12 @@ githubId = 896182; name = "devhell"; }; + devins2518 = { + email = "drsingh2518@icloud.com"; + github = "devins2518"; + githubId = 17111639; + name = "Devin Singh"; + }; dezgeg = { email = "tuomas.tynkkynen@iki.fi"; github = "dezgeg"; diff --git a/nixos/lib/test-driver/test-driver.py b/nixos/lib/test-driver/test-driver.py index e216e566f286..6bbca95a97f6 100644 --- a/nixos/lib/test-driver/test-driver.py +++ b/nixos/lib/test-driver/test-driver.py @@ -128,18 +128,18 @@ def create_vlan(vlan_nr: str) -> Tuple[str, str, "subprocess.Popen[bytes]", Any] return (vlan_nr, vde_socket, vde_process, fd) -def retry(fn: Callable) -> None: +def retry(fn: Callable, timeout: int = 900) -> None: """Call the given function repeatedly, with 1 second intervals, until it returns True or a timeout is reached. """ - for _ in range(900): + for _ in range(timeout): if fn(False): return time.sleep(1) if not fn(True): - raise Exception("action timed out") + raise Exception(f"action timed out after {timeout} seconds") class Logger: diff --git a/nixos/modules/services/web-apps/trilium.nix b/nixos/modules/services/web-apps/trilium.nix index ae41ba50d2e2..35383c992fe8 100644 --- a/nixos/modules/services/web-apps/trilium.nix +++ b/nixos/modules/services/web-apps/trilium.nix @@ -9,7 +9,7 @@ let # Disable automatically generating desktop icon noDesktopIcon=true - noBackup=${cfg.noBackup} + noBackup=${lib.boolToString cfg.noBackup} [Network] # host setting is relevant only for web deployments - set the host on which the server will listen diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index d12169787c5a..61ebc3ab8cf2 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -160,7 +160,7 @@ in { etc."qemu/bridge.conf".text = lib.concatMapStringsSep "\n" (e: "allow ${e}") cfg.allowedBridges; systemPackages = with pkgs; [ libressl.nc iptables cfg.package cfg.qemuPackage ]; - etc.ethertypes.source = "${pkgs.iptables}/etc/ethertypes"; + etc.ethertypes.source = "${pkgs.ebtables}/etc/ethertypes"; }; boot.kernelModules = [ "tun" ]; diff --git a/pkgs/applications/science/math/sage/sagedoc.nix b/pkgs/applications/science/math/sage/sagedoc.nix index f4a8bf19b69c..d53947d806d1 100644 --- a/pkgs/applications/science/math/sage/sagedoc.nix +++ b/pkgs/applications/science/math/sage/sagedoc.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { mv html/en/_static{,.tmp} for _dir in `find -name _static` ; do rm -r $_dir - ln -s html/en/_static $_dir + ln -rs html/en/_static $_dir done mv html/en/_static{.tmp,} ''; diff --git a/pkgs/development/compilers/halide/default.nix b/pkgs/development/compilers/halide/default.nix index 69b7cd4d8682..916d8fa56f75 100644 --- a/pkgs/development/compilers/halide/default.nix +++ b/pkgs/development/compilers/halide/default.nix @@ -41,7 +41,17 @@ llvmPackages.stdenv.mkDerivation rec { # Note: only openblas and not atlas part of this Nix expression # see pkgs/development/libraries/science/math/liblapack/3.5.0.nix # to get a hint howto setup atlas instead of openblas - buildInputs = [ llvmPackages.llvm libpng libjpeg mesa eigen openblas ]; + buildInputs = [ + llvmPackages.llvm + llvmPackages.lld + llvmPackages.openmp + llvmPackages.libclang + libpng + libjpeg + mesa + eigen + openblas + ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/interpreters/luajit/2.0.nix b/pkgs/development/interpreters/luajit/2.0.nix index c0be721701cb..528c14a8b247 100644 --- a/pkgs/development/interpreters/luajit/2.0.nix +++ b/pkgs/development/interpreters/luajit/2.0.nix @@ -1,10 +1,10 @@ { self, callPackage, lib }: callPackage ./default.nix { inherit self; - version = "2.0.5-2021-05-17"; - rev = "44684fa71d8af6fa8b3051c7d763bbfdcf7915d7"; + version = "2.0.5-2021-05-29"; + rev = "c2cfa04231785116d9d198462830f41ef94147c0"; isStable = true; - sha256 = "049d3l0miv4n0cnm35ml8flrb9vs12zvbda2743vypckymidliqp"; + sha256 = "1fw64pv0dvzb9bgr2zwcv9q8gqgsmfnvrcrmrdfgj4ncamgdnilj"; extraMeta = { # this isn't precise but it at least stops the useless Hydra build platforms = with lib; filter (p: p != "aarch64-linux") (platforms.linux ++ platforms.darwin); diff --git a/pkgs/development/interpreters/luajit/2.1.nix b/pkgs/development/interpreters/luajit/2.1.nix index 8be8aa82b08c..f85fc0932cca 100644 --- a/pkgs/development/interpreters/luajit/2.1.nix +++ b/pkgs/development/interpreters/luajit/2.1.nix @@ -1,8 +1,8 @@ { self, callPackage }: callPackage ./default.nix { inherit self; - version = "2.1.0-2021-05-22"; - rev = "5783ba1bf73c53ca56e64ed0c462c62224f0393c"; + version = "2.1.0-2021-05-29"; + rev = "839fb5bd72341d8e67b6cfc2053e2acffdb75567"; isStable = false; - sha256 = "1j25xnbradks58lwsqnxcc7k29wsk2hnky0b1vjzpadrj0sxxc42"; + sha256 = "1gyzq4n0fwah0245wazv4c43q9in1mwbk3dhh6cb1ijnjcxp2bb6"; } diff --git a/pkgs/development/ocaml-modules/tyxml/default.nix b/pkgs/development/ocaml-modules/tyxml/default.nix index bf0e06507c9e..c49327d7d338 100644 --- a/pkgs/development/ocaml-modules/tyxml/default.nix +++ b/pkgs/development/ocaml-modules/tyxml/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "tyxml"; - version = "4.4.0"; + version = "4.5.0"; useDune2 = true; src = fetchurl { url = "https://github.com/ocsigen/tyxml/releases/download/${version}/tyxml-${version}.tbz"; - sha256 = "0c150h2f4c4id73ickkdqkir3jya66m6c7f5jxlp4caw9bfr8qsi"; + sha256 = "0s30f72m457c3gbdmdwbx7ls9zg806nvm83aiz9qkpglbppwr6n6"; }; propagatedBuildInputs = [ uutf re ]; @@ -19,7 +19,7 @@ buildDunePackage rec { license = licenses.lgpl21; maintainers = with maintainers; [ gal_bolle vbgl - ]; + ]; }; } diff --git a/pkgs/development/ocaml-modules/uri/default.nix b/pkgs/development/ocaml-modules/uri/default.nix index 7933b3bd8d42..f669a98c4def 100644 --- a/pkgs/development/ocaml-modules/uri/default.nix +++ b/pkgs/development/ocaml-modules/uri/default.nix @@ -5,13 +5,13 @@ buildDunePackage rec { minimumOCamlVersion = "4.03"; pname = "uri"; - version = "4.0.0"; + version = "4.2.0"; useDune2 = true; src = fetchurl { url = "https://github.com/mirage/ocaml-${pname}/releases/download/v${version}/${pname}-v${version}.tbz"; - sha256 = "13r9nkgym9z3dqxkyf0yyaqlrk5r3pjdw0kfzvrc90bmhwl9j380"; + sha256 = "0szifda6yism5vn5jdizkha3ad0xk6zw4xgfl8g77dnv83ci7h65"; }; checkInputs = [ ounit ]; diff --git a/pkgs/development/python-modules/pygtfs/default.nix b/pkgs/development/python-modules/pygtfs/default.nix new file mode 100644 index 000000000000..735990c09448 --- /dev/null +++ b/pkgs/development/python-modules/pygtfs/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, docopt +, fetchPypi +, nose +, pytz +, setuptools-scm +, six +, sqlalchemy +}: + +buildPythonPackage rec { + pname = "pygtfs"; + version = "0.1.6"; + + src = fetchPypi { + inherit pname version; + sha256 = "0nx2idgza07kmvj7pcgpj3pqhw53v5rq63paw2ly51cjas2fv5pr"; + }; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + docopt + pytz + six + sqlalchemy + ]; + + checkInputs = [ + nose + ]; + + pythonImportsCheck = [ "pygtfs" ]; + + meta = with lib; { + description = "Python module for GTFS"; + homepage = "https://github.com/jarondl/pygtfs"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/pytube/default.nix b/pkgs/development/python-modules/pytube/default.nix index a557c623a07c..086c3a8671b1 100644 --- a/pkgs/development/python-modules/pytube/default.nix +++ b/pkgs/development/python-modules/pytube/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "pytube"; - version = "10.8.2"; + version = "10.8.3"; disabled = pythonOlder "3.6"; @@ -15,7 +15,7 @@ buildPythonPackage rec { owner = "pytube"; repo = "pytube"; rev = "v${version}"; - sha256 = "sha256-LY1aDFzF0vHwEa3pfAoxZ3KM1l39PDo6S6F3xtqqspU="; + sha256 = "sha256-U/TXA/0y5tsuj0q3kxacHk76wjYG6k8mPX5F3MpADmk="; }; checkInputs = [ diff --git a/pkgs/development/tools/build-managers/scons/common.nix b/pkgs/development/tools/build-managers/scons/common.nix index 8b5b608fdf39..6af302851234 100644 --- a/pkgs/development/tools/build-managers/scons/common.nix +++ b/pkgs/development/tools/build-managers/scons/common.nix @@ -43,6 +43,6 @@ python3Packages.buildPythonApplication rec { changelog = "https://raw.githubusercontent.com/SConsProject/scons/rel_${version}/src/CHANGES.txt"; license = licenses.mit; platforms = platforms.all; - maintainers = [ maintainers.primeos ]; + maintainers = [ ]; }; } diff --git a/pkgs/games/rpg-cli/default.nix b/pkgs/games/rpg-cli/default.nix index 1e07c3418fcc..0c3a58c98a96 100644 --- a/pkgs/games/rpg-cli/default.nix +++ b/pkgs/games/rpg-cli/default.nix @@ -2,17 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "rpg-cli"; - version = "unstable-2021-05-27"; + version = "0.3.0"; src = fetchFromGitHub { owner = "facundoolano"; repo = pname; - # certain revision because the Cargo.lock was checked-in in that commit - rev = "4d8a1dac79a1d29d79c0c874475037769dcef5a1"; - sha256 = "sha256-qfj1uij9lYyfyHFUnVi9I0ELOoObjFG2NS9UreC/xio="; + rev = version; + sha256 = "sha256-pcVxUX6CPIE5GJniXbAiwZQjwv2eer8LevFl6gASKmM="; }; - cargoSha256 = "sha256-I+rSfuiGFdzA5zqPfvMPcERaQfiX92LW2NKjazWh9c4="; + cargoSha256 = "sha256-4DB3Zj9awmKX5t1zCgWxetz/+tl6ojpCEKxWpZFlMcw="; # tests assume the authors macbook, and thus fail doCheck = false; @@ -22,6 +21,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/facundoolano/rpg-cli"; license = licenses.mit; maintainers = with maintainers; [ legendofmiracles ]; - mainProgram = "rpg-cli"; }; } diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index b213ff9089e2..8215d35a9e89 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -1845,6 +1845,18 @@ final: prev: meta.homepage = "https://github.com/gruvbox-community/gruvbox/"; }; + gruvbox-flat-nvim = buildVimPluginFrom2Nix { + pname = "gruvbox-flat-nvim"; + version = "2021-05-28"; + src = fetchFromGitHub { + owner = "eddyekofo94"; + repo = "gruvbox-flat.nvim"; + rev = "521d9234d1c8c3a0e9dc782a8f2e5776483856b0"; + sha256 = "1k92z847ix3c7kwiyiw4x41z2sid2wyyjgv08myh93k0ivb5y4qh"; + }; + meta.homepage = "https://github.com/eddyekofo94/gruvbox-flat.nvim/"; + }; + gruvbox-nvim = buildVimPluginFrom2Nix { pname = "gruvbox-nvim"; version = "2021-05-12"; diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 8184ee35aad6..79c85a7bfe69 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -107,6 +107,7 @@ eagletmt/ghcmod-vim eagletmt/neco-ghc easymotion/vim-easymotion eddiebergman/nvim-treesitter-pyfold +eddyekofo94/gruvbox-flat.nvim editorconfig/editorconfig-vim edluffy/hologram.nvim@main edluffy/specs.nvim@main diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index 6db953ae4eff..e41ae3bece24 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -206,9 +206,9 @@ in { kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.13"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.1.0-rc5"; + version = "2.1.0-rc6"; - sha256 = "sha256-cj0P2bw6sTO+Y74pYn/WEpBuVGMMYCreJQjUdC3DMTE="; + sha256 = "0q3vl9rid6a84pb85v38hnf17vws65jjb4slw8bhm8dq8fna2a86"; isUnstable = true; }; diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 0e952c444deb..98e0781186b9 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -331,7 +331,7 @@ "group" = ps: with ps; [ ]; "growatt_server" = ps: with ps; [ ]; # missing inputs: growattServer "gstreamer" = ps: with ps; [ ]; # missing inputs: gstreamer-player - "gtfs" = ps: with ps; [ ]; # missing inputs: pygtfs + "gtfs" = ps: with ps; [ pygtfs ]; "guardian" = ps: with ps; [ aioguardian ]; "habitica" = ps: with ps; [ ]; # missing inputs: habitipy "hangouts" = ps: with ps; [ ]; # missing inputs: hangups diff --git a/pkgs/tools/misc/bunnyfetch/default.nix b/pkgs/tools/misc/bunnyfetch/default.nix new file mode 100644 index 000000000000..37e1be80e3c3 --- /dev/null +++ b/pkgs/tools/misc/bunnyfetch/default.nix @@ -0,0 +1,28 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "bunnyfetch"; + version = "unstable-2021-05-24"; + + src = fetchFromGitHub { + owner = "Mewyuna"; + repo = pname; + rev = "7bcc45fb590b37f410e60af893e679eb0729ecb1"; + sha256 = "1lgqrwmxdxd1d99rr0akydfwcsbcmz75fkbq9zrl842rksnp5q3r"; + }; + + vendorSha256 = "1vv69y0x06kn99lw995sbkb7vgd0yb18flkr2ml8ss7q2yvz37vi"; + + # No upstream tests + doCheck = false; + + subPackages = [ "." ]; + + meta = with lib; { + description = "Tiny system info fetch utility"; + homepage = "https://github.com/Mewyuna/bunnyfetch"; + license = licenses.mit; + maintainers = with maintainers; [ devins2518 ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a1d20225484b..2da9b74e7ed1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -31629,6 +31629,8 @@ in kodelife = callPackage ../applications/graphics/kodelife {}; + bunnyfetch = callPackage ../tools/misc/bunnyfetch {}; + _3proxy = callPackage ../applications/networking/3proxy {}; pigeon = callPackage ../development/tools/pigeon {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 03ffc1a6bda4..d9ba0532782a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5759,6 +5759,8 @@ in { pygrok = callPackage ../development/python-modules/pygrok { }; + pygtfs = callPackage ../development/python-modules/pygtfs { }; + pygtail = callPackage ../development/python-modules/pygtail { }; pygtrie = callPackage ../development/python-modules/pygtrie { };