diff options
Diffstat (limited to 'pkgs')
32 files changed, 278 insertions, 364 deletions
diff --git a/pkgs/applications/graphics/krita/beta.nix b/pkgs/applications/graphics/krita/beta.nix deleted file mode 100644 index 7733c1248fc..00000000000 --- a/pkgs/applications/graphics/krita/beta.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ callPackage, ... } @ args: - -callPackage ./generic.nix (args // { - version = "5.0.0-beta2"; - kde-channel = "unstable"; - sha256 = "0hwh6k40f4kmwg14dy0vvm0m8cx8n0q67lrrc620da9mign3hjs7"; -}) diff --git a/pkgs/applications/graphics/krita/default.nix b/pkgs/applications/graphics/krita/default.nix index 7e0a8915c40..e9393a2e5a8 100644 --- a/pkgs/applications/graphics/krita/default.nix +++ b/pkgs/applications/graphics/krita/default.nix @@ -1,7 +1,7 @@ { callPackage, ... } @ args: callPackage ./generic.nix (args // { - version = "4.4.8"; + version = "5.0.0"; kde-channel = "stable"; - sha256 = "1y0d8gnxfdg5nfwk8dgx8fc2bwskvnys049napb1a9fr25bqmimw"; + sha256 = "sha256-hNWDPbyrP9OkGPTDdnDYKtkZQw8MbQpXuZOQdHHuzFc="; }) diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix index d5e2e6adf52..8ec80e99522 100644 --- a/pkgs/applications/misc/corectrl/default.nix +++ b/pkgs/applications/misc/corectrl/default.nix @@ -6,7 +6,7 @@ , kauth , libdrm , hwdata -, mesa-demos +, glxinfo , procps , util-linux , vulkan-tools @@ -39,7 +39,7 @@ stdenv.mkDerivation rec{ karchive kauth libdrm - mesa-demos + glxinfo procps util-linux vulkan-tools @@ -53,7 +53,7 @@ stdenv.mkDerivation rec{ cmakeFlags = [ "-DWITH_PCI_IDS_PATH=${hwdata}/share/hwdata/pci.ids" ]; - runtimeDeps = [ hwdata mesa-demos vulkan-tools ]; + runtimeDeps = [ hwdata glxinfo vulkan-tools util-linux procps ]; binPath = lib.makeBinPath runtimeDeps; dontWrapQtApps = true; diff --git a/pkgs/applications/misc/hubstaff/default.nix b/pkgs/applications/misc/hubstaff/default.nix index ad40f6c8389..5110815023a 100644 --- a/pkgs/applications/misc/hubstaff/default.nix +++ b/pkgs/applications/misc/hubstaff/default.nix @@ -4,9 +4,9 @@ , curl, writeShellScript, common-updater-scripts }: let - url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.3-b75e2da6/Hubstaff-1.6.3-b75e2da6.sh"; - version = "1.6.3-b75e2da6"; - sha256 = "0p77182p5rqbng8j6ndijq5br9hiwcmblpw8j5nc26m5w45jfspw"; + url = "https://hubstaff-production.s3.amazonaws.com/downloads/HubstaffClient/Builds/Release/1.6.4-6681f81d/Hubstaff-1.6.4-6681f81d.sh"; + version = "1.6.4-6681f81d"; + sha256 = "1j0rzyqm9zm2w44zwxq61fy19m27ghlv11mbfl7yzh2ccmxljxjm"; rpath = lib.makeLibraryPath [ libX11 zlib libSM libICE libXext freetype libXrender fontconfig libXft diff --git a/pkgs/applications/misc/snapmaker-luban/default.nix b/pkgs/applications/misc/snapmaker-luban/default.nix index 84ad34637f5..9d89a24f242 100644 --- a/pkgs/applications/misc/snapmaker-luban/default.nix +++ b/pkgs/applications/misc/snapmaker-luban/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "snapmaker-luban"; - version = "4.0.3"; + version = "4.1.1"; src = fetchurl { url = "https://github.com/Snapmaker/Luban/releases/download/v${version}/snapmaker-luban-${version}-linux-x64.tar.gz"; - sha256 = "13qk7ssfawjaa5p4mnml4ndzzsqs26qpi76hc9qaipi74ss3jih4"; + sha256 = "sha256-M+e3dNK1Z1Nkswac04TkuYHFX/Y/Cz4Z6P1xGv99kOo="; }; nativeBuildInputs = [ diff --git a/pkgs/applications/networking/browsers/eolie/default.nix b/pkgs/applications/networking/browsers/eolie/default.nix index f6dc79a2a0f..9a8156e0cf3 100644 --- a/pkgs/applications/networking/browsers/eolie/default.nix +++ b/pkgs/applications/networking/browsers/eolie/default.nix @@ -38,7 +38,7 @@ python3.pkgs.buildPythonApplication rec { gtkspell3 hunspell libsecret - (webkitgtk.override {enableGLES = false;}) + webkitgtk glib ]; diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 04108248457..d0d0b6638bc 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -8,7 +8,7 @@ , freetype, fontconfig, file, nspr, nss , yasm, libGLU, libGL, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification -, libvpx_1_8 +, libvpx , icu69, libpng, glib, pciutils , autoconf213, which, gnused, rustPackages , rust-cbindgen, nodejs, nasm, fetchpatch @@ -151,7 +151,7 @@ buildStdenv.mkDerivation ({ xorg.libXext libevent libstartup_notification /* cairo */ libpng glib - nasm icu69 libvpx_1_8 + nasm icu69 libvpx # >= 66 requires nasm for the AV1 lib dav1d # yasm can potentially be removed in future versions # https://bugzilla.mozilla.org/show_bug.cgi?id=1501796 diff --git a/pkgs/applications/networking/browsers/google-chrome/default.nix b/pkgs/applications/networking/browsers/google-chrome/default.nix index 03bdb84f438..fe6ef5c059d 100644 --- a/pkgs/applications/networking/browsers/google-chrome/default.nix +++ b/pkgs/applications/networking/browsers/google-chrome/default.nix @@ -104,6 +104,8 @@ in stdenv.mkDerivation { binpath = makeBinPath deps; installPhase = '' + runHook preInstall + case ${channel} in beta) appname=chrome-beta dist=beta ;; dev) appname=chrome-unstable dist=unstable ;; @@ -154,6 +156,8 @@ in stdenv.mkDerivation { patchelf --set-rpath $rpath $elf patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $elf done + + runHook postInstall ''; meta = { diff --git a/pkgs/development/compilers/gcc/10/default.nix b/pkgs/development/compilers/gcc/10/default.nix index f9dd0465b92..4493fd936ec 100644 --- a/pkgs/development/compilers/gcc/10/default.nix +++ b/pkgs/development/compilers/gcc/10/default.nix @@ -64,6 +64,7 @@ let majorVersion = "10"; patches = optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch + ++ optional (noSysDirs && hostPlatform.isRiscV) ../no-sys-dirs-riscv.patch /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; sha256 = ""; # TODO: uncomment and check hash when available. diff --git a/pkgs/development/compilers/gcc/11/default.nix b/pkgs/development/compilers/gcc/11/default.nix index f71f941540c..a9498b1060d 100644 --- a/pkgs/development/compilers/gcc/11/default.nix +++ b/pkgs/development/compilers/gcc/11/default.nix @@ -64,6 +64,7 @@ let majorVersion = "11"; patches = optional (targetPlatform != hostPlatform) ../libstdc++-target.patch ++ optional noSysDirs ../no-sys-dirs.patch + ++ optional (noSysDirs && hostPlatform.isRiscV) ../no-sys-dirs-riscv.patch /* ++ optional (hostPlatform != buildPlatform) (fetchpatch { # XXX: Refine when this should be applied url = "https://git.busybox.net/buildroot/plain/package/gcc/${version}/0900-remove-selftests.patch?id=11271540bfe6adafbc133caf6b5b902a816f5f02"; sha256 = ""; # TODO: uncomment and check hash when available. diff --git a/pkgs/development/compilers/gcc/no-sys-dirs-riscv.patch b/pkgs/development/compilers/gcc/no-sys-dirs-riscv.patch new file mode 100644 index 00000000000..00e2838af6f --- /dev/null +++ b/pkgs/development/compilers/gcc/no-sys-dirs-riscv.patch @@ -0,0 +1,12 @@ +--- a/gcc/config/riscv/linux.h ++++ b/gcc/config/riscv/linux.h +@@ -69,8 +69,4 @@ + + #define TARGET_ASM_FILE_END file_end_indicate_exec_stack + +-#define STARTFILE_PREFIX_SPEC \ +- "/lib" XLEN_SPEC "/" ABI_SPEC "/ " \ +- "/usr/lib" XLEN_SPEC "/" ABI_SPEC "/ " \ +- "/lib/ " \ +- "/usr/lib/ " ++#define STARTFILE_PREFIX_SPEC "" diff --git a/pkgs/development/libraries/eccodes/default.nix b/pkgs/development/libraries/eccodes/default.nix index a528656fe46..dc0648366a9 100644 --- a/pkgs/development/libraries/eccodes/default.nix +++ b/pkgs/development/libraries/eccodes/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "eccodes"; - version = "2.23.0"; + version = "2.24.0"; src = fetchurl { url = "https://confluence.ecmwf.int/download/attachments/45757960/eccodes-${version}-Source.tar.gz"; - sha256 = "sha256-y9yFMlN+loLxqT3bA0QEFrZpBqTMJd7Dy9c5QNGUvww="; + sha256 = "sha256-MHrit59KfTF4mCS8od8UEvYMrWj0m/xJu8HUeA8+W5Y="; }; postPatch = '' diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix new file mode 100644 index 00000000000..61b2e9ba750 --- /dev/null +++ b/pkgs/development/python-modules/openai/default.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder + +# Python dependencies +, openpyxl +, pandas +, pandas-stubs +, requests +, tqdm + +# Check dependencies +, pytest-mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "openai"; + version = "0.11.4"; + + disabled = pythonOlder "3.7.1"; + + # Use GitHub source since PyPi source does not include tests + src = fetchFromGitHub { + owner = "openai"; + repo = "openai-python"; + rev = "v${version}"; + sha256 = "O2O4+GkyMyAxJqMNgiyPKoSXeJk0HGAst02QV6c9mJs="; + }; + + propagatedBuildInputs = [ + openpyxl + pandas + pandas-stubs + requests + tqdm + ]; + + pythonImportsCheck = [ "openai" ]; + checkInputs = [ pytestCheckHook pytest-mock ]; + pytestFlagsArray = [ "openai/tests" ]; + OPENAI_API_KEY = "sk-foo"; + disabledTestPaths = [ + "openai/tests/test_endpoints.py" # requires a real API key + "openai/tests/test_file_cli.py" + ]; + + meta = with lib; { + description = "Python client library for the OpenAI API"; + homepage = "https://github.com/openai/openai-python"; + license = licenses.mit; + maintainers = [ maintainers.malo ]; + }; +} diff --git a/pkgs/development/python-modules/pandas-stubs/default.nix b/pkgs/development/python-modules/pandas-stubs/default.nix new file mode 100644 index 00000000000..c5684769776 --- /dev/null +++ b/pkgs/development/python-modules/pandas-stubs/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, isPy27 +, fetchFromGitHub +, typing-extensions +, mypy +}: + +buildPythonPackage rec { + pname = "pandas-stubs"; + version = "1.2.0.39"; + + disabled = isPy27; + + # Use GitHub source since PyPi source does not include tests + src = fetchFromGitHub { + owner = "VirtusLab"; + repo = pname; + rev = "2bd932777d1050ea8f86c527266a4cd205aa15b1"; + sha256 = "m2McU53NNvRwnWKN9GL8dW1eCGKbTi0471szRQwZu1Q="; + }; + + propagatedBuildInputs = [ + typing-extensions + ]; + + pythonImportsCheck = [ "pandas" ]; + checkInputs = [ mypy ]; + checkPhase = '' + mypy --config-file mypy.ini third_party/3/pandas tests/snippets + ''; + + meta = with lib; { + description = "Type annotations for Pandas"; + homepage = "https://github.com/VirtusLab/pandas-stubs"; + license = licenses.mit; + maintainers = [ maintainers.malo ]; + }; +} diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gdscript.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gdscript.json index a7c5970eb5b..23d0dd98a00 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gdscript.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gdscript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/prestonknopp/tree-sitter-gdscript", - "rev": "eed1595d830407b49775aa33b871a9400e5a44e6", - "date": "2021-11-27T11:52:11-08:00", - "path": "/nix/store/spim2mz5frha9lfvrkgdwyrwsxm41fhs-tree-sitter-gdscript", - "sha256": "1aymw5hi636wfngsvx6c0z8lpfdqfnh0xjh7avaq99npbg6sbn51", + "rev": "2a6abdaa47fcb91397e09a97c7433fd995ea46c6", + "date": "2021-12-20T23:14:36-08:00", + "path": "/nix/store/kzps55mk9caigy4s9smvsqwm1savaaq7-tree-sitter-gdscript", + "sha256": "0k7lgli5b9f6dlsafl29lrmzd221ayj50q1axjihm7w70miwyck0", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json index 240ec944f4b..19b3463215e 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-godot-resource.json @@ -1,9 +1,9 @@ { "url": "https://github.com/prestonknopp/tree-sitter-godot-resource", - "rev": "4ad1b796fb375c8e0fbf5b3cad57050b4372114f", - "date": "2021-11-27T00:00:05-08:00", - "path": "/nix/store/n9jcbf1rxzg9bqlmkhrjpx1pbqjq2bkg-tree-sitter-godot-resource", - "sha256": "12ws3lslhm6aq52s3hvgrxrvyz1kfm6r5k8pfxf5nwbr3pxbndmw", + "rev": "b6ef0768711086a86b3297056f9ffb5cc1d77b4a", + "date": "2021-12-20T22:40:16-08:00", + "path": "/nix/store/3lmwkk16jmjnkx8lrl33i7a19hjca2jz-tree-sitter-godot-resource", + "sha256": "0agnvg95fx60xkr5fivl1x3yhcw6ca58f7bpx3dq6fl7pyfgrky2", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json index fa5ff363241..26f6d7bc0bc 100644 --- a/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json +++ b/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-supercollider.json @@ -1,9 +1,9 @@ { "url": "https://github.com/madskjeldgaard/tree-sitter-supercollider", - "rev": "df3b6210bad8f352515cd0c92aadb1e63802283b", - "date": "2021-12-15T19:44:59+01:00", - "path": "/nix/store/01jd9nc524mi1snkp9ln9s8xyh98bhzf-tree-sitter-supercollider", - "sha256": "04jd3vc0965c3nwy0d61cdj9gp7drabd8d35g63vyz9s9kr29vv2", + "rev": "ac83e9d5ef3a62d2160d0f1e0a64a949ecda1d8b", + "date": "2021-12-21T18:04:07+01:00", + "path": "/nix/store/zk5zwg98pljk2dwqax81pib3l68wgl8x-tree-sitter-supercollider", + "sha256": "0qpjy40wigcf6r23j2i3yqr061n6zdz60mlm9i5mkii2y65ff8cf", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix index e5b5f9b0607..4f4c1f58fe2 100644 --- a/pkgs/development/tools/pscale/default.nix +++ b/pkgs/development/tools/pscale/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "pscale"; - version = "0.85.0"; + version = "0.88.0"; src = fetchFromGitHub { owner = "planetscale"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-I2t5tuBlO2RpY8+zWSTIDOziriqE6PGKVIwPdmvXuKo="; + sha256 = "sha256-/QQ35zLqhhJw/h1u08Sb3FDz8O+7kh/pVz1EgEJQUfg="; }; - vendorSha256 = "sha256-V7iXPM2WTR5zls/EFxpoLKrconP88om6y2CFNiuS6g4="; + vendorSha256 = "sha256-kNt7tMHubpcrfzAjf++GxV3kEj2g6fHFrP9cY8UPqB8="; meta = with lib; { homepage = "https://www.planetscale.com/"; diff --git a/pkgs/development/web/postman/default.nix b/pkgs/development/web/postman/default.nix index cdfd2f9b354..5896bbf336e 100644 --- a/pkgs/development/web/postman/default.nix +++ b/pkgs/development/web/postman/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { pname = "postman"; - version = "9.3.1"; + version = "9.6.1"; src = fetchurl { url = "https://dl.pstmn.io/download/version/${version}/linux64"; - sha256 = "sha256-zHJOmvbg/z8tsor7y7vM0ECZjPaOqjNuBgcqtCCvqiE="; + sha256 = "sha256-4nnOMMfxk4VP8t5eLGHrlHEIeDA+Tp1Hqfe8EWaXUik="; name = "${pname}.tar.gz"; }; diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix index 70fc75b3c51..4060e2928f7 100644 --- a/pkgs/misc/vim-plugins/generated.nix +++ b/pkgs/misc/vim-plugins/generated.nix @@ -473,12 +473,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-12-21"; + version = "2021-12-22"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "52022913fe4446a2b649fb3ff9cfdf9def4b7b00"; - sha256 = "1alr8xj01dqlvyjq0ay5c54w0lwgbqf32sd3d1qbjdf6fgi8x86y"; + rev = "57f8241fe429530f9c733286413b84f51c30e3fd"; + sha256 = "16b9qbjmn2l7jxywalqyvr9x9dl2hp00gi5bm7j64niwycwimfyp"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -737,16 +737,28 @@ final: prev: cmp-tabnine = buildVimPluginFrom2Nix { pname = "cmp-tabnine"; - version = "2021-12-09"; + version = "2021-12-22"; src = fetchFromGitHub { owner = "tzachar"; repo = "cmp-tabnine"; - rev = "da0800bbff110c81f16c1838ec08141a9823ce1e"; - sha256 = "0x3149ggpsxi7jsmvb4x2nyr6j3yvmwk1vi5q9hbhz7aqrs5qypb"; + rev = "e69df7b9ae441f8c3e58fcbca116f668a224dc2f"; + sha256 = "08dmgbfhccfwb5vvypi3yyazxvzjj8mn8xzmlmyq00swx7gy9la8"; }; meta.homepage = "https://github.com/tzachar/cmp-tabnine/"; }; + cmp-tmux = buildVimPluginFrom2Nix { + pname = "cmp-tmux"; + version = "2021-11-30"; + src = fetchFromGitHub { + owner = "andersevenrud"; + repo = "cmp-tmux"; + rev = "5106ae2d3c93d37173ccb3b917bebb9845e3d3e6"; + sha256 = "1svhj1n17y70ns9d0hc9a3dvxb1nmpii5vgificgpwqfmkws4dak"; + }; + meta.homepage = "https://github.com/andersevenrud/cmp-tmux/"; + }; + cmp-treesitter = buildVimPluginFrom2Nix { pname = "cmp-treesitter"; version = "2021-12-02"; @@ -869,12 +881,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2021-12-21"; + version = "2021-12-22"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "37559aa90f9d149b8255dc06c28c8d7ba34b805e"; - sha256 = "086hahg9xjddll7c2a1ydmhxn7gywx3v63bzfbi260mxi6rl4a2s"; + rev = "5e5eed44c192d276824ecf5a61101a8fdd016544"; + sha256 = "05025bh4v1x9rk2miivkh7p6hdrkbg9if07vglzahsigj286ws1p"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1000,18 +1012,6 @@ final: prev: meta.homepage = "https://github.com/tzachar/compe-tabnine/"; }; - compe-tmux = buildVimPluginFrom2Nix { - pname = "compe-tmux"; - version = "2021-11-30"; - src = fetchFromGitHub { - owner = "andersevenrud"; - repo = "compe-tmux"; - rev = "5106ae2d3c93d37173ccb3b917bebb9845e3d3e6"; - sha256 = "1svhj1n17y70ns9d0hc9a3dvxb1nmpii5vgificgpwqfmkws4dak"; - }; - meta.homepage = "https://github.com/andersevenrud/compe-tmux/"; - }; - compe-zsh = buildVimPluginFrom2Nix { pname = "compe-zsh"; version = "2021-04-03"; @@ -1182,12 +1182,12 @@ final: prev: crates-nvim = buildVimPluginFrom2Nix { pname = "crates.nvim"; - version = "2021-12-21"; + version = "2021-12-22"; src = fetchFromGitHub { owner = "saecki"; repo = "crates.nvim"; - rev = "40f6c2abd2cc17c5579d56fecf62b461849d6302"; - sha256 = "1nwzjbp8ld4gpjw4c94vq3hzck6lv3rb9cqyzqyvby98rvg3zra4"; + rev = "34fe3a241d8341878de3facf15f64d0f1977fea6"; + sha256 = "0dnplvblxf9gf48q6s4f12l7rfbf2hxwb4c7iz3piqfz4ml44jqv"; }; meta.homepage = "https://github.com/saecki/crates.nvim/"; }; @@ -1870,12 +1870,12 @@ final: prev: feline-nvim = buildVimPluginFrom2Nix { pname = "feline.nvim"; - version = "2021-10-15"; + version = "2021-12-22"; src = fetchFromGitHub { owner = "feline-nvim"; repo = "feline.nvim"; - rev = "4ef5e1516395eea731275e0f58b6bfba5c6ac9c1"; - sha256 = "12fci8gkbs3gf7cx68dpczkvsgy7bbax6f5fdl6fbjszpwr96lhw"; + rev = "4893372087444594add4631cf11f72c71e1aa1e4"; + sha256 = "14pbp9dkd743sr3fagpyjx63hx9b97m2k8m1d1j3isx35x7k9fgp"; }; meta.homepage = "https://github.com/feline-nvim/feline.nvim/"; }; @@ -2243,12 +2243,12 @@ final: prev: gitlinker-nvim = buildVimPluginFrom2Nix { pname = "gitlinker.nvim"; - version = "2021-11-29"; + version = "2021-12-22"; src = fetchFromGitHub { owner = "ruifm"; repo = "gitlinker.nvim"; - rev = "a11e5fa14bbb438f59a3744bff53a3ad78eecd71"; - sha256 = "0s17alrjqbdyk7jxg6jyb4xwmr9741a2r3306ywx6qsl9pk3n0p2"; + rev = "6f0430803162738bdab70bda8de45a71257f942d"; + sha256 = "06bygsggk1lblkid28ayhw58klxl7v9cm4c5vinmb42yhw5nx69w"; }; meta.homepage = "https://github.com/ruifm/gitlinker.nvim/"; }; @@ -3072,12 +3072,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed.nvim"; - version = "2021-12-19"; + version = "2021-12-22"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "b6ccf8207cc1384677a65a3527aed3020a08ec91"; - sha256 = "10pxbhiy2mbz4cm0cxv6c6lnhad40rwdy7l9b354f86wlvvglbjn"; + rev = "9fddb6ebf4007eaa26f44cd31b5140cbd3bbb820"; + sha256 = "0d78fi1vch4frnkni2znqdj109igb4v1x24xlzr1k0yhz9gybh9y"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -3184,8 +3184,8 @@ final: prev: src = fetchFromGitHub { owner = "ray-x"; repo = "lsp_signature.nvim"; - rev = "c8a2a4033cb1769c8f3f67bb3f2e0cb121a2b70a"; - sha256 = "0md6jm42cr9vzkyiwrblyl92wyafl2i8cn3zxvyflhhm1rhkchgw"; + rev = "be39dacc17d51531f9e3a50f88de0a45683c6634"; + sha256 = "1hj5b079akiy8k09bvzq36hb9icw0cspb2xk0dg88zafflkh9q3y"; }; meta.homepage = "https://github.com/ray-x/lsp_signature.nvim/"; }; @@ -3228,12 +3228,12 @@ final: prev: lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine.nvim"; - version = "2021-12-18"; + version = "2021-12-22"; src = fetchFromGitHub { owner = "nvim-lualine"; repo = "lualine.nvim"; - rev = "3a17c8f05aae1f148b8af595b46fea18b74d0573"; - sha256 = "0yy3rp45y5h1zimpjjl2bzn859k8zb658zbr7mc5s1cf4w61pqjl"; + rev = "593e28964cb3f071031cf849d562c982582ddaa0"; + sha256 = "1rwrvrqplxqhdb904grvcnf0k3fldxyfc7yqf8lhymjr6dgpqnbh"; }; meta.homepage = "https://github.com/nvim-lualine/lualine.nvim/"; }; @@ -4056,12 +4056,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls.nvim"; - version = "2021-12-21"; + version = "2021-12-22"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "1c80377e0ab63f692540e75fba2a0c0c8d51de71"; - sha256 = "1jmk8xhpiy9jn2qaplkw0ax6npgp45052rcyxz5cxz3b7zn04944"; + rev = "b7de45a0e62bf93f19db2b43ecded48c5763248d"; + sha256 = "05mvqgk1a9ljqxg4zpd0a37wqpns7n1mb8dhm75ihr3wbqz4hbgm"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -4236,12 +4236,12 @@ final: prev: nvim-dap = buildVimPluginFrom2Nix { pname = "nvim-dap"; - version = "2021-12-12"; + version = "2021-12-22"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-dap"; - rev = "9b8c27d6dcc21b69834fe9c2d344e49030783390"; - sha256 = "1x4wl4594kfjvq8s6bb3s136z0a10jkak7jsb40vn55kpmpmrd7p"; + rev = "a6fa644f9de62c594a8a9cf6f2aaf324b5a6108b"; + sha256 = "1ncl9f4vx382pma5x3siywc132hmns6nwj54w03b387129k25wky"; }; meta.homepage = "https://github.com/mfussenegger/nvim-dap/"; }; @@ -4404,12 +4404,12 @@ final: prev: nvim-lint = buildVimPluginFrom2Nix { pname = "nvim-lint"; - version = "2021-12-13"; + version = "2021-12-22"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-lint"; - rev = "4393540dbf7e881cb8fe572a8540284a6ae13201"; - sha256 = "0zxvn6jcj3jh4znznvypgn2kngl7hj6qln6nv25x35gadrplvf2r"; + rev = "ae94ac712277dc77d648da262eecc3c4ea938cc3"; + sha256 = "1s9dja4pb3nzpjvrp505y2pxckqi50pwsn4hk8d6770lw2nyk9r4"; }; meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; @@ -4428,12 +4428,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-12-20"; + version = "2021-12-21"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "c018b1e92e66b3429a2f167d59211846774f1e3b"; - sha256 = "05zrcmya04261h4jszn5jqckxb5pm662hb3cqb4fn3nsh9kva5h9"; + rev = "f84f592816a6b0c55e2a655b56c480683ad92c63"; + sha256 = "0933hn71qxbcn3g6g7jwhnmn9mywwfl9alnpwa9v5qwch0ardgnh"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -4572,12 +4572,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-12-21"; + version = "2021-12-22"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "6c5f4b1b49aa2e6f948fb58fb9df82954bebf488"; - sha256 = "1jaljk7rl7rrn1n61yvi1spb520fmpb8ihjr2mhcvprjhc3n84kq"; + rev = "56634f49ab3d8122153c8c5582c581fb6a6af075"; + sha256 = "1ffy9zl6k47iai4anvvghqv7vi5jqgqbp1ndjx0kagad40v6vlfp"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -4620,12 +4620,12 @@ final: prev: nvim-treesitter-textobjects = buildVimPluginFrom2Nix { pname = "nvim-treesitter-textobjects"; - version = "2021-12-21"; + version = "2021-12-22"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-textobjects"; - rev = "f51c3feb5abe1dea556c9076b8a8928d3bf56790"; - sha256 = "1m0gpnhd8pc1np5acs2vvd3my5s7pgvx3bvlqr8yip7aibl4ls0g"; + rev = "6ee11ac62681eb2eb8104a4ce509a9a861672cb5"; + sha256 = "0hgay8d4lja4fk3d6xhq08n1j9ic6flzq1w003b3fpxzr6l2b0vl"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-textobjects/"; }; @@ -4908,12 +4908,12 @@ final: prev: pgsql-vim = buildVimPluginFrom2Nix { pname = "pgsql.vim"; - version = "2021-12-03"; + version = "2021-12-08"; src = fetchFromGitHub { owner = "lifepillar"; repo = "pgsql.vim"; - rev = "b4518baca45a556ab8b1ad6daee78f8d4744f635"; - sha256 = "0jzzbsg73p6p0fjivix5bn8h6n1rz759bq8z1ilj2m6wz14c1ilm"; + rev = "736c9899163a7f4e212c1675d8a1fe42570a027a"; + sha256 = "0z79jpjncdfc1a6c2992g9q0qrsr90cpp1zh07nr8pzp9rqzgjsw"; }; meta.homepage = "https://github.com/lifepillar/pgsql.vim/"; }; @@ -5414,12 +5414,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2021-12-20"; + version = "2021-12-22"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "ad1586c3b9253c42275085161f4d075dd4d18715"; - sha256 = "0873y2n8wh66f138cq5cba1krcrij03w5mn1qzabb84yjqxk4x83"; + rev = "82b039aa402c9d138c3c4c16b1465c8a3be66117"; + sha256 = "1z8rlwq4190gba9610p73i2c082avafxjbwmdw5hmqfpplciaz09"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -5788,12 +5788,12 @@ final: prev: stabilize-nvim = buildVimPluginFrom2Nix { pname = "stabilize.nvim"; - version = "2021-12-20"; + version = "2021-12-22"; src = fetchFromGitHub { owner = "luukvbaal"; repo = "stabilize.nvim"; - rev = "e97de689cbebb5a58603905db7f09107d86a147b"; - sha256 = "15d2y9c928n8khpqr1p7y7g3yi10g2kgw8m89h1liarhfqlk2s8k"; + rev = "16d1d235f0b05beb423d8b5e4a32044441e7e8ff"; + sha256 = "00vaxyrji34xr0lhlanrd1sbbnrnvx93k6mwff0hmxq05m4r665x"; }; meta.homepage = "https://github.com/luukvbaal/stabilize.nvim/"; }; @@ -6595,12 +6595,12 @@ final: prev: vifm-vim = buildVimPluginFrom2Nix { pname = "vifm.vim"; - version = "2021-12-16"; + version = "2021-12-22"; src = fetchFromGitHub { owner = "vifm"; repo = "vifm.vim"; - rev = "8139a59e6153d63a761aeae29461ccfc95e2539c"; - sha256 = "12vaw3g9axisms8v411mdjiw7gydrcbmhw0pvi2bipq6rvpaisgb"; + rev = "6472c7d8cc5cf7176de89a91074b8574585ee4e3"; + sha256 = "0ficybz4kbr2zakgxh90v7af219y4wck18wibyvvhlr3f5d9b2br"; }; meta.homepage = "https://github.com/vifm/vifm.vim/"; }; @@ -10066,12 +10066,12 @@ final: prev: vim-sleuth = buildVimPluginFrom2Nix { pname = "vim-sleuth"; - version = "2021-12-20"; + version = "2021-12-21"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-sleuth"; - rev = "769ade8741a3d39d0902d23737ca0ce8bdb93020"; - sha256 = "08q9l1va932jcfyflvkbal7fba8mfm88rxnmhrr6y0bs2awj1l0a"; + rev = "e362d3552ba2fcf0bc1830a1c59e869b1c6f2067"; + sha256 = "0d292s94krvq8pl3rb0y8z2qsw89rqz4cqikal0kp08jx0q384w0"; }; meta.homepage = "https://github.com/tpope/vim-sleuth/"; }; @@ -10583,12 +10583,12 @@ final: prev: vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2021-12-11"; + version = "2021-12-21"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "274e3e34375d8e76db1fa68c5aae19273ad8be13"; - sha256 = "1h5fvs9vg3p204605v8a0y4hx6c1rbmn8wgn2654v97f3h1cm51y"; + rev = "513bc9cb4cab4d2eb849a647eb07cf3a2292a6fc"; + sha256 = "1plr9v5wscl9c04q2gl8wpyn3kdx9bzqgn25l1qi97izfpmzzdhl"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; diff --git a/pkgs/os-specific/linux/kernel/linux-xanmod.nix b/pkgs/os-specific/linux/kernel/linux-xanmod.nix index 6f1bfc55e7d..dac882d9cd3 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.15.7"; + version = "5.15.11"; release = "1"; suffix = "xanmod${release}-tt"; in @@ -13,7 +13,7 @@ buildLinux (args // rec { owner = "xanmod"; repo = "linux"; rev = modDirVersion; - sha256 = "sha256-SeqPnzT3SApFozgQsiGtS9uUqxk8aXcDp7adcERlL1A="; + sha256 = "sha256-f5DvjgZQoryCpRcawlmZY6muZdAcQMNm+N18XHEBq4U="; }; structuredExtraConfig = with lib.kernel; { diff --git a/pkgs/servers/dns/pdns-recursor/default.nix b/pkgs/servers/dns/pdns-recursor/default.nix index a26d6a6131c..d106e154277 100644 --- a/pkgs/servers/dns/pdns-recursor/default.nix +++ b/pkgs/servers/dns/pdns-recursor/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "pdns-recursor"; - version = "4.5.7"; + version = "4.6.0"; src = fetchurl { url = "https://downloads.powerdns.com/releases/pdns-recursor-${version}.tar.bz2"; - sha256 = "1avvs1wpck0rahx80xnnaw94hdrfbhi1jdvgg1zpac26mzab4kdd"; + sha256 = "1wmwkw8x39rall3673cngz0vpgc1z5vx29qy5r6mkg5fk29ma1nz"; }; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix index 32f79ebe14c..dbb6fbc84f5 100644 --- a/pkgs/servers/matrix-synapse/default.nix +++ b/pkgs/servers/matrix-synapse/default.nix @@ -11,11 +11,11 @@ in with python3.pkgs; buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.49.0"; + version = "1.49.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-vvLcRy2qt/qOgKkQpj2eHP4691OX0AW58dD3EecluZM="; + sha256 = "7b795ecfc36e3f57eb7cffbc5ef9da1745b777536416c31509b3e6220c39ca4d"; }; buildInputs = [ openssl ]; diff --git a/pkgs/servers/prowlarr/default.nix b/pkgs/servers/prowlarr/default.nix index 3daa69de492..5fae5c92c23 100644 --- a/pkgs/servers/prowlarr/default.nix +++ b/pkgs/servers/prowlarr/default.nix @@ -16,14 +16,14 @@ let }."${stdenv.hostPlatform.system}" or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-S3ktqBapIi6YIjDOIMziCzecS86hR2LIUey3SLNuWgg="; - arm64-linux_hash = "sha256-lxPglw3whyMQ+v7GpKMygxqINDoczKmh7KpGAuzuQwM="; - x64-osx_hash = "sha256-EUg3eC5QwGgCSi9qAPs6s8wenSXEmLvLHUTlvoLWAtc="; + x64-linux_hash = "sha256-aUmeZ/numcAkejfMm4kuXem5u9bwkn5jRz5PzTNq1tQ="; + arm64-linux_hash = "sha256-8EwB52bNTxmoPcCC8Q5y77gM8M9pDqMXypwz7ukLDuE="; + x64-osx_hash = "sha256-NnunLw9sZCBDMqrDMX+u/xt0owJT/NdsUv2rF6knnx4="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "prowlarr"; - version = "0.1.2.1060"; + version = "0.1.6.1184"; src = fetchurl { url = "https://github.com/Prowlarr/Prowlarr/releases/download/v${version}/Prowlarr.develop.${version}.${os}-core-${arch}.tar.gz"; diff --git a/pkgs/stdenv/default.nix b/pkgs/stdenv/default.nix index d6c59573f2a..0d328d98ba1 100644 --- a/pkgs/stdenv/default.nix +++ b/pkgs/stdenv/default.nix @@ -56,6 +56,7 @@ in powerpc-linux = /* stagesLinux */ stagesNative; powerpc64-linux = stagesLinux; powerpc64le-linux = stagesLinux; + riscv64-linux = stagesLinux; x86_64-darwin = stagesDarwin; aarch64-darwin = stagesDarwin; x86_64-solaris = stagesNix; diff --git a/pkgs/stdenv/linux/bootstrap-files/riscv64.nix b/pkgs/stdenv/linux/bootstrap-files/riscv64.nix new file mode 100644 index 00000000000..aaf1f153c78 --- /dev/null +++ b/pkgs/stdenv/linux/bootstrap-files/riscv64.nix @@ -0,0 +1,12 @@ +{ + busybox = import <nix/fetchurl.nix> { + url = "http://tarballs.nixos.org/stdenv-linux/riscv64/9bd3cf0063b80428bd85a286205adab4b6ffcbd6/busybox"; + sha256 = "6f61912f94bc4ef287d1ff48a9521ed16bd07d8d8ec775e471f32c64d346583d"; + executable = true; + }; + + bootstrapTools = import <nix/fetchurl.nix> { + url = "http://tarballs.nixos.org/stdenv-linux/riscv64/9bd3cf0063b80428bd85a286205adab4b6ffcbd6/bootstrap-tools.tar.xz"; + sha256 = "5466b19288e980125fc62ebb864d09908ffe0bc50cebe52cfee89acff14d5b9f"; + }; +} diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index b2b0dad82d8..d2c28b97ff9 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -16,6 +16,7 @@ armv7l-linux = import ./bootstrap-files/armv7l.nix; aarch64-linux = import ./bootstrap-files/aarch64.nix; mipsel-linux = import ./bootstrap-files/loongson2f.nix; + riscv64-linux = import ./bootstrap-files/riscv64.nix; }; musl = { aarch64-linux = import ./bootstrap-files/aarch64-musl.nix; diff --git a/pkgs/tools/filesystems/cryfs/default.nix b/pkgs/tools/filesystems/cryfs/default.nix index 0da6c4c2099..0f61d47aca9 100644 --- a/pkgs/tools/filesystems/cryfs/default.nix +++ b/pkgs/tools/filesystems/cryfs/default.nix @@ -1,48 +1,38 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch -, cmake, pkg-config, python3, gtest -, boost, cryptopp, curl, fuse, openssl +{ lib, stdenv, fetchFromGitHub +, cmake, pkg-config, python3 +, boost17x, curl, fuse, openssl, range-v3, spdlog +# cryptopp and gtest on standby - using the vendored ones for now +# see https://github.com/cryfs/cryfs/issues/369 +, llvmPackages }: stdenv.mkDerivation rec { pname = "cryfs"; - version = "0.10.2"; + version = "0.11.1"; src = fetchFromGitHub { - owner = "cryfs"; - repo = "cryfs"; - rev = version; - sha256 = "1m6rcc82hbaiwcwcvf5xmxma8n0jal9zhcykv9xgwiax4ny0l8kz"; + owner = pname; + repo = pname; + rev = version; + hash = "sha256-029foKJklyOv8qHvgds/yRZ9n1/iA+U7n4O5FViHCOE="; }; - patches = [ - (fetchpatch { - name = "cryfs-0.10.2-install-targets.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/cryfs/files/cryfs-0.10.2-install-targets.patch?id=192ac7421ddd4093125f4997898fb62e8a140a44"; - sha256 = "1jz6gpi1i7dnfm88a6n3mccwfmsmvg0d0bmp3fmqqrkbcg7in00l"; - }) - (fetchpatch { - name = "cryfs-0.10.2-unbundle-libs.patch"; - url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/sys-fs/cryfs/files/cryfs-0.10.2-unbundle-libs.patch?id=192ac7421ddd4093125f4997898fb62e8a140a44"; - sha256 = "0hzss5rawcjrh8iqzc40w5yjhxdqya4gbg6dzap70180s50mahzs"; - }) - - # Backported from https://github.com/cryfs/cryfs/pull/378 - ./use-macfuse.patch - ]; - postPatch = '' patchShebangs src - # remove tests that require network access: + # remove tests that require network access substituteInPlace test/cpp-utils/CMakeLists.txt \ --replace "network/CurlHttpClientTest.cpp" "" \ --replace "network/FakeHttpClientTest.cpp" "" # remove CLI test trying to access /dev/fuse substituteInPlace test/cryfs-cli/CMakeLists.txt \ - --replace "CliTest_IntegrityCheck.cpp" "" + --replace "CliTest_IntegrityCheck.cpp" "" \ + --replace "CliTest_Setup.cpp" "" \ + --replace "CliTest_WrongEnvironment.cpp" "" \ + --replace "CryfsUnmountTest.cpp" "" - # downsize large file test as 4.5G is too big for Hydra: + # downsize large file test as 4.5G is too big for Hydra substituteInPlace test/cpp-utils/data/DataTest.cpp \ --replace "(4.5L*1024*1024*1024)" "(0.5L*1024*1024*1024)" ''; @@ -51,32 +41,38 @@ stdenv.mkDerivation rec { strictDeps = true; - buildInputs = [ boost cryptopp curl fuse openssl ]; + buildInputs = [ boost17x curl fuse openssl range-v3 spdlog ] + ++ lib.optional stdenv.cc.isClang llvmPackages.openmp; - checkInputs = [ gtest ]; + #checkInputs = [ gtest ]; cmakeFlags = [ + "-DDEPENDENCY_CONFIG='../cmake-utils/DependenciesFromLocalSystem.cmake'" "-DCRYFS_UPDATE_CHECKS:BOOL=FALSE" "-DBoost_USE_STATIC_LIBS:BOOL=FALSE" # this option is case sensitive - "-DUSE_SYSTEM_LIBS:BOOL=TRUE" "-DBUILD_TESTING:BOOL=${if doCheck then "TRUE" else "FALSE"}" - ] ++ lib.optional doCheck "-DCMAKE_PREFIX_PATH=${gtest.dev}/lib/cmake"; + ]; # ++ lib.optional doCheck "-DCMAKE_PREFIX_PATH=${gtest.dev}/lib/cmake"; # macFUSE needs to be installed for the test to succeed on Darwin doCheck = !stdenv.isDarwin; checkPhase = '' + runHook preCheck + export HOME=$(mktemp -d) + # Skip CMakeFiles directory and tests depending on fuse (does not work well with sandboxing) SKIP_IMPURE_TESTS="CMakeFiles|fspp|my-gtest-main" - for t in $(ls -d test/*/ | egrep -v "$SKIP_IMPURE_TESTS"); do + for t in $(ls -d test/*/ | grep -E -v "$SKIP_IMPURE_TESTS") ; do "./$t$(basename $t)-test" done + + runHook postCheck ''; meta = with lib; { description = "Cryptographic filesystem for the cloud"; - homepage = "https://www.cryfs.org"; + homepage = "https://www.cryfs.org/"; license = licenses.lgpl3; maintainers = with maintainers; [ peterhoeg c0bw3b ]; platforms = platforms.unix; diff --git a/pkgs/tools/filesystems/cryfs/use-macfuse.patch b/pkgs/tools/filesystems/cryfs/use-macfuse.patch deleted file mode 100644 index 47e7845cf3d..00000000000 --- a/pkgs/tools/filesystems/cryfs/use-macfuse.patch +++ /dev/null @@ -1,207 +0,0 @@ -diff --git a/.travisci/install.sh b/.travisci/install.sh -index 9057a75b..2929c360 100755 ---- a/.travisci/install.sh -+++ b/.travisci/install.sh -@@ -6,12 +6,11 @@ set -e - if [ "${CXX}" == "g++" ]; then - # We need to uninstall oclint because it creates a /usr/local/include/c++ symlink that clashes with the gcc5 package - # see https://github.com/Homebrew/homebrew-core/issues/21172 -- brew cask uninstall oclint -+ brew uninstall oclint - brew install gcc@7 - fi - --brew cask install osxfuse --brew install libomp -+brew install libomp pkg-config macfuse - - # By default, travis only fetches the newest 50 commits. We need more in case we're further from the last version tag, so the build doesn't fail because it can't generate the version number. - git fetch --unshallow --tags -diff --git a/README.md b/README.md -index b0f4a684..7001119a 100644 ---- a/README.md -+++ b/README.md -@@ -19,7 +19,7 @@ OSX - - CryFS is distributed via Homebrew. Just do - -- brew cask install osxfuse -+ brew install osxfuse - brew install cryfs - - Windows (experimental) -@@ -45,6 +45,7 @@ Requirements - - Git (for getting the source code) - - GCC version >= 5.0 or Clang >= 4.0 - - CMake version >= 3.0 -+ - pkg-config (on Unix) - - libcurl4 (including development headers) - - Boost libraries version >= 1.65.1 (including development headers) - - filesystem -@@ -53,20 +54,20 @@ Requirements - - program_options - - thread - - SSL development libraries (including development headers, e.g. libssl-dev) -- - libFUSE version >= 2.8.6 (including development headers), on Mac OS X instead install osxfuse from https://osxfuse.github.io/ -+ - libFUSE version >= 2.8.6 (including development headers), on Mac OS X instead install macFUSE from https://osxfuse.github.io/ - - Python >= 2.7 - - OpenMP - - You can use the following commands to install these requirements - - # Ubuntu -- $ sudo apt install git g++ cmake make libcurl4-openssl-dev libboost-filesystem-dev libboost-system-dev libboost-chrono-dev libboost-program-options-dev libboost-thread-dev libssl-dev libfuse-dev python -+ $ sudo apt install git g++ cmake make pkg-config libcurl4-openssl-dev libboost-filesystem-dev libboost-system-dev libboost-chrono-dev libboost-program-options-dev libboost-thread-dev libssl-dev libfuse-dev python - - # Fedora -- sudo dnf install git gcc-c++ cmake make libcurl-devel boost-devel boost-static openssl-devel fuse-devel python -+ sudo dnf install git gcc-c++ cmake make pkgconf libcurl-devel boost-devel boost-static openssl-devel fuse-devel python - - # Macintosh -- brew install cmake boost openssl libomp -+ brew install cmake pkg-config boost openssl libomp - - Build & Install - --------------- -@@ -116,17 +117,17 @@ On most systems, CMake should find the libraries automatically. However, that do - - cmake .. -DBoost_USE_STATIC_LIBS=off - --2. **Fuse/Osxfuse library not found** -+2. **Fuse library not found** - - Pass in the library path with - -- cmake .. -DFUSE_LIB_PATH=/path/to/fuse/or/osxfuse -+ PKG_CONFIG_PATH=/path-to-fuse-or-macFUSE/lib/pkgconfig cmake .. - --3. **Fuse/Osxfuse headers not found** -+3. **Fuse headers not found** - - Pass in the include path with - -- cmake .. -DCMAKE_CXX_FLAGS="-I/path/to/fuse/or/osxfuse/headers" -+ PKG_CONFIG_PATH=/path-to-fuse-or-macFUSE/lib/pkgconfig cmake .. - - 4. **Openssl headers not found** - -diff --git a/cmake-utils/utils.cmake b/cmake-utils/utils.cmake -index da4dff8c..66021c5c 100644 ---- a/cmake-utils/utils.cmake -+++ b/cmake-utils/utils.cmake -@@ -157,33 +157,6 @@ function(require_clang_version VERSION) - endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang") - endfunction(require_clang_version) - --################################################## --# Find the location of a library and return its full path in OUTPUT_VARIABLE. --# If PATH_VARIABLE points to a defined variable, then the library will only be searched in this path. --# If PATH_VARIABLE points to a undefined variable, default system locations will be searched. --# --# Uses (the following will search for fuse in system locations by default, and if the user passes -DFUSE_LIB_PATH to cmake, it will only search in this path. --# find_library_with_path(MYLIBRARY fuse FUSE_LIB_PATH) --# target_link_library(target ${MYLIBRARY}) --################################################## --function(find_library_with_path OUTPUT_VARIABLE LIBRARY_NAME PATH_VARIABLE) -- if(${PATH_VARIABLE}) -- find_library(${OUTPUT_VARIABLE} ${LIBRARY_NAME} PATHS ${${PATH_VARIABLE}} NO_DEFAULT_PATH) -- if (${OUTPUT_VARIABLE} MATCHES NOTFOUND) -- message(FATAL_ERROR "Didn't find ${LIBRARY_NAME} in path specified by the ${PATH_VARIABLE} parameter (${${PATH_VARIABLE}}). Pass in the correct path or remove the parameter to try common system locations.") -- else(${OUTPUT_VARIABLE} MATCHES NOTFOUND) -- message(STATUS "Found ${LIBRARY_NAME} in user-defined path ${${PATH_VARIABLE}}") -- endif(${OUTPUT_VARIABLE} MATCHES NOTFOUND) -- else(${PATH_VARIABLE}) -- find_library(${OUTPUT_VARIABLE} ${LIBRARY_NAME}) -- if (${OUTPUT_VARIABLE} MATCHES NOTFOUND) -- message(FATAL_ERROR "Didn't find ${LIBRARY_NAME} library. If ${LIBRARY_NAME} is installed, try passing in the library location with -D${PATH_VARIABLE}=/path/to/${LIBRARY_NAME}/lib.") -- else(${OUTPUT_VARIABLE} MATCHES NOTFOUND) -- message(STATUS "Found ${LIBRARY_NAME} in system location") -- endif(${OUTPUT_VARIABLE} MATCHES NOTFOUND) -- endif(${PATH_VARIABLE}) --endfunction(find_library_with_path) -- - include(cmake-utils/TargetArch.cmake) - function(get_target_architecture output_var) - target_architecture(local_output_var) -diff --git a/src/fspp/fuse/CMakeLists.txt b/src/fspp/fuse/CMakeLists.txt -index b991bd72..8df3dbb7 100644 ---- a/src/fspp/fuse/CMakeLists.txt -+++ b/src/fspp/fuse/CMakeLists.txt -@@ -35,12 +35,12 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Windows") - DESTINATION "${CMAKE_INSTALL_BINDIR}" - ) - --elseif(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") -- set(CMAKE_FIND_FRAMEWORK LAST) -- find_library_with_path(FUSE "osxfuse" FUSE_LIB_PATH) -- target_link_libraries(${PROJECT_NAME} PUBLIC ${FUSE}) --else() # Linux -- find_library_with_path(FUSE "fuse" FUSE_LIB_PATH) -- target_link_libraries(${PROJECT_NAME} PUBLIC ${FUSE}) -+else() # Linux and macOS -+ find_package(PkgConfig REQUIRED) -+ pkg_check_modules(Fuse REQUIRED IMPORTED_TARGET fuse) -+ target_link_libraries(${PROJECT_NAME} PUBLIC PkgConfig::Fuse) - endif() - -+if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") -+ set(CMAKE_FIND_FRAMEWORK LAST) -+endif() -diff --git a/src/fspp/fuse/Fuse.cpp b/src/fspp/fuse/Fuse.cpp -index 52cd5644..df0b400d 100644 ---- a/src/fspp/fuse/Fuse.cpp -+++ b/src/fspp/fuse/Fuse.cpp -@@ -295,7 +295,7 @@ vector<char *> Fuse::_build_argv(const bf::path &mountdir, const vector<string> - // Make volume name default to mountdir on macOS - _add_fuse_option_if_not_exists(&argv, "volname", mountdir.filename().string()); - #endif -- // TODO Also set read/write size for osxfuse. The options there are called differently. -+ // TODO Also set read/write size for macFUSE. The options there are called differently. - // large_read not necessary because reads are large anyhow. This option is only important for 2.4. - //argv.push_back(_create_c_string("-o")); - //argv.push_back(_create_c_string("large_read")); -diff --git a/src/fspp/fuse/params.h b/src/fspp/fuse/params.h -index 4a45ef79..9903ac82 100644 ---- a/src/fspp/fuse/params.h -+++ b/src/fspp/fuse/params.h -@@ -3,14 +3,6 @@ - #define MESSMER_FSPP_FUSE_PARAMS_H_ - - #define FUSE_USE_VERSION 26 --#if defined(__linux__) || defined(__FreeBSD__) - #include <fuse.h> --#elif __APPLE__ --#include <osxfuse/fuse.h> --#elif defined(_MSC_VER) --#include <fuse.h> // Dokany fuse --#else --#error System not supported --#endif - - #endif -diff --git a/src/fspp/impl/FilesystemImpl.cpp b/src/fspp/impl/FilesystemImpl.cpp -index bc0ffbd7..23b28601 100644 ---- a/src/fspp/impl/FilesystemImpl.cpp -+++ b/src/fspp/impl/FilesystemImpl.cpp -@@ -321,7 +321,7 @@ void FilesystemImpl::statfs(struct ::statvfs *fsstat) { - fsstat->f_namemax = stat.max_filename_length; - - //f_frsize, f_favail, f_fsid and f_flag are ignored in fuse, see http://fuse.sourcearchive.com/documentation/2.7.0/structfuse__operations_4e765e29122e7b6b533dc99849a52655.html#4e765e29122e7b6b533dc99849a52655 -- fsstat->f_frsize = fsstat->f_bsize; // even though this is supposed to be ignored, osxfuse needs it. -+ fsstat->f_frsize = fsstat->f_bsize; // even though this is supposed to be ignored, macFUSE needs it. - } - - void FilesystemImpl::createSymlink(const bf::path &to, const bf::path &from, ::uid_t uid, ::gid_t gid) { -diff --git a/test/fspp/testutils/FuseThread.cpp b/test/fspp/testutils/FuseThread.cpp -index 277a2dac..7f3638db 100644 ---- a/test/fspp/testutils/FuseThread.cpp -+++ b/test/fspp/testutils/FuseThread.cpp -@@ -23,7 +23,7 @@ void FuseThread::start(const bf::path &mountDir, const vector<string> &fuseOptio - //Wait until it is running (busy waiting is simple and doesn't hurt much here) - while(!_fuse->running()) {} - #ifdef __APPLE__ -- // On Mac OS X, _fuse->running() returns true too early, because osxfuse calls init() when it's not ready yet. Give it a bit time. -+ // On Mac OS X, _fuse->running() returns true too early, because macFUSE calls init() when it's not ready yet. Give it a bit time. - std::this_thread::sleep_for(std::chrono::milliseconds(200)); - #endif - } diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 672fdf21b02..dab34668b21 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -418,6 +418,7 @@ mapAliases ({ kerberos = libkrb5; # moved from top-level 2021-03-14 keymon = throw "keymon has been removed from nixpkgs, as it's abandoned and archived."; # added 2019-12-10 kramdown-rfc2629 = rubyPackages.kramdown-rfc2629; # added 2021-03-23 + krita-beta = krita; # moved from top-level 2021-12-23 kvm = qemu_kvm; # added 2018-04-25 latinmodern-math = lmmath; letsencrypt = certbot; # added 2016-05-16 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 71d860fe0e2..d0359725542 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15103,6 +15103,8 @@ with pkgs; omniorb = callPackage ../development/tools/omniorb { }; + openai = with python3Packages; toPythonApplication openai; + opengrok = callPackage ../development/tools/misc/opengrok { }; openocd = callPackage ../development/embedded/openocd { }; @@ -26520,7 +26522,6 @@ with pkgs; krane = callPackage ../applications/networking/cluster/krane { }; krita = libsForQt5.callPackage ../applications/graphics/krita { }; - krita-beta = libsForQt5.callPackage ../applications/graphics/krita/beta.nix { }; krusader = libsForQt5.callPackage ../applications/misc/krusader { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 29c178b615d..71230bce63d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5826,8 +5826,12 @@ in { netmap = callPackage ../development/python-modules/netmap { }; + openai = callPackage ../development/python-modules/openai { }; + openapi-core = callPackage ../development/python-modules/openapi-core { }; + pandas-stubs = callPackage ../development/python-modules/pandas-stubs { }; + parameterizedtestcase = callPackage ../development/python-modules/parameterizedtestcase { }; pdunehd = callPackage ../development/python-modules/pdunehd { }; |