diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 0a0de3d980ad..f2dc80c72812 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -15636,4 +15636,10 @@ github = "quasigod-io"; githubId = 62124625; }; + waelwindows = { + email = "waelwindows9922@gmail.com"; + github = "Waelwindows"; + githubId = 5228243; + name = "waelwindows"; + }; } diff --git a/maintainers/scripts/luarocks-packages.csv b/maintainers/scripts/luarocks-packages.csv index ce9c099e8a3f..d60b6911ec77 100644 --- a/maintainers/scripts/luarocks-packages.csv +++ b/maintainers/scripts/luarocks-packages.csv @@ -87,7 +87,7 @@ mediator_lua,,,,,, mpack,,,,,, moonscript,https://github.com/leafo/moonscript.git,dev-1,,,,arobyn nvim-client,https://github.com/neovim/lua-client.git,,,,, -nvim-cmp,,,,,, +nvim-cmp,https://github.com/hrsh7th/nvim-cmp,,,,, penlight,https://github.com/lunarmodules/Penlight.git,,,,,alerque plenary.nvim,https://github.com/nvim-lua/plenary.nvim.git,,,,5.1, rapidjson,https://github.com/xpol/lua-rapidjson.git,,,,, diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index fd3418b8f6bd..15ca11a2e164 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -720,6 +720,12 @@ in { assertion = cfg.smtp.password != opt.smtp.password.default -> cfg.smtp.passwordFile == null; message = "Cannot set both password and passwordFile"; } + { + assertion = all + ({ type, access, ... }: type == "prometheus" -> access != "direct") + cfg.provision.datasources; + message = "For datasources of type `prometheus`, the `direct` access mode is not supported anymore (since Grafana 9.2.0)"; + } ]; systemd.services.grafana = { diff --git a/nixos/tests/grafana.nix b/nixos/tests/grafana.nix index 174d664d8772..5364f0ca8b0b 100644 --- a/nixos/tests/grafana.nix +++ b/nixos/tests/grafana.nix @@ -81,8 +81,11 @@ in { with subtest("Successful API query as admin user with sqlite db"): sqlite.wait_for_unit("grafana.service") sqlite.wait_for_open_port(3000) + print(sqlite.succeed( + "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users -i" + )) sqlite.succeed( - "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep testadmin\@localhost" + "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep admin\@localhost" ) sqlite.shutdown() @@ -92,7 +95,7 @@ in { postgresql.wait_for_open_port(3000) postgresql.wait_for_open_port(5432) postgresql.succeed( - "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep testadmin\@localhost" + "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep admin\@localhost" ) postgresql.shutdown() @@ -102,7 +105,7 @@ in { mysql.wait_for_open_port(3000) mysql.wait_for_open_port(3306) mysql.succeed( - "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep testadmin\@localhost" + "curl -sSfN -u testadmin:snakeoilpwd http://127.0.0.1:3000/api/org/users | grep admin\@localhost" ) mysql.shutdown() ''; diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix index 4752ca174f16..dd67368e7083 100644 --- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix +++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "bitwig-studio"; - version = "4.3.8"; + version = "4.4"; src = fetchurl { url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb"; - sha256 = "sha256-mJIzlY1m/r56e7iw5Hm+u2EbpHn5JqOMaRjpbCe8HHw="; + sha256 = "sha256-5xZTJc3NMhSnmrhls7EC+F5gPoHNmGih9Zwi5Hdg5V8="; }; nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ]; diff --git a/pkgs/applications/audio/pt2-clone/default.nix b/pkgs/applications/audio/pt2-clone/default.nix index ebf4429b2413..b7364a3f3041 100644 --- a/pkgs/applications/audio/pt2-clone/default.nix +++ b/pkgs/applications/audio/pt2-clone/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "pt2-clone"; - version = "1.51"; + version = "1.53"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "pt2-clone"; rev = "v${version}"; - sha256 = "sha256-kTYtn68gPwEHZjJl/Vmr5lTtxyEB6r3EGQlVSlBpCZg="; + sha256 = "sha256-zW/uNJr2cip1JbFLKyB6TD75p1v9/dQu9kmtKXckc2c="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/pkgs/applications/blockchains/ledger-live-desktop/default.nix index e85cb9d28dab..019aefcff3ff 100644 --- a/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,11 +2,11 @@ let pname = "ledger-live-desktop"; - version = "2.47.0"; + version = "2.48.0"; src = fetchurl { url = "https://download.live.ledger.com/${pname}-${version}-linux-x86_64.AppImage"; - hash = "sha256-KmNiyWF74hHLLu+uQDiFAMJJvyU/rgyrBhh6O6iMVIg="; + hash = "sha256-U5QOr76OMTABVb5kteB0FP3igwpXqh9q5XL7aY92UqI="; }; appimageContents = appimageTools.extractType2 { diff --git a/pkgs/applications/editors/imhex/default.nix b/pkgs/applications/editors/imhex/default.nix new file mode 100644 index 000000000000..3a7463f89f83 --- /dev/null +++ b/pkgs/applications/editors/imhex/default.nix @@ -0,0 +1,92 @@ +{ lib +, gcc12Stdenv +, cmake +, llvm +, fetchFromGitHub +, mbedtls +, gtk3 +, pkg-config +, capstone +, dbus +, libGLU +, glfw3 +, file +, perl +, python3 +, jansson +, curl +, fmt_8 +, nlohmann_json +, xlibsWrapper +, yara +}: + +let + # when bumping the version, check if imhex has gotten support for the capstone version in nixpkgs + version = "1.19.3"; + + patterns_src = fetchFromGitHub { + owner = "WerWolv"; + repo = "ImHex-Patterns"; + rev = "ImHex-v${version}"; + hash = "sha256-mukGPN2TugJZLLuZ5FTvZ4DxUsMGfVNhBFAPnBRC0qs="; + }; + +in +gcc12Stdenv.mkDerivation rec { + pname = "imhex"; + inherit version; + + src = fetchFromGitHub { + fetchSubmodules = true; + owner = "WerWolv"; + repo = pname; + rev = "v${version}"; + hash = "sha256-SFv5ulyjm5Yf+3Gpx+A74so2YClCJx1sx0LE5fh5eG4="; + }; + + nativeBuildInputs = [ cmake llvm python3 perl pkg-config xlibsWrapper ]; + + buildInputs = [ + capstone + curl + dbus + file + fmt_8 + glfw3 + gtk3 + jansson + libGLU + mbedtls + nlohmann_json + yara + ]; + + cmakeFlags = [ + "-DIMHEX_OFFLINE_BUILD=ON" + # see comment at the top about our version of capstone + "-DUSE_SYSTEM_CAPSTONE=OFF" + "-DUSE_SYSTEM_CURL=ON" + "-DUSE_SYSTEM_FMT=ON" + "-DUSE_SYSTEM_LLVM=ON" + "-DUSE_SYSTEM_NLOHMANN_JSON=ON" + "-DUSE_SYSTEM_YARA=ON" + ]; + + # for reasons unknown, the built-in plugin isn't found unless made available under $out/bin + postInstall = '' + ln -s $out/share/imhex/plugins $out/bin/ + + for d in ${patterns_src}/{constants,encodings,includes,magic,patterns}; do + cp -r $d $out/share/imhex/ + done + ''; + + meta = with lib; { + description = "Hex Editor for Reverse Engineers, Programmers and people who value their retinas when working at 3 AM"; + homepage = "https://github.com/WerWolv/ImHex"; + license = with licenses; [ gpl2Only ]; + maintainers = with maintainers; [ luis ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index dd5b70786862..5d4c76cdae62 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -233,12 +233,12 @@ final: prev: QFEnter = buildVimPluginFrom2Nix { pname = "QFEnter"; - version = "2020-10-09"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "yssl"; repo = "QFEnter"; - rev = "df0a75b287c210f98ae353a12bbfdaf73d858beb"; - sha256 = "0gdp7nmjlp8ng2rp2v66d8bincnkwrqqpbggb079f0f9szrqlp54"; + rev = "fd5d378f97ee4847ce4fcb58b3719864228607da"; + sha256 = "009lpb3hygcw09535bajnd18xq6hbz19pdbwx9l9cykwaniciahi"; }; meta.homepage = "https://github.com/yssl/QFEnter/"; }; @@ -281,12 +281,12 @@ final: prev: SchemaStore-nvim = buildVimPluginFrom2Nix { pname = "SchemaStore.nvim"; - version = "2022-10-13"; + version = "2022-10-16"; src = fetchFromGitHub { owner = "b0o"; repo = "SchemaStore.nvim"; - rev = "03f4f942dd3b3ec060d5826782ba2efd87026242"; - sha256 = "0ly16n9qjwjhvbjhczn8y54scpbs0a0dn75rn5158glx44fjrfdw"; + rev = "17d16277a214cc67710694c83c6c0c5aa1e13bb0"; + sha256 = "1kanm1qx3sbvnhsmnikxx9wyvbsm8i6bhzw36bd7697ydfr2y4v3"; }; meta.homepage = "https://github.com/b0o/SchemaStore.nvim/"; }; @@ -341,12 +341,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2022-10-13"; + version = "2022-10-16"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "0b91495ff239adf5a650bb0aa944df9c4ca15c44"; - sha256 = "100an88cw2q92323rfp6lhzr2dwq1f2q6wgp77ciyzkpfplm4crw"; + rev = "5cd5e2b531bcbd5057f95915eb991475c810d92e"; + sha256 = "0sklk058747brv3fcvxanp87wa87lb9zkkr8bggrjc3g3i9yp6hm"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -486,12 +486,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2022-10-14"; + version = "2022-10-16"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "45304126bd4b03945cdccd3786ba16abdc1f7e22"; - sha256 = "1ard1xcjk9wl63sadi5mbm20hvmwxh4i2ad5ksw6j2lfbl52zbw0"; + rev = "c2487319c083bc1da3aecf21e054c6cf1bbda9b3"; + sha256 = "07l7xjzp4pn2lnkrq1rbl89bblf50plpx4wv1r7wli1mfginrkba"; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; }; @@ -1074,12 +1074,12 @@ final: prev: clever-f-vim = buildVimPluginFrom2Nix { pname = "clever-f.vim"; - version = "2022-09-20"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "rhysd"; repo = "clever-f.vim"; - rev = "e852984d2bb6671034851fa70442d7799c1d7856"; - sha256 = "1952kywl33r9vm14rzrvin6ndr4napgk0k41xc35ka3mci12lhya"; + rev = "6a3ac5e3688598af9411ab741737f98c47370c22"; + sha256 = "1gbyk5089njmgxdc5nfm2sc3nvx3f91s7rw0mbh960dlwlhnsacs"; }; meta.homepage = "https://github.com/rhysd/clever-f.vim/"; }; @@ -1362,12 +1362,12 @@ final: prev: cmp-nvim-lsp = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp"; - version = "2022-05-16"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp"; - rev = "affe808a5c56b71630f17aa7c38e15c59fd648a8"; - sha256 = "1v88bw8ri8w4s8yn7jw5anyiwyw8swwzrjf843zqzai18kh9mlnp"; + rev = "3cf38d9c957e95c397b66f91967758b31be4abe6"; + sha256 = "0l0cqrarrp3rj3pmjivjgh8f1cd3grrkz6pnzpwpwxj9amv6k6p2"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; @@ -1722,12 +1722,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc.nvim"; - version = "2022-10-07"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "d0fa7acd233d76585daf9ce0b74ad1112591e271"; - sha256 = "04qs3gcx2qjagawr577sadz6bkwlr40532i9f7p7jfkbd7ybgzm2"; + rev = "9075f7b5aae247c15cadafeb5e6e6e115ddba245"; + sha256 = "1qfdsgsc7lrp0rz3l4af4rf1i63afv41xzdmq7c603n1wq8ssjrl"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -1878,12 +1878,12 @@ final: prev: compiler-explorer-nvim = buildVimPluginFrom2Nix { pname = "compiler-explorer.nvim"; - version = "2022-10-14"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "krady21"; repo = "compiler-explorer.nvim"; - rev = "0fb537cf8dc384c3cfedd1a3652746f840cc6edd"; - sha256 = "0b9vcsg6z7p0lq8n0vy135ca7fs6jzz5anf5j3s5k0h61r03h2zw"; + rev = "356f876ef4ef194503b2e23d27af9f55c5faff32"; + sha256 = "03kbf8vrb7ws18k6w2d4zrbj0318qr82xgqxw9yfqsb4wzx8b5jx"; }; meta.homepage = "https://github.com/krady21/compiler-explorer.nvim/"; }; @@ -2010,24 +2010,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2022-10-14"; + version = "2022-10-16"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "48c2647dca09970317b30ad34dbcbb7885940805"; - sha256 = "0482wlbhc74yd178ymwf8a2c4qwhbvmwhvdqq5lcvixh0iyqmcwi"; + rev = "bc5b5e764cb418e8ffded8362a66f82763f725d4"; + sha256 = "1mpixcnzph42xmhm504dyp527zksacp741ywxknm7bbjdki38wgq"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2022-10-14"; + version = "2022-10-16"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "27854936444c5d72ff324828d67ad771f60d4340"; - sha256 = "1yd8bal8b9rf1wzmxzkj1hmpkikdc6nfk7rz6yyv8gjkxlfaj5wb"; + rev = "845e955fc29afcf1ab875af29ec5867d06751bb4"; + sha256 = "1a60q1s8ljxbjg8zrljz7gms9r7dxmz06mbq9ni7zda3d25385p9"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2046,12 +2046,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2022-10-14"; + version = "2022-10-16"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "512f7444531ff37b09880985a0256ff5797ccc3b"; - sha256 = "0gi3cc0phgygkvpgmpfah05fnhkjsdlnkfjrxw9bnj7021z5mpvv"; + rev = "35c4e030dbd12de4630536658bd818d66c2d0725"; + sha256 = "1rdkd56ab5ipq3lpb2hrv1iaxizm5cr8hzrdkqqqxph55l76gmm7"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -2564,12 +2564,12 @@ final: prev: dial-nvim = buildVimPluginFrom2Nix { pname = "dial.nvim"; - version = "2022-08-29"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "monaqa"; repo = "dial.nvim"; - rev = "d2d7a57fb030c82b8b0d6712d9c35dfb49d9aa3c"; - sha256 = "1zm116xd7b79piaiia9fn56h7ivnmy0dip02q3n61fmn1sqijggr"; + rev = "6bf54a83cd40448f1ba5171358f0d6f48bd970fd"; + sha256 = "1pqpg3if707w42mdzskbn5rjwiwsbqvp3f2y6mx778b796ikw4d1"; }; meta.homepage = "https://github.com/monaqa/dial.nvim/"; }; @@ -3215,12 +3215,12 @@ final: prev: gitsigns-nvim = buildNeovimPluginFrom2Nix { pname = "gitsigns.nvim"; - version = "2022-10-13"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "2c6f96dda47e55fa07052ce2e2141e8367cbaaf2"; - sha256 = "08pzc6nj7vif3c6m0q1nqacwfgq2pp5rnad5y7dmfrxwcj54gbni"; + rev = "bf20b5d820a7c8d25b45fd76fe8bee25fc2c7258"; + sha256 = "0zp1b3dnys7qf3r4gdf4shbbh7y5m4i75zcgbqzlbjg367wnnw8h"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -3947,12 +3947,12 @@ final: prev: lean-nvim = buildVimPluginFrom2Nix { pname = "lean.nvim"; - version = "2022-09-07"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "Julian"; repo = "lean.nvim"; - rev = "1940d8746157cc4c7cc12f540db8ed4506408773"; - sha256 = "1f00ajmm6x9jj6anqyd6lpq59c3zgni0n8a4vvfbgi7c6shdhnqc"; + rev = "eef5e8cd2be99012f02d3d55ea013690df247912"; + sha256 = "142263hjwrlp9fva4yjn2sddz7761nx7p161mchv7wdgjilcxpd1"; }; meta.homepage = "https://github.com/Julian/lean.nvim/"; }; @@ -3983,12 +3983,12 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2022-10-14"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "9cc411481db859059ad66c8ad844b9386dc62d5c"; - sha256 = "1rv4nmqx51sac0mw7k91h0scgx25k0a1i0gqvyw4z33r55yfh11f"; + rev = "a9d3232b178fddabb6660dc19abf40e05d6841b0"; + sha256 = "0ip1cylfsdcfjswg7f3lkwnxqab5x1mdhmik7krhis9c2x5harg2"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; @@ -4235,12 +4235,12 @@ final: prev: litee-nvim = buildVimPluginFrom2Nix { pname = "litee.nvim"; - version = "2022-10-13"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "ldelossa"; repo = "litee.nvim"; - rev = "f8b778b95c152f1fe2021c163eead3a5b2b2889d"; - sha256 = "0sl58r5n0r8fq9k80jchv5m26jv6pgclcxdxq6nrnwrrih4lrhpg"; + rev = "c28f62b9eb78afc398e070b650c59e1fb8668b66"; + sha256 = "06mn4np083am7l3dspf7j8nfkin5k86pdg3gymyqzf6mj8vs90y8"; }; meta.homepage = "https://github.com/ldelossa/litee.nvim/"; }; @@ -4402,12 +4402,12 @@ final: prev: lua-dev-nvim = buildVimPluginFrom2Nix { pname = "lua-dev.nvim"; - version = "2022-10-14"; + version = "2022-10-16"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "57e64bcbbab21a09b31da305ff62199711de007e"; - sha256 = "0msz4rq93696s2jh4iixmh577fygyd7zijsg67b9qbp93zrz4p4s"; + rev = "b1a8ba8226d7701401752728652818ba51dd29e5"; + sha256 = "0bs5kpgin6zmczk5h8dpfm3yy60612yyq5vi6cvh2x6c66frvmx5"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -4438,12 +4438,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2022-10-13"; + version = "2022-10-14"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "563827f00bb4fe43269e3be653deabc0005f1302"; - sha256 = "011hywifzd9c4wpk9439myam04g5njwy9m549pihjld2yvb0v9yd"; + rev = "663d54482b11bca1ce94f56993b9f6ab485a13dc"; + sha256 = "11dca07m9msyqqdbjrb4136hi77m8vh0jqpf2w0kjs6d9m63g0ab"; fetchSubmodules = true; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; @@ -4979,12 +4979,12 @@ final: prev: neorg = buildVimPluginFrom2Nix { pname = "neorg"; - version = "2022-10-14"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "nvim-neorg"; repo = "neorg"; - rev = "8fd6c3cdfb044c6fba07d80dd37d318fda037fe4"; - sha256 = "0768wayw0d4cs7nxgagxls2002mh034mhn33gfhrm037ln8zsj43"; + rev = "278e989435b5859ae8b3bcb8d718cd57ba106412"; + sha256 = "18bvgydb2qxfhli9kcblm7dypczss0kgb4gzgmgnbv295lcg2z6l"; }; meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; @@ -5159,12 +5159,12 @@ final: prev: nightfox-nvim = buildVimPluginFrom2Nix { pname = "nightfox.nvim"; - version = "2022-09-27"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "EdenEast"; repo = "nightfox.nvim"; - rev = "59c3dbcec362eff7794f1cb576d56fd8a3f2c8bb"; - sha256 = "1dkwgqx576xc8fryhi61q7mka93vv28hfsw340k594jkqc3da9i2"; + rev = "15f3b5837a8d07f45cbe16753fbf13630bc167a3"; + sha256 = "08zjhp1199yq5byrgksgaw55p3q74xr5j4ja24af08x8ifkr3bsj"; }; meta.homepage = "https://github.com/EdenEast/nightfox.nvim/"; }; @@ -5207,12 +5207,12 @@ final: prev: noice-nvim = buildVimPluginFrom2Nix { pname = "noice.nvim"; - version = "2022-10-14"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "folke"; repo = "noice.nvim"; - rev = "613e16ea6683eaab25c8dcdc62a9a9a7e58d16b6"; - sha256 = "002caimqcj91dbbnw7zb7sb32vz738qwqi5ypzf22nhi3smfl7qg"; + rev = "27adc00728261a4368206105b4bc1b4a6fb196f8"; + sha256 = "0m4ydgvifvibglaqzriyfxx9dk6vxzmdhk10xpzwxkfvqd6xckb7"; }; meta.homepage = "https://github.com/folke/noice.nvim/"; }; @@ -5267,12 +5267,12 @@ final: prev: nui-nvim = buildVimPluginFrom2Nix { pname = "nui.nvim"; - version = "2022-10-04"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "MunifTanjim"; repo = "nui.nvim"; - rev = "4715f6092443f0b8fb9a3bcb0cfd03202bb03477"; - sha256 = "1ddqwifszbdl8yzi0sj8dh20cb4hg6rk3s6qjy4l4sgslzxgsnk9"; + rev = "c59bdcfde011b88bfb71b5c4351684cf67bf5f9f"; + sha256 = "0y8n8qpy3swvmd29cs4yf3krkjhlx324ncya0hzciqk5j9j3j9vh"; }; meta.homepage = "https://github.com/MunifTanjim/nui.nvim/"; }; @@ -5399,12 +5399,12 @@ final: prev: nvim-cmp = buildNeovimPluginFrom2Nix { pname = "nvim-cmp"; - version = "2022-10-11"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-cmp"; - rev = "714ccb7483d0ab90de1b93914f3afad1de8da24a"; - sha256 = "17x8fkg0299ikr3xlvgaaii1s316j4q34kdj5f9kwrfr26817d0n"; + rev = "3347dd3c59b6c62288d861ddb92b9ba1227257a8"; + sha256 = "1ca9mpxq7cqi36mqz0cgyhl9w1dwcalwh6v4kj377g1vqslyl5ay"; }; meta.homepage = "https://github.com/hrsh7th/nvim-cmp/"; }; @@ -5651,12 +5651,12 @@ final: prev: nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2022-10-14"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "75af9581aaa43f6d2bc30cc5ad2ef5ddcf9988d8"; - sha256 = "0qvmvlh98ja0d4z1w1l3szi2hpygwzxhjbgpdi17rlhw8mf6ar2q"; + rev = "faf7ec2df507e16082afc4ef6b18813863f68dd8"; + sha256 = "01sp8pgrqwdlzqkzdjbjmwp204hg3dil0yv21785dd4v68sa4h3c"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -5735,12 +5735,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2022-10-14"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "2b4ab0208413856247899616acb45a62cc2f2ad6"; - sha256 = "08iga6p5cnakx4dfq9aj8x3lkf8mxznmf39psbpb0ac8aqj85q2l"; + rev = "35a731bddaf20be0a2a0492cfa489ae6130a4eb6"; + sha256 = "0rmn31nq7mg40j2hmq585ndcfdb11r3ij1wpg3b301c209q97clg"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5867,12 +5867,12 @@ final: prev: nvim-snippy = buildVimPluginFrom2Nix { pname = "nvim-snippy"; - version = "2022-10-13"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "dcampos"; repo = "nvim-snippy"; - rev = "93268f3b1b09c08703589707f2829ae4b03f46e1"; - sha256 = "18nphzi4ddz5n5cfr9v8546cm91i65v4ssg5vwqqv3ffz637jlj3"; + rev = "88bb84058c24f4ffe5ffecae9ca2dcb36a5dba4c"; + sha256 = "1bi0hhl59xvmgbi8pcn6jp37p8665h3w8kx1if8dr2rjijrf6ay1"; }; meta.homepage = "https://github.com/dcampos/nvim-snippy/"; }; @@ -5927,36 +5927,36 @@ final: prev: nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree.lua"; - version = "2022-10-13"; + version = "2022-10-16"; src = fetchFromGitHub { owner = "nvim-tree"; repo = "nvim-tree.lua"; - rev = "b07701f9da3ec62016ad46002a6c0ae9b414574c"; - sha256 = "038in75r7w0hf1krv8p45mic9y1jiq8rjma5hykfm8qj4ca36bn4"; + rev = "c995ce087875ec5d4df51520b1e9cb09a4b51725"; + sha256 = "0pc4xw41p2086kqrqa1ir3ysvvbacxlh5whv14ci0x5hyrc90in1"; }; meta.homepage = "https://github.com/nvim-tree/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2022-10-14"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "c8533707679b99dc80d5f46f7b519081fb9c1ac9"; - sha256 = "198nfwqr1cq92fc0p0b1y97n36mla2vs9a154r9wz9157467blix"; + rev = "addc129a4f272aba0834bd0a7b6bd4ad5d8c801b"; + sha256 = "08v6p29kmfyhkmk5nmqsi5xxp3mz788chxn3kqg3m6rwc6wkj809"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2022-10-14"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter-context"; - rev = "2f9f75d33158c0289c70cc1e0975af9d36ec16b2"; - sha256 = "01jnq1in7hh6yxadaqv19ckgaf2q3cpygip3v1xam3wczk3w5bx4"; + rev = "2466e8007290b6228183171965b6ce1a2f111995"; + sha256 = "0sql2fdswvix0c8xkcckiqxgwm95qda7akvl3kdlckrsw3g1fjwb"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter-context/"; }; @@ -6119,12 +6119,12 @@ final: prev: octo-nvim = buildVimPluginFrom2Nix { pname = "octo.nvim"; - version = "2022-10-09"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "pwntester"; repo = "octo.nvim"; - rev = "d91f88be51fa7cde8b5d6f529c057338aad18383"; - sha256 = "0d4340gjbsvbdvymw0a7kpqwvzrn946nnsaav9i0z6rallrk583n"; + rev = "6c2a9e7df5ce5aea968ede01d1c479b3aa382604"; + sha256 = "164l12s9lbqhr0mq34dpiwsrnyvm3s6mhqpnplbfzafjykcrlrms"; }; meta.homepage = "https://github.com/pwntester/octo.nvim/"; }; @@ -8119,12 +8119,12 @@ final: prev: urlview-nvim = buildVimPluginFrom2Nix { pname = "urlview.nvim"; - version = "2022-10-06"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "axieax"; repo = "urlview.nvim"; - rev = "b60eb8f5f5257778645d9472d666853e1b86cc66"; - sha256 = "00zp7w77glgzdncr95d5k7k8cd3b46m3kpsn77ya96yhb25g8i7w"; + rev = "8a52703b9303e206dd8dcf9b07f510f3d3ae87d5"; + sha256 = "11cf98bbf8526x0w8mkm3096l2wk9y6zj3hwwccs1dfw9v3jfm5c"; }; meta.homepage = "https://github.com/axieax/urlview.nvim/"; }; @@ -10569,12 +10569,12 @@ final: prev: vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2022-10-11"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "08f0583c0c9e6a331e6f111d6c2ede0bc87a3179"; - sha256 = "1m05kd8arhwjdkabg11gx8hdbjxvvhq32yl3k74aqjlcjk3jsrns"; + rev = "1dced335b0dff1bd50aaa2192317b645bc54aca7"; + sha256 = "1wndkj8knyr1bbdvk6lavr1p4595ny6vk4dgnmw6kbwaqchm5k7s"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -12263,12 +12263,12 @@ final: prev: vim-tmux-navigator = buildVimPluginFrom2Nix { pname = "vim-tmux-navigator"; - version = "2022-08-25"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-tmux-navigator"; - rev = "afb45a55b452b9238159047ce7c6e161bd4a9907"; - sha256 = "0pd6gg0kj12dsfqlv0g48pyppygj8j555aj8x3xh7151vfvrh3zh"; + rev = "bd4c38be5b4882991494cf77c0601a55bc45eebf"; + sha256 = "17yqy79p5i54wkg1wmb32v84s05rfaywx7qzayzs5q485zap4813"; }; meta.homepage = "https://github.com/christoomey/vim-tmux-navigator/"; }; @@ -12467,12 +12467,12 @@ final: prev: vim-vsnip = buildVimPluginFrom2Nix { pname = "vim-vsnip"; - version = "2022-10-07"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "vim-vsnip"; - rev = "b2caf50a6e3c021c92b236abff70bbb467bce24f"; - sha256 = "0dccl6rqvkj7vlx25s7ja5p0nsxzryabd1hpj16r9dnsvklzs1wq"; + rev = "7de8a71e5d6e39a05e259f9ad4dba5e0aee8bbba"; + sha256 = "0ak5v459sw7ryvs6rf5nvwwcsws5qq22jn0cgly7b9z3s861h3c5"; }; meta.homepage = "https://github.com/hrsh7th/vim-vsnip/"; }; @@ -12755,12 +12755,12 @@ final: prev: vimproc-vim = buildVimPluginFrom2Nix { pname = "vimproc.vim"; - version = "2022-02-22"; + version = "2022-10-15"; src = fetchFromGitHub { owner = "Shougo"; repo = "vimproc.vim"; - rev = "3ba46c01109bc590c6740c1133f53584751924b2"; - sha256 = "05m34kbpi6y4rkcrxz785jikj37y5q44k0wfjdhklr49fgw08vra"; + rev = "f396529d7868b43d88978eb347bb203353991184"; + sha256 = "1jn9z0c98hmza5nyjbhyjfdljq9rf8ypjn3q0qq82xxs9xzg9y6w"; }; meta.homepage = "https://github.com/Shougo/vimproc.vim/"; }; @@ -13177,12 +13177,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2022-10-14"; + version = "2022-10-16"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "1c01755ca57189fa5fc5d778e4b3b2e3c5b50a94"; - sha256 = "0a1d7v9fzgdda8d5hmfmpan3q2fpcgyzab59j21x03lzg2a94h4x"; + rev = "3b8e0f2b664cc234c784ae27ea5d76d1c7d806e9"; + sha256 = "1rk1zgfpm0ikhijs5qh938rkk61b87hcj5cxrcs1kvxlip691lli"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; diff --git a/pkgs/applications/editors/vscode/vscodium.nix b/pkgs/applications/editors/vscode/vscodium.nix index ea081382b51a..5d49c3730165 100644 --- a/pkgs/applications/editors/vscode/vscodium.nix +++ b/pkgs/applications/editors/vscode/vscodium.nix @@ -15,11 +15,11 @@ let archive_fmt = if stdenv.isDarwin then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "01b6w97miai191b2d1lr7cwv36vjvwv1hjggr0g9gfr5j99yzdw3"; - x86_64-darwin = "1vf6sdm19r1d6a6ljz3jlvqddgyrdqcxpha4x80ar3kwddy254kb"; - aarch64-linux = "1i48lck395i6lzcxwzfhijs5d141wnxbxg5rzgprm2hgkqx836nr"; - aarch64-darwin = "02xvb41i8ri8l9w8cxxviz63mkskkmxn6rwprpbglpbpxncsxgbn"; - armv7l-linux = "0s0zlql652fwfz94bqmnrl77agd8gf6i5w1y09jpvcc33wv0zlgw"; + x86_64-linux = "1qchwn6dccmq81bmz4zpv5pc6g2gyd7avi9hi1dd099jcxl9xgc8"; + x86_64-darwin = "099s32kbv64s90jy1yrafwmn49f80x4qzq3kwpwpkp6vfsclvnvw"; + aarch64-linux = "1a1rp0gki86dw03lhlnn5l378jd6z7v736x17qsbyc3qfm5schil"; + aarch64-darwin = "153jp14zjzrdw4nwfg9mja0vy9m376dfxf2d6iwb7gl6byvqa1jj"; + armv7l-linux = "1g5dxcly41bxdnfvmybwxrlf2qm3lkb3k0i538wfwxzy8k73i5h5"; }.${system} or throwSystem; sourceRoot = if stdenv.isDarwin then "" else "."; @@ -29,7 +29,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.72.1.22284"; + version = "1.72.2.22286"; pname = "vscodium"; executableName = "codium"; diff --git a/pkgs/applications/emulators/basiliskii/default.nix b/pkgs/applications/emulators/basiliskii/default.nix index ec7076db4678..f32abac9a6b8 100644 --- a/pkgs/applications/emulators/basiliskii/default.nix +++ b/pkgs/applications/emulators/basiliskii/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchFromGitHub, autoconf, automake, pkg-config, SDL2, gtk2 }: stdenv.mkDerivation { pname = "basiliskii"; - version = "unstable-2022-04-05"; + version = "unstable-2022-09-30"; src = fetchFromGitHub { owner = "kanjitalk755"; repo = "macemu"; - rev = "d4baa318e49a29d7ea5fc71a637191d6c470546f"; - sha256 = "jBKTC2fIPJ6mSkMABNxcd2ujXJ+duCXw291iz5ZmiVg="; + rev = "2fa17a0783cf36ae60b77b5ed930cda4dc1824af"; + sha256 = "+jkns6H2YjlewbUzgoteGSQYWJL+OWVu178aM+BtABM="; }; sourceRoot = "source/BasiliskII/src/Unix"; patches = [ ./remove-redhat-6-workaround-for-scsi-sg.h.patch ]; diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 9c80ed6f0860..018d6bf0b7b9 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -17,7 +17,7 @@ python3Packages.buildPythonPackage rec { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - sha256 = "sha256-GmYjf2r5dyxkPWTmypChKbkeifCMFKi1lzRhPNe7Ckw="; + hash = "sha256-GmYjf2r5dyxkPWTmypChKbkeifCMFKi1lzRhPNe7Ckw="; }; nativeBuildInputs = [ @@ -30,7 +30,6 @@ python3Packages.buildPythonPackage rec { cbor2 chardet cloudscraper - dateutil html5lib lxml lz4 @@ -42,6 +41,7 @@ python3Packages.buildPythonPackage rec { pyopenssl pyside2 pysocks + python-dateutil python3Packages.mpv pyyaml qtpy @@ -52,7 +52,11 @@ python3Packages.buildPythonPackage rec { twisted ]; - checkInputs = with python3Packages; [ nose mock httmock ]; + checkInputs = with python3Packages; [ + nose + mock + httmock + ]; # most tests are failing, presumably because we are not using test.py checkPhase = '' diff --git a/pkgs/applications/misc/qolibri/default.nix b/pkgs/applications/misc/qolibri/default.nix index 3b61e3dbc1ad..af7cc7e01a6f 100644 --- a/pkgs/applications/misc/qolibri/default.nix +++ b/pkgs/applications/misc/qolibri/default.nix @@ -1,22 +1,26 @@ -{ mkDerivation, lib, fetchFromGitHub, pkg-config, cmake, libeb, lzo -, qtbase, qtmultimedia, qttools, qtwebengine }: +{ stdenv, lib, fetchFromGitHub, pkg-config, cmake, libeb, lzo +, qtmultimedia, qttools, qtwebengine, wrapQtAppsHook }: -mkDerivation { +stdenv.mkDerivation rec { pname = "qolibri"; - version = "2019-07-22"; + version = "2.1.4"; src = fetchFromGitHub { owner = "ludios"; repo = "qolibri"; - rev = "b58f9838d39300cba444eba725a369181c5d746b"; - sha256 = "0kcc6dvbcmq9y7hk8mp23pydiaqz6f0clg64d1f2y04ppphmah42"; + rev = version; + sha256 = "jyLF1MKDVH0Lt8lw+O93b+LQ4J+s42O3hebthJk83hg="; }; - nativeBuildInputs = [ pkg-config cmake ]; + nativeBuildInputs = [ pkg-config cmake qttools wrapQtAppsHook ]; buildInputs = [ - libeb lzo qtbase qtmultimedia qttools qtwebengine + libeb lzo qtmultimedia qtwebengine ]; + postInstall = '' + install -D $src/qolibri.desktop -t $out/share/applications + ''; + meta = with lib; { homepage = "https://github.com/ludios/qolibri"; description = "EPWING reader for viewing Japanese dictionaries"; diff --git a/pkgs/applications/misc/ulauncher/default.nix b/pkgs/applications/misc/ulauncher/default.nix index 491dd28435a9..5890ec59acfc 100644 --- a/pkgs/applications/misc/ulauncher/default.nix +++ b/pkgs/applications/misc/ulauncher/default.nix @@ -22,8 +22,6 @@ python3Packages.buildPythonApplication rec { pname = "ulauncher"; version = "5.12.1"; - disabled = python3Packages.isPy27; - src = fetchurl { url = "https://github.com/Ulauncher/Ulauncher/releases/download/${version}/ulauncher_${version}.tar.gz"; sha256 = "sha256-Fd3IOCEeXGV8zGd/8SzrWRsSsZRVePnsDaX8WrBrCOQ="; diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 325fb0309723..4afadc218e71 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.178"; + version = "1.2.180"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-gmUamDV7gH30grFkG6rqDEf73wxe+FqhPi1GkNOeKuk="; + hash = "sha256-6I1Elq5tA7Vh+FaPYNVfEynTbw35WM/UuruqArGhsz4="; }; - vendorHash = "sha256-4QVLxvprm27Bv/ZFgxTtqZcSAWak1e+G8s+heW1JZnA="; + vendorHash = "sha256-rdrIJ1knarb7tEXl4BxYckHdX5oS2yvfcuRAI16ThU4="; proxyVendor = true; diff --git a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix index 601cb127ff1f..1342e0f7e983 100644 --- a/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix +++ b/pkgs/applications/networking/irc/weechat/scripts/weechat-matrix/default.nix @@ -57,6 +57,8 @@ in buildPythonPackage { dontBuild = true; doCheck = false; + format = "other"; + installPhase = '' mkdir -p $out/share $out/bin cp main.py $out/share/matrix.py diff --git a/pkgs/applications/science/biology/gatk/default.nix b/pkgs/applications/science/biology/gatk/default.nix index 9853b0322c01..7ace47804828 100644 --- a/pkgs/applications/science/biology/gatk/default.nix +++ b/pkgs/applications/science/biology/gatk/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "gatk"; - version = "4.2.6.1"; + version = "4.3.0.0"; src = fetchzip { url = "https://github.com/broadinstitute/gatk/releases/download/${version}/gatk-${version}.zip"; - sha256 = "0hjlsl7fxf3ankyjidqhwxc70gjh6z4lnjzw6b5fldzb0qvgfvy8"; + sha256 = "sha256-AhXZyWbAXM5iwqxkYkMlqYUN838BjvIf5X95MVEfJ2I="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/data/themes/yaru/default.nix b/pkgs/data/themes/yaru/default.nix index 18c471e4f96b..a056a405c044 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 = "22.04.4"; + version = "22.10.3"; src = fetchFromGitHub { owner = "ubuntu"; repo = "yaru"; rev = version; - sha256 = "sha256-EnlzjJDbiMIImn0XmiurK++JnD/kBqv4Mw6B/ps8d4Y="; + hash = "sha256-ZWt9I/Q5p6fAkheR6QlZI1DI/HL8bSNmHuO5+V3vunY="; }; nativeBuildInputs = [ meson sassc pkg-config glib ninja python3 ]; diff --git a/pkgs/desktops/arcan/arcan/default.nix b/pkgs/desktops/arcan/arcan/default.nix index 0cd7e4e0db64..bfb29e2d869d 100644 --- a/pkgs/desktops/arcan/arcan/default.nix +++ b/pkgs/desktops/arcan/arcan/default.nix @@ -52,6 +52,10 @@ , useStaticSqlite ? false }: +let + cmakeFeatureFlag = feature: flag: + "-D${feature}=${if flag then "on" else "off"}"; +in stdenv.mkDerivation (finalAttrs: { pname = "arcan" + lib.optionalString useStaticOpenAL "-static-openal"; version = "0.6.2"; @@ -156,8 +160,8 @@ stdenv.mkDerivation (finalAttrs: { substituteInPlace ./src/CMakeLists.txt --replace "SETUID" "# SETUID" ''; - # INFO: Arcan build scripts require the manpages to be generated - # before the configure phase + # INFO: Arcan build scripts require the manpages to be generated before the + # `configure` phase preConfigure = lib.optionalString buildManPages '' pushd doc ruby docgen.rb mangen @@ -169,13 +173,13 @@ stdenv.mkDerivation (finalAttrs: { # The upstream project recommends tagging the distribution "-DDISTR_TAG=Nixpkgs" "-DENGINE_BUILDTAG=${finalAttrs.version}" - "-DHYBRID_SDL=on" - "-DBUILTIN_LUA=${if useBuiltinLua then "on" else "off"}" - "-DDISABLE_JIT=${if useBuiltinLua then "on" else "off"}" - "-DSTATIC_FREETYPE=${if useStaticFreetype then "on" else "off"}" - "-DSTATIC_LIBUVC=${if useStaticLibuvc then "on" else "off"}" - "-DSTATIC_OPENAL=${if useStaticOpenAL then "on" else "off"}" - "-DSTATIC_SQLite3=${if useStaticSqlite then "on" else "off"}" + (cmakeFeatureFlag "HYBRID_SDL" true) + (cmakeFeatureFlag "BUILTIN_LUA" useBuiltinLua) + (cmakeFeatureFlag "DISABLE_JIT" useBuiltinLua) + (cmakeFeatureFlag "STATIC_FREETYPE" useStaticFreetype) + (cmakeFeatureFlag "STATIC_LIBUVC" useStaticLibuvc) + (cmakeFeatureFlag "STATIC_OPENAL" useStaticOpenAL) + (cmakeFeatureFlag "STATIC_SQLite3" useStaticSqlite) "../src" ]; diff --git a/pkgs/desktops/arcan/durden/default.nix b/pkgs/desktops/arcan/durden/default.nix index d5e9d0693c84..a18f33ef93aa 100644 --- a/pkgs/desktops/arcan/durden/default.nix +++ b/pkgs/desktops/arcan/durden/default.nix @@ -1,17 +1,17 @@ { lib -, stdenv +, stdenvNoCC , fetchFromGitHub }: -stdenv.mkDerivation (finalPackages: { +stdenvNoCC.mkDerivation (finalPackages: { pname = "durden"; - version = "unstable-2022-07-16"; + version = "unstable-2022-10-16"; src = fetchFromGitHub { owner = "letoram"; repo = "durden"; - rev = "4c9eaf1550d34e10565b545e0f96b1f6b8d26dcd"; - hash = "sha256-1d+Kg17nxNQeVT/iVa5oPXu96Ivvas9AO/H+NxhB4Yo="; + rev = "728a9f09ac8b306ab2619b4e2ec4f48decf1b7a8"; + hash = "sha256-ckOKdrz232Q6hAyFC2mAyZQLNuuR8JbVhbLy32qFn1o="; }; dontConfigure = true; diff --git a/pkgs/desktops/arcan/pipeworld/default.nix b/pkgs/desktops/arcan/pipeworld/default.nix index 6954f157d6e8..1c1c66fd3fb0 100644 --- a/pkgs/desktops/arcan/pipeworld/default.nix +++ b/pkgs/desktops/arcan/pipeworld/default.nix @@ -1,9 +1,9 @@ { lib -, stdenv +, stdenvNoCC , fetchFromGitHub }: -stdenv.mkDerivation (finalPackages: { +stdenvNoCC.mkDerivation (finalPackages: { pname = "pipeworld"; version = "unstable-2022-04-03"; diff --git a/pkgs/desktops/arcan/prio/default.nix b/pkgs/desktops/arcan/prio/default.nix index cc5bef3c3ef8..03a8f05908b5 100644 --- a/pkgs/desktops/arcan/prio/default.nix +++ b/pkgs/desktops/arcan/prio/default.nix @@ -1,9 +1,9 @@ { lib -, stdenv +, stdenvNoCC , fetchFromGitHub }: -stdenv.mkDerivation (finalPackages: { +stdenvNoCC.mkDerivation (finalPackages: { pname = "prio"; version = "unstable-2018-09-13"; diff --git a/pkgs/development/libraries/ctre/default.nix b/pkgs/development/libraries/ctre/default.nix new file mode 100644 index 000000000000..b91c00930ae0 --- /dev/null +++ b/pkgs/development/libraries/ctre/default.nix @@ -0,0 +1,38 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "ctre"; + version = "3.7.1"; + + src = fetchFromGitHub { + owner = "hanickadot"; + repo = "compile-time-regular-expressions"; + rev = "v${version}"; + hash = "sha256-KqYBSY45x8FDQ0YgjrKoZdOiuhf33gv5w160/dSsSsg="; + }; + + nativeBuildInputs = [ cmake ]; + + postPatch = '' + substituteInPlace packaging/pkgconfig.pc.in \ + --replace "\''${prefix}/" "" + ''; + + dontBuild = true; + + meta = with lib; { + description = "Fast compile-time regular expressions library"; + longDescription = '' + Fast compile-time regular expressions with support for + matching/searching/capturing during compile-time or runtime. + ''; + license = licenses.asl20; + homepage = "https://compile-time.re"; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/expected-lite/default.nix b/pkgs/development/libraries/expected-lite/default.nix new file mode 100644 index 000000000000..6afe391e032d --- /dev/null +++ b/pkgs/development/libraries/expected-lite/default.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +}: + +stdenv.mkDerivation rec { + pname = "expected-lite"; + version = "0.6.2"; + + src = fetchFromGitHub { + owner = "martinmoene"; + repo = "expected-lite"; + rev = "v${version}"; + hash = "sha256-d3lFpi62QPZKVt/QeBV7MoH3QltSg5dsUI3dIUArPpA="; + }; + + nativeBuildInputs = [ cmake ninja ]; + + doCheck = true; + + meta = with lib; { + description = '' + Expected objects in C++11 and later in a single-file header-only library + ''; + homepage = "https://github.com/martinmoene/expected-lite"; + changelog = "https://github.com/martinmoene/expected-lite/blob/${src.rev}/CHANGES.txt"; + license = licenses.boost; + maintainers = with maintainers; [ azahi ]; + }; +} diff --git a/pkgs/development/libraries/gsl-lite/default.nix b/pkgs/development/libraries/gsl-lite/default.nix new file mode 100644 index 000000000000..34beee93ecd3 --- /dev/null +++ b/pkgs/development/libraries/gsl-lite/default.nix @@ -0,0 +1,51 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +, installCompatHeader ? false +, installLegacyHeaders ? false +}: + +stdenv.mkDerivation rec { + pname = "gsl-lite"; + version = "0.40.0"; + + src = fetchFromGitHub { + owner = "gsl-lite"; + repo = "gsl-lite"; + rev = "v${version}"; + hash = "sha256-80ksT8XFn2LLMr63gKGZD/0+FDLnAtFyMpuuSjtoBlk="; + }; + + nativeBuildInputs = [ cmake ninja ]; + + cmakeFlags = lib.mapAttrsToList + (name: value: ''-DGSL_LITE_OPT_${name}:BOOL=${if value then "ON" else "OFF"}'') + { + INSTALL_COMPAT_HEADER = installCompatHeader; + INSTALL_LEGACY_HEADERS = installLegacyHeaders; + BUILD_TESTS = doCheck; + }; + + # Building tests is broken on Darwin. + doCheck = !stdenv.isDarwin; + + meta = with lib; { + description = '' + A single-file header-only version of ISO C++ Guidelines Support Library + (GSL) for C++98, C++11, and later + ''; + longDescription = '' + gsl-lite is a single-file header-only implementation of the C++ Core + Guidelines Support Library originally based on Microsoft GSL and adapted + for C++98, C++03. It also works when compiled as C++11, C++14, C++17, + C++20. + ''; + homepage = "https://github.com/gsl-lite/gsl-lite"; + changelog = "https://github.com/gsl-lite/gsl-lite/blob/${src.rev}/CHANGES.txt"; + license = licenses.mit; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 8dd2415433a6..5d2ad71bada8 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -2,8 +2,6 @@ , libdeflate, libpng, libtiff, zlib, lcms2, jpylyzer , jpipLibSupport ? false # JPIP library & executables , jpipServerSupport ? false, curl, fcgi # JPIP Server -, opjViewerSupport ? false, wxGTK # OPJViewer executable -, openjpegJarSupport ? false # Openjpeg jar (Java) , jdk , poppler }: @@ -45,8 +43,8 @@ stdenv.mkDerivation rec { "-DBUILD_THIRDPARTY=OFF" (mkFlag jpipLibSupport "BUILD_JPIP") (mkFlag jpipServerSupport "BUILD_JPIP_SERVER") - (mkFlag opjViewerSupport "BUILD_VIEWER") - (mkFlag openjpegJarSupport "BUILD_JAVA") + "-DBUILD_VIEWER=OFF" + "-DBUILD_JAVA=OFF" (mkFlag doCheck "BUILD_TESTING") ]; @@ -54,8 +52,7 @@ stdenv.mkDerivation rec { buildInputs = [ libdeflate libpng libtiff zlib lcms2 ] ++ lib.optionals jpipServerSupport [ curl fcgi ] - ++ lib.optional opjViewerSupport wxGTK - ++ lib.optional (openjpegJarSupport || jpipLibSupport) jdk; + ++ lib.optional (jpipLibSupport) jdk; doCheck = (!stdenv.isAarch64 && !stdenv.hostPlatform.isPower64); # tests fail on aarch64-linux and powerpc64 @@ -78,7 +75,5 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ codyopel ]; platforms = platforms.all; - # opj viewer fails to compile with lots of errors, jar requires openjpeg library already compiled and installed - broken = (opjViewerSupport || openjpegJarSupport); }; } diff --git a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix index b76baea49930..c8abc71a2235 100644 --- a/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix +++ b/pkgs/development/libraries/qt-6/modules/qtdeclarative.nix @@ -32,4 +32,8 @@ qtModule { "bin/qmlscene" "bin/qmltestrunner" ]; + + NIX_CFLAGS_COMPILE = [ + "-fmacro-prefix-map=${qtbase.dev}=qtbase.dev" + ]; } diff --git a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix index c365f3c06853..4dff38d3acc2 100644 --- a/pkgs/development/libraries/qt-6/modules/qtwebengine.nix +++ b/pkgs/development/libraries/qt-6/modules/qtwebengine.nix @@ -228,6 +228,10 @@ qtModule { requiredSystemFeatures = [ "big-parallel" ]; + preConfigure = '' + export NINJAFLAGS="-j$NIX_BUILD_CORES" + ''; + postInstall = '' # This is required at runtime mkdir $out/libexec diff --git a/pkgs/development/libraries/sigslot/default.nix b/pkgs/development/libraries/sigslot/default.nix new file mode 100644 index 000000000000..e410c280a282 --- /dev/null +++ b/pkgs/development/libraries/sigslot/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "sigslot"; + version = "1.2.1"; + + src = fetchFromGitHub { + owner = "palacaze"; + repo = "sigslot"; + rev = "v${version}"; + hash = "sha256-FXoKI0aTpZNHHYZnEoPduf3ctOQ/qKoQrrXZPviAvuY="; + }; + + nativeBuildInputs = [ cmake ]; + + dontBuild = true; + + meta = with lib; { + description = "A header-only, thread safe implementation of signal-slots for C++"; + license = licenses.mit; + homepage = "https://github.com/palacaze/sigslot"; + maintainers = with maintainers; [ azahi ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/development/lua-modules/generated-packages.nix b/pkgs/development/lua-modules/generated-packages.nix index d3b9695fbefa..d6f992773811 100644 --- a/pkgs/development/lua-modules/generated-packages.nix +++ b/pkgs/development/lua-modules/generated-packages.nix @@ -2606,19 +2606,24 @@ buildLuarocksPackage { }) {}; nvim-cmp = callPackage({ buildLuarocksPackage, luaOlder, luaAtLeast -, fetchzip, lua +, fetchgit, lua }: buildLuarocksPackage { pname = "nvim-cmp"; - version = "0.0.1-2"; - knownRockspec = (fetchurl { - url = "mirror://luarocks/nvim-cmp-0.0.1-2.rockspec"; - sha256 = "0jx4i2rnc7zmy1bbqp6fqymlklc7xvqyv35prjl3ld05c4dpg7nq"; - }).outPath; - src = fetchzip { - url = "http://github.com/hrsh7th/nvim-cmp/archive/v0.0.1.zip"; - sha256 = "0649n476jd6dqd79fmywmigz19sb0s344ablwr25gr23fp46hzaz"; - }; + version = "scm-1"; + + src = fetchgit ( removeAttrs (builtins.fromJSON ''{ + "url": "https://github.com/hrsh7th/nvim-cmp", + "rev": "3347dd3c59b6c62288d861ddb92b9ba1227257a8", + "date": "2022-10-15T15:20:35+09:00", + "path": "/nix/store/yz8ak36srpzaw6qm2gip07ppl6zladcd-nvim-cmp", + "sha256": "1ca9mpxq7cqi36mqz0cgyhl9w1dwcalwh6v4kj377g1vqslyl5ay", + "fetchLFS": false, + "fetchSubmodules": true, + "deepClone": false, + "leaveDotGit": false +} + '') ["date" "path"]) ; disabled = with lua; (luaOlder "5.1") || (luaAtLeast "5.4"); propagatedBuildInputs = [ lua ]; diff --git a/pkgs/development/tools/analysis/binlore/default.nix b/pkgs/development/tools/analysis/binlore/default.nix index e6d529b0684a..54ea108b7d46 100644 --- a/pkgs/development/tools/analysis/binlore/default.nix +++ b/pkgs/development/tools/analysis/binlore/default.nix @@ -45,11 +45,11 @@ let # TODO: feeling really uninspired on the API loreDef = { # YARA rule file - rules = (src + /execers.yar); + rules = (src + "/execers.yar"); # output filenames; "types" of lore types = [ "execers" "wrappers" ]; # shell rule callbacks; see github.com/abathur/yallback - yallback = (src + /execers.yall); + yallback = (src + "/execers.yall"); # TODO: # - echo for debug, can be removed at some point # - I really just wanted to put the bit after the pipe @@ -88,7 +88,7 @@ let fi ''; }; - overrides = (src + /overrides); + overrides = (src + "/overrides"); in rec { collect = { lore ? loreDef, drvs, strip ? [ ] }: (runCommand "more-binlore" { } '' diff --git a/pkgs/development/tools/ruff/default.nix b/pkgs/development/tools/ruff/default.nix index 782e0f287c59..f06ae2091f7c 100644 --- a/pkgs/development/tools/ruff/default.nix +++ b/pkgs/development/tools/ruff/default.nix @@ -8,16 +8,16 @@ rustPlatform.buildRustPackage rec { pname = "ruff"; - version = "0.0.75"; + version = "0.0.76"; src = fetchFromGitHub { owner = "charliermarsh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-+2ussKBWgsbl2h+IQACwXKvLwdhJNfTG1A0W/BLmNHA="; + sha256 = "sha256-PWJkn96QInAOgR0T5ISuhfI4OYQ+jMBBqFRlewoGyjI="; }; - cargoSha256 = "sha256-3/tLUzxzZCYgEruYrRSfzfvx84ewpprf2lJlZM2JvYM="; + cargoSha256 = "sha256-c0GxKyQtgkTY8mAgtLgH8S9TKKLyhJvxJR9uc+nVOh0="; buildInputs = lib.optionals stdenv.isDarwin [ CoreServices diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index 583c6ba90226..66b6faa32552 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -27,13 +27,13 @@ let in stdenv.mkDerivation rec { pname = "gemrb"; - version = "0.9.1"; + version = "0.9.1.1"; src = fetchFromGitHub { owner = "gemrb"; repo = "gemrb"; rev = "v${version}"; - hash = "sha256-xc59Iyrmbmo7Kxio0lLpvVlpdoeM/vfmBLkJdzJsSPY="; + hash = "sha256-pC83LgAy1aQxUhS2qa57hm03B37bj6dcRVRn7SI5I+k="; }; buildInputs = [ diff --git a/pkgs/games/steam/fhsenv.nix b/pkgs/games/steam/fhsenv.nix index 8ad1600701d5..ea9db37cbddf 100644 --- a/pkgs/games/steam/fhsenv.nix +++ b/pkgs/games/steam/fhsenv.nix @@ -294,5 +294,10 @@ in buildFHSUserEnv rec { ${fixBootstrap} exec -- "$run" "$@" ''; + + meta = steam.meta // { + description = "Run commands in the same FHS environment that is used for Steam"; + name = "steam-run"; + }; }; } diff --git a/pkgs/os-specific/linux/kernel/zen-kernels.nix b/pkgs/os-specific/linux/kernel/zen-kernels.nix index 10741e7d1fd3..370952054736 100644 --- a/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "6.0.1"; #zen - suffix = "zen2"; #zen - sha256 = "172xacqqkrnrbgf2sy158wny4dpb92isilq0p4x700xxrvvz4ag2"; #zen + version = "6.0.2"; #zen + suffix = "zen1"; #zen + sha256 = "1x80ah2cszj3fbxfpdnlr30r1fblgrhydslfh9vrk48l0z3z80a7"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "5.19.15"; #lqx + version = "5.19.16"; #lqx suffix = "lqx2"; #lqx - sha256 = "1zqfgxcba24y0v3xd249rbqvd92lcf3s888mmqwidxcdjqlj5kc8"; #lqx + sha256 = "1n4hbkb1af9gzdvk7cp73i004j2slb0im9yk1b869h27pxs4il6s"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 3e9c9150f03c..bf810d98ae54 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "9.1.7"; + version = "9.2.0"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-dlQlzX3aGZzBOb0V6ogB8yuoC8Dt18O8nKcJAQ9bfvs="; + sha256 = "sha256-cfm+BfzSMtkDMkiDH7rsoh/tEofmqWhuUz1slk+FaOI="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "sha256-ioXc9UfbNRz/RCdnFfaEDRxtamR8st9Wc1LQ6wdl8SE="; + sha256 = "sha256-qJnqIog5DQXI8MAZtb2USkb5UwY7c05nDBt2mf13BJ8="; }; - vendorSha256 = "sha256-frY84+Tp9qVj9Xs9l0c0u1YyYywMbXO4KS0AF5mpnhQ="; + vendorSha256 = "sha256-SYDkKB/D+uWHoeGAcYJmYxLhMOw458vkmFJlLbcrf2k="; nativeBuildInputs = [ wire ]; diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index b42ca01774a2..0bfc868167cb 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2.0.70"; + version = "2.0.71"; pname = "munin"; src = fetchFromGitHub { owner = "munin-monitoring"; repo = "munin"; rev = version; - sha256 = "sha256-fczrCulKs7c9e0vKQ12bEJODr74/uBj77llqCqcPMps="; + sha256 = "sha256-RIWZpvC4bVrm5DXnWyBw7/57oZR+Z3m+NfjmSjLSKi0="; }; nativeBuildInputs = [ diff --git a/pkgs/stdenv/generic/check-meta.nix b/pkgs/stdenv/generic/check-meta.nix index ce39130d3151..95d1422b127e 100644 --- a/pkgs/stdenv/generic/check-meta.nix +++ b/pkgs/stdenv/generic/check-meta.nix @@ -301,7 +301,7 @@ let executables = listOf str; outputsToInstall = listOf str; position = str; - available = bool; + available = unspecified; isBuildPythonPackage = platforms; schedulingPriority = int; isFcitxEngine = bool; diff --git a/pkgs/tools/admin/pulumi/data.nix b/pkgs/tools/admin/pulumi/data.nix index 8c1b5bcaf764..938ac08317a8 100644 --- a/pkgs/tools/admin/pulumi/data.nix +++ b/pkgs/tools/admin/pulumi/data.nix @@ -1,12 +1,12 @@ # DO NOT EDIT! This file is generated automatically by update.sh { }: { - version = "3.42.0"; + version = "3.43.1"; pulumiPkgs = { x86_64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.42.0-linux-x64.tar.gz"; - sha256 = "1lrfswqw5xd0pxmkfaf77bny94f225rbcjxf7py4s2kbhvc580fv"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.43.1-linux-x64.tar.gz"; + sha256 = "09jmvk682b595bmpv4lxdwm61fn47iplmqm2qjsp2nwhfg9r8ny8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-linux-amd64.tar.gz"; @@ -29,16 +29,16 @@ sha256 = "0y7np2qg2hp81cji78bjbcw7ng2g81y1asbnqb2jd2ip0yf43aqp"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.16.2-linux-amd64.tar.gz"; - sha256 = "1r65ylh2wpmv3p4wvr93b7yy73s83lv68xv5858lmbx8iblnl9c1"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.17.0-linux-amd64.tar.gz"; + sha256 = "0fwshvmqs62dmpscyshd06sf8nk4bdak5xzh5la48fcnzf45cvzs"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.21.0-linux-amd64.tar.gz"; - sha256 = "0fh94k411qravqw5iz9m91aasz9s6lcvc73nw6h3v2df1j6rgm0q"; + sha256 = "0wxzmhwd6nji738hwkpjs2b0jpq0ppmy2vnpb0yvbcmd1j4dssip"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.28.0-linux-amd64.tar.gz"; - sha256 = "0rjzn2jcaylgnilb9jqzia1cdkjdvqwbm4djmv8sdcrp64jdx0r9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.29.1-linux-amd64.tar.gz"; + sha256 = "0pv2b447658zsf0hr9479ncygakjrcccfq3bhz22m0xijchivjrw"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-linux-amd64.tar.gz"; @@ -49,8 +49,8 @@ sha256 = "177s1vi6ci4v04gyck8c2p9r17w8538migw6d1n7yzyf74qjdwhl"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-linux-amd64.tar.gz"; - sha256 = "0a5nav53dg3j4rrx7747a7bk90krfg9fxj0kw0wahcnjijbv1255"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.7.0-linux-amd64.tar.gz"; + sha256 = "1nk8aprac0bcw5lx75plwg07hlx1jmbbscima0j5g36gkw6lhln2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.11.0-linux-amd64.tar.gz"; @@ -73,8 +73,8 @@ sha256 = "1087d10z0h2vlx18czh4yhplb4qqyy94zf0hvqm5n6vmyh9kpr8j"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.39.0-linux-amd64.tar.gz"; - sha256 = "11qik0dg12svgh93f5xr7sbqs0bkb8m680cn252lwcwdyz06hfni"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.40.0-linux-amd64.tar.gz"; + sha256 = "0cak1x3ims9xqn8jdqiy40nbaplfs17jp38xv718xq917f8y28f1"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.0.0-linux-amd64.tar.gz"; @@ -141,8 +141,8 @@ sha256 = "1yq72jgvarbh754a1ym9b8jk40jmk25ly78cw2wj31a96rxv1qp9"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.6.0-linux-amd64.tar.gz"; - sha256 = "10irh4gfljyiqhf1dw2v3g129yxp9lfglwz1lbwxba8ql9m40vcd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.7.0-linux-amd64.tar.gz"; + sha256 = "1826nmjjqyf4yim4axni2qf7l6anyr62fdd81nw7qz52117kl8ig"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-linux-amd64.tar.gz"; @@ -163,8 +163,8 @@ ]; x86_64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.42.0-darwin-x64.tar.gz"; - sha256 = "1n036l138nz8w8ciidfhvqpyd1qpfyrv4nqy87z9kygx9pivhj20"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.43.1-darwin-x64.tar.gz"; + sha256 = "14w4q0llw4g67gljmqq0r93lqff11x63x8nhdaxwqnxn1a3fr20p"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-darwin-amd64.tar.gz"; @@ -187,16 +187,16 @@ sha256 = "0dz583zm47v2x2aznc4yszxibmp9schp3b38yzmbry0xrkm1gryx"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.16.2-darwin-amd64.tar.gz"; - sha256 = "1h4pnhz1iimakg7ngfkpa0hlzh9bp42mhp002fa0z40g55y8i0h9"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.17.0-darwin-amd64.tar.gz"; + sha256 = "1ds8af2yfhdk9zq745szx7f42gx47crb9xlwh6hb7b94564jvy6p"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.21.0-darwin-amd64.tar.gz"; - sha256 = "0382ambpmfp3bwvmwgnpz08jkrxmiwwj5r6a4crq39s8d4lsf3nb"; + sha256 = "1329v6nsbvbydf4pbv23qp78cizga179jnybg269m8sfqflxh2i3"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.28.0-darwin-amd64.tar.gz"; - sha256 = "01mar9qhgdmh02cqpjrsczfshiv0mpz83vm33y8igjnf371gg51g"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.29.1-darwin-amd64.tar.gz"; + sha256 = "1j017xnjn2illayjg46r53khxjja7vrf4dcj2al4c27n5gf31q8l"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-darwin-amd64.tar.gz"; @@ -207,8 +207,8 @@ sha256 = "18k9gzsbx48q17y9p8i5wqbjcq9bq94ha96lxvljcyf0jmsklkj6"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-darwin-amd64.tar.gz"; - sha256 = "0pvq5mwl8scsyvkqgy32v1qs4060w0m12z0f1cw0aw34wd3zs67a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.7.0-darwin-amd64.tar.gz"; + sha256 = "0jh6v9skyxf4ljiqc5070c1r8gkgaic6wy7w7264c1xfrnwsy31g"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.11.0-darwin-amd64.tar.gz"; @@ -231,8 +231,8 @@ sha256 = "02p8g3kirc9g9jgmv50l8c9jamidk389in33f7qnz22hck880dr8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.39.0-darwin-amd64.tar.gz"; - sha256 = "0s2lvm3zf5dnirm9ka8ilrk5l4m39bdid2r6dpldfc326h079xva"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.40.0-darwin-amd64.tar.gz"; + sha256 = "1q5xn1x257br9rrdp3n4z4a4a6nggfs2d0fkdp1g6yrwxrwc4z7a"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.0.0-darwin-amd64.tar.gz"; @@ -299,8 +299,8 @@ sha256 = "0g1kh5zkkr9m1k5qmmmkay089j0yqbz9qap6k7gii1k601mm09sf"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.6.0-darwin-amd64.tar.gz"; - sha256 = "0z06di24mdzdkv8zvpxbzcvp9k8w5yqkskc2gigxl2iv608glmn6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.7.0-darwin-amd64.tar.gz"; + sha256 = "0k39q57wwdcxgpmv6sfifkmcc1rplqabjxk8fg3bvna6zias81yn"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-darwin-amd64.tar.gz"; @@ -321,8 +321,8 @@ ]; aarch64-linux = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.42.0-linux-arm64.tar.gz"; - sha256 = "11dz7i0nnsanj8xams0pr9nxbq9rwfzrjyg4m8wi5nv6q3frnml9"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.43.1-linux-arm64.tar.gz"; + sha256 = "1vqvnigyv262m70liccz854j6jhj0zv5bkc9vv8drj1pihfiphsr"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-linux-arm64.tar.gz"; @@ -345,16 +345,16 @@ sha256 = "0ni0dp0wghcaybnzvvwyf0nbnyq8k2akkghxlym48z8dq7n4206y"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.16.2-linux-arm64.tar.gz"; - sha256 = "132zvb1wnpwbrg1rg0pr07msfnpf1h1izwr87dki6k40kc3q12mk"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.17.0-linux-arm64.tar.gz"; + sha256 = "0k7g2fm9bl5pqxp8qv55wlazj0w5a4z2wnnmzij7vh887li9q4xq"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.21.0-linux-arm64.tar.gz"; - sha256 = "1c4fxvmw50nrmnq3q8bnypjg2yvpsm3bs6jbw0hxb2zk3im6jjdp"; + sha256 = "08fsndqfibxn203ilddrzr3zqmq8y7kk6zlzrb4y9rzjqykrsnp8"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.28.0-linux-arm64.tar.gz"; - sha256 = "0m44k0cllmaw17injy8l1pl9xx180nydia937p78v93fwmk8f65a"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.29.1-linux-arm64.tar.gz"; + sha256 = "0cxczw5byb9sb16wkb6gygxwnax3rxj5662z2xcpa04sc9qrs5q2"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-linux-arm64.tar.gz"; @@ -365,8 +365,8 @@ sha256 = "0gr30lgad0xf7f4acxj9v7r69gncfzh1x7rn7nvyibsfy7ggn80z"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-linux-arm64.tar.gz"; - sha256 = "085flnzp062p6ankfl77p1y7n8ijrhmknnb4r46x6b3lrw891pgd"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.7.0-linux-arm64.tar.gz"; + sha256 = "1hd08gd2v3wl81amvcf821vzmmh7agw8cspnl6fqc7g69agn1l12"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.11.0-linux-arm64.tar.gz"; @@ -389,8 +389,8 @@ sha256 = "1cymvx8dx836d2vcnakgqz51nc033702dph66w8j4swj0sg4wd92"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.39.0-linux-arm64.tar.gz"; - sha256 = "1bdbf17z8a2rfgs79xvd71vj7k0zhyvjjvb3vwc46qlf9if3kzsm"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.40.0-linux-arm64.tar.gz"; + sha256 = "0sh3lv05ywnqvr4cjpiaxdadfs22d6lfabw69vh5507s2a99rqji"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.0.0-linux-arm64.tar.gz"; @@ -457,8 +457,8 @@ sha256 = "11n751m4z2gjslvf28xazhq123yfqyyhshni97ad5ki23i1v785l"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.6.0-linux-arm64.tar.gz"; - sha256 = "0lc6394fvqs62rxmf4ryrvj9v5237wdrmypyyqjibk5rd72n8xfg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.7.0-linux-arm64.tar.gz"; + sha256 = "0x3xdqd623q83fr67byhnqbx7gz8p8j65myygmjr14p2rfh1jvvb"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-linux-arm64.tar.gz"; @@ -479,8 +479,8 @@ ]; aarch64-darwin = [ { - url = "https://get.pulumi.com/releases/sdk/pulumi-v3.42.0-darwin-arm64.tar.gz"; - sha256 = "10lrxkbb8m7pcpqwfi8klpn26k0pbm5lg7yg3y55kc8dqwl220d7"; + url = "https://get.pulumi.com/releases/sdk/pulumi-v3.43.1-darwin-arm64.tar.gz"; + sha256 = "08sajzfwlgw0ay2ra0wrxfdbia9215jl9dzn9k51xbraxzay3ls8"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aiven-v5.4.0-darwin-arm64.tar.gz"; @@ -503,16 +503,16 @@ sha256 = "11qrwc44vl0s59bbhjbb15nkcy8nb9lcsw9brb7whvxh2z080nbk"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.16.2-darwin-arm64.tar.gz"; - sha256 = "0xh5v19szndrj9r4gd7mx99m383rmbj13n77ny43zwbd8vbnhq6z"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-aws-v5.17.0-darwin-arm64.tar.gz"; + sha256 = "0vmgn5yg9al682sxq6gfgmivqz1g5m9fwn0iqpfbjd08b7s63ala"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azure-v5.21.0-darwin-arm64.tar.gz"; - sha256 = "1899q6zagxi5jjd4a73yfkbbm8idh5dklrzj7620jz3cc6c3mwrg"; + sha256 = "1qsph1x9y82h8d9swh8nq4z9vygiqnqh6nh5ghpc555vjds3r64w"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.28.0-darwin-arm64.tar.gz"; - sha256 = "15xhkk4d8l445zn3kmh7aqd476gcbig109jchz0r57yhs76hycyg"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuread-v5.29.1-darwin-arm64.tar.gz"; + sha256 = "0alpkm813gd0qi93928dk5k77py67yviz946mx1jbb5562lh7p72"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-azuredevops-v2.5.0-darwin-arm64.tar.gz"; @@ -523,8 +523,8 @@ sha256 = "0jp50xcv9ss156i3v173j28ia7ykslmcv8nb4a8bz10jmhkxg52v"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.6.0-darwin-arm64.tar.gz"; - sha256 = "11b8dr2ycn3p4k06y2f4pj19hy7zpq0glh8npqixmvn66flp3wa7"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-consul-v3.7.0-darwin-arm64.tar.gz"; + sha256 = "1ss8dak6lk03s391914wxs1y20h4k0khqab7k15lajvl6jm13809"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-datadog-v4.11.0-darwin-arm64.tar.gz"; @@ -547,8 +547,8 @@ sha256 = "1gmx1lympd3r4i2vsnnmd70qq3x0ijbv53j7vkys59g560rw1bvm"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.39.0-darwin-arm64.tar.gz"; - sha256 = "1rfxrqyfm7dijmcg1h6ipic1wj0r177aqnrfhrql50asy0c0spmf"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-gcp-v6.40.0-darwin-arm64.tar.gz"; + sha256 = "1sxn6pa064wpivlw6dv52xdk26irw57bczrv14833yhcz888lndy"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-github-v5.0.0-darwin-arm64.tar.gz"; @@ -615,8 +615,8 @@ sha256 = "0yyr5dv612ar8c12w74zwp0n1v77lry548fs6b0d20cc3a6d10gb"; } { - url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.6.0-darwin-arm64.tar.gz"; - sha256 = "02n0crpb2vf8b3ih658f6576r13ly4v02a4kwbrpifmk3c27yhv6"; + url = "https://api.pulumi.com/releases/plugins/pulumi-resource-vault-v5.7.0-darwin-arm64.tar.gz"; + sha256 = "16kkhfaskk4rq00h3h6gpndam64py7swk199v4l9w29rg4wl5v3q"; } { url = "https://api.pulumi.com/releases/plugins/pulumi-resource-venafi-v1.4.1-darwin-arm64.tar.gz"; diff --git a/pkgs/tools/admin/pulumi/update.sh b/pkgs/tools/admin/pulumi/update.sh index 163de7a9b61d..cc0f0f4a2911 100755 --- a/pkgs/tools/admin/pulumi/update.sh +++ b/pkgs/tools/admin/pulumi/update.sh @@ -12,7 +12,7 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd ) # Version of Pulumi from # https://www.pulumi.com/docs/get-started/install/versions/ -VERSION="3.42.0" +VERSION="3.43.1" # An array of plugin names. The respective repository inside Pulumi's # Github organization is called pulumi-$name by convention. diff --git a/pkgs/tools/misc/smenu/default.nix b/pkgs/tools/misc/smenu/default.nix index a56978e07281..6992158e73c9 100644 --- a/pkgs/tools/misc/smenu/default.nix +++ b/pkgs/tools/misc/smenu/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - version = "1.0.0"; + version = "1.1.0"; pname = "smenu"; src = fetchFromGitHub { owner = "p-gen"; repo = "smenu"; rev = "v${version}"; - sha256 = "sha256-jmQ5QLsy0T2ytq1xYJkLBlEw5NxVTsAN+wckyV+68zg="; + sha256 = "sha256-qzlBgGPzQ3lnTBKVzQ8ZN3fwOcPgeT+GSUWXray4EYw="; }; buildInputs = [ ncurses ]; diff --git a/pkgs/tools/misc/vtm/default.nix b/pkgs/tools/misc/vtm/default.nix index 8335e37f6e02..756c474716d5 100644 --- a/pkgs/tools/misc/vtm/default.nix +++ b/pkgs/tools/misc/vtm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "vtm"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "netxs-group"; repo = "vtm"; rev = "v${version}"; - sha256 = "sha256-TRuTvaCALQPxilkzSODdeI2P4FuxTGg8UTHkMDiuYTU="; + sha256 = "sha256-m22Bj/Zj72OMZgmmX4cIuhb0JO/K9FopvXi9V9cMqDg="; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/tools/misc/ytcast/default.nix b/pkgs/tools/misc/ytcast/default.nix new file mode 100644 index 000000000000..a918f56fbedc --- /dev/null +++ b/pkgs/tools/misc/ytcast/default.nix @@ -0,0 +1,23 @@ +{ lib, buildGoModule, fetchFromGitHub, }: + +buildGoModule rec { + pname = "ytcast"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "MarcoLucidi01"; + repo = "ytcast"; + rev = "v${version}"; + sha256 = "0f45ai1s4njhcvbv088yn10i3vdvlm6wlfi0ijq5gak1dg02klma"; + }; + + vendorSha256 = null; + ldflags = [ "-X main.progVersion=${version}" ]; + + meta = with lib; { + description = "A tool to cast YouTube videos from the command-line"; + homepage = "https://github.com/MarcoLucidi01/ytcast"; + license = licenses.mit; + maintainers = with maintainers; [ waelwindows ]; + }; +} diff --git a/pkgs/tools/wayland/mpvpaper/default.nix b/pkgs/tools/wayland/mpvpaper/default.nix index dbc4a3cdba07..76598f4afea2 100644 --- a/pkgs/tools/wayland/mpvpaper/default.nix +++ b/pkgs/tools/wayland/mpvpaper/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "mpvpaper"; - version = "1.2.1"; + version = "1.3"; src = fetchFromGitHub { owner = "GhostNaN"; repo = pname; rev = version; - sha256 = "sha256-1+noph6iXM5OSNMFQyta/ttGyZQ6F7bWDQi8W190G5E="; + sha256 = "sha256-0LjIwOY2hBUb0nziD3HLP2Ek5+8v3ntssRFD9eQgWkc="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7250b68f366e..78e0d4a356a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2458,6 +2458,8 @@ with pkgs; msr = callPackage ../os-specific/linux/msr { }; + ctre = callPackage ../development/libraries/ctre { }; + ctrtool = callPackage ../tools/archivers/ctrtool { }; crowbar = callPackage ../tools/security/crowbar { }; @@ -4761,6 +4763,8 @@ with pkgs; shisho = callPackage ../tools/security/shisho { }; + sigslot = callPackage ../development/libraries/sigslot { }; + siglo = callPackage ../applications/misc/siglo { }; simg2img = callPackage ../tools/filesystems/simg2img { }; @@ -6370,6 +6374,8 @@ with pkgs; expect = callPackage ../tools/misc/expect { }; + expected-lite = callPackage ../development/libraries/expected-lite { }; + exportarr = callPackage ../servers/monitoring/prometheus/exportarr { }; expliot = callPackage ../tools/security/expliot { }; @@ -18466,7 +18472,6 @@ with pkgs; ffmpeg-full = callPackage ../development/libraries/ffmpeg-full { svt-av1 = if stdenv.isAarch64 then null else svt-av1; - rav1e = null; # We already have SVT-AV1 for faster encoding rtmpdump = null; # Prefer the built-in RTMP implementation # The following need to be fixed on Darwin libjack2 = if stdenv.isDarwin then null else libjack2; @@ -18986,6 +18991,8 @@ with pkgs; gsl_1 = callPackage ../development/libraries/gsl/gsl-1_16.nix { }; + gsl-lite = callPackage ../development/libraries/gsl-lite { }; + gsm = callPackage ../development/libraries/gsm {}; gsoap = callPackage ../development/libraries/gsoap { }; @@ -29249,6 +29256,8 @@ with pkgs; imgp = python3Packages.callPackage ../applications/graphics/imgp { }; + imhex = callPackage ../applications/editors/imhex { }; + inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; inklingreader = callPackage ../tools/misc/inklingreader { }; @@ -32978,6 +32987,8 @@ with pkgs; ytarchive = callPackage ../tools/misc/ytarchive { }; + ytcast = callPackage ../tools/misc/ytcast { }; + ytcc = callPackage ../tools/networking/ytcc { }; ytmdesktop = callPackage ../applications/audio/ytmdesktop { };