diff --git a/doc/languages-frameworks/dotnet.section.md b/doc/languages-frameworks/dotnet.section.md index 5b94c3d7dc2e..246490d67d26 100644 --- a/doc/languages-frameworks/dotnet.section.md +++ b/doc/languages-frameworks/dotnet.section.md @@ -123,7 +123,7 @@ To package Dotnet applications, you can use `buildDotnetModule`. This has simila * `dotnetPackFlags` can be used to pass flags to `dotnet pack`. Used only if `packNupkg` is set to `true`. * `dotnetFlags` can be used to pass flags to all of the above phases. -When packaging a new application, you need to fetch its dependencies. You can run `nix-build -A package.fetch-deps` to generate a script that will build a lockfile for you. After running the script you should have the location of the generated lockfile printed to the console, which can be copied to a stable directory. Then set `nugetDeps = ./deps.nix` and you're ready to build the derivation. +When packaging a new application, you need to fetch its dependencies. Create an empty `deps.nix`, set `nugetDeps = ./deps.nix`, then run `nix-build -A package.fetch-deps` to generate a script that will build the lockfile for you. Here is an example `default.nix`, using some of the previously discussed arguments: ```nix diff --git a/doc/languages-frameworks/javascript.section.md b/doc/languages-frameworks/javascript.section.md index a6c5aad15c15..7fd84ed0e65e 100644 --- a/doc/languages-frameworks/javascript.section.md +++ b/doc/languages-frameworks/javascript.section.md @@ -196,6 +196,8 @@ buildNpmPackage rec { * `npmDepsHash`: The output hash of the dependencies for this project. Can be calculated in advance with [`prefetch-npm-deps`](#javascript-buildNpmPackage-prefetch-npm-deps). * `makeCacheWritable`: Whether to make the cache writable prior to installing dependencies. Don't set this unless npm tries to write to the cache directory, as it can slow down the build. * `npmBuildScript`: The script to run to build the project. Defaults to `"build"`. +* `dontNpmBuild`: Option to disable running the build script. Set to `true` if the package does not have a build script. Defaults to `false`. Alternatively, setting `buildPhase` explicitly also disables this. +* `dontNpmInstall`: Option to disable running `npm install`. Defaults to `false`. Alternatively, setting `installPhase` explicitly also disables this. * `npmFlags`: Flags to pass to all npm commands. * `npmInstallFlags`: Flags to pass to `npm ci` and `npm prune`. * `npmBuildFlags`: Flags to pass to `npm run ${npmBuildScript}`. diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index bae640db6370..97e7c4ffed62 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -1943,6 +1943,12 @@ github = "beardhatcode"; githubId = 662538; }; + beeb = { + name = "Valentin Bersier"; + email = "hi@beeb.li"; + github = "beeb"; + githubId = 703631; + }; beezow = { name = "beezow"; email = "zbeezow@gmail.com"; diff --git a/maintainers/scripts/update-dotnet-lockfiles.nix b/maintainers/scripts/update-dotnet-lockfiles.nix new file mode 100644 index 000000000000..22ceff1ffa99 --- /dev/null +++ b/maintainers/scripts/update-dotnet-lockfiles.nix @@ -0,0 +1,72 @@ +/* + To run: + + nix-shell maintainers/scripts/update-dotnet-lockfiles.nix + + This script finds all the derivations in nixpkgs that have a 'fetch-deps' + attribute, and runs all of them sequentially. This is useful to test changes + to 'fetch-deps', 'nuget-to-nix', or other changes to the dotnet build + infrastructure. Regular updates should be done through the individual packages + update scripts. + */ +let + pkgs = import ../.. {}; + + inherit (pkgs) lib; + + packagesWith = cond: pkgs: + let + packagesWithInner = attrs: + lib.unique ( + lib.concatLists ( + lib.mapAttrsToList (name: elem: + let + result = builtins.tryEval elem; + in + if result.success then + let + value = result.value; + in + if lib.isDerivation value then + lib.optional (cond value) value + else + if lib.isAttrs value && (value.recurseForDerivations or false || value.recurseForRelease or false) then + packagesWithInner value + else [] + else []) attrs)); + in + packagesWithInner pkgs; + + packages = + packagesWith (pkgs: pkgs ? fetch-deps) pkgs; + + helpText = '' + Please run: + + % nix-shell maintainers/scripts/update-dotnet-lockfiles.nix + ''; + + fetchScripts = map (p: p.fetch-deps) packages; + +in pkgs.stdenv.mkDerivation { + name = "nixpkgs-update-dotnet-lockfiles"; + buildCommand = '' + echo "" + echo "----------------------------------------------------------------" + echo "" + echo "Not possible to update packages using \`nix-build\`" + echo "" + echo "${helpText}" + echo "----------------------------------------------------------------" + exit 1 + ''; + shellHook = '' + unset shellHook # do not contaminate nested shells + set -e + for x in $fetchScripts; do + $x + done + exit + ''; + inherit fetchScripts; +} diff --git a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh index 6346c2fa9f40..1354588a7549 100755 --- a/pkgs/applications/blockchains/nbxplorer/util/update-common.sh +++ b/pkgs/applications/blockchains/nbxplorer/util/update-common.sh @@ -9,7 +9,6 @@ set -euo pipefail trap 'echo "Error at ${BASH_SOURCE[0]}:$LINENO"' ERR pkgName=$1 -depsFile=$2 : ${getVersionFromTags:=} : ${refetch:=} @@ -41,7 +40,7 @@ fi if [[ $newVersion == $oldVersion && ! $refetch ]]; then echo "nixpkgs already has the latest version $newVersion" echo "Run this script with env var refetch=1 to re-verify the content hash via GPG" - echo "and to recreate $(basename "$depsFile"). This is useful for reviewing a version update." + echo "and to recreate deps.nix. This is useful for reviewing a version update." exit 0 fi @@ -74,4 +73,4 @@ fi echo # Create deps file -$(nix-build "$nixpkgs" -A $pkgName.fetch-deps --no-out-link) "$depsFile" +$(nix-build "$nixpkgs" -A $pkgName.fetch-deps --no-out-link) diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix index f1ca8c24fe75..1a04a02021c8 100644 --- a/pkgs/applications/editors/vim/plugins/generated.nix +++ b/pkgs/applications/editors/vim/plugins/generated.nix @@ -173,12 +173,12 @@ final: prev: LazyVim = buildVimPluginFrom2Nix { pname = "LazyVim"; - version = "2023-06-26"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "LazyVim"; repo = "LazyVim"; - rev = "c998be8fa4bd67bf130fdbc05f7c2198aa00441c"; - sha256 = "1npgs2fd4ss55ryxh74pkyqwc0psnl4dzsvkih1f0r32skyvg6f0"; + rev = "c03b9a3ff1fa1e6acc1db8d7db0c89c562637f7d"; + sha256 = "03s8dx5mjdvijrs4smvhnsg3nn4r7c0gjzj1wqbzcmw0jz7cwmnc"; }; meta.homepage = "https://github.com/LazyVim/LazyVim/"; }; @@ -365,12 +365,12 @@ final: prev: SpaceVim = buildVimPluginFrom2Nix { pname = "SpaceVim"; - version = "2023-06-27"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "SpaceVim"; repo = "SpaceVim"; - rev = "7330a362b0e18e84ef7ac0099151ac60278511b2"; - sha256 = "1l7b801ynbkr1a10xcqqi2bx8jfxrrcqkx62m20dcl0kjpzksry4"; + rev = "b462646223dfb8a7b19fb3999edffd4d0dd8aea1"; + sha256 = "0illvadr8wahn0swlqiqhd6r77cafwpmxnr7hlpyzfawqpvqdabw"; }; meta.homepage = "https://github.com/SpaceVim/SpaceVim/"; }; @@ -437,12 +437,12 @@ final: prev: YouCompleteMe = buildVimPluginFrom2Nix { pname = "YouCompleteMe"; - version = "2023-06-12"; + version = "2023-06-27"; src = fetchFromGitHub { owner = "ycm-core"; repo = "YouCompleteMe"; - rev = "49ced5a30ad7778178fd44703665a8ef3329e592"; - sha256 = "0grfvb5vl9si7lldvjrlpc648649lwqn41xnb09bmhh8z0g11vx3"; + rev = "f93c2e92ce28ffe2a8cbf0560c5af3e05d7a7aa2"; + sha256 = "110v75v0biqbvhhcjm56ka2kxds4rbym35dlmwkk9yxxi16y10i0"; fetchSubmodules = true; }; meta.homepage = "https://github.com/ycm-core/YouCompleteMe/"; @@ -486,12 +486,12 @@ final: prev: aerial-nvim = buildVimPluginFrom2Nix { pname = "aerial.nvim"; - version = "2023-06-25"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "stevearc"; repo = "aerial.nvim"; - rev = "7c2a432238b9c8e8c526619fa003e658691ea127"; - sha256 = "00rmfh0npla0x3al4dqgm6wkwh31b1phvhg85k0prvrbi0kfb3dz"; + rev = "79644dbedc189d79573b2a60e247989bbd8f16e7"; + sha256 = "0d4pbr9w4pxpcswhpfrcpl91y9m1rpc3q5yk75wc4js2nyk4raah"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/aerial.nvim/"; @@ -547,12 +547,12 @@ final: prev: ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2023-06-09"; + version = "2023-06-27"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "c0eff9f2f18c5408596ce1e8e43dc7933340e514"; - sha256 = "1fhkf7cs7xk6n0md7avisnan9vdd2lyydpmnbsdyxm6i2gwmjz31"; + rev = "29e5ffe35a2fa1ca5ba19eebfe7cdd0191c16e39"; + sha256 = "109asfm9g7cbcbac55syf19vgn2ifwbxgyy69v51xwyyxlgq2czl"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -1015,12 +1015,12 @@ final: prev: bigfile-nvim = buildVimPluginFrom2Nix { pname = "bigfile.nvim"; - version = "2023-06-15"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "LunarVim"; repo = "bigfile.nvim"; - rev = "67a03ff3dfbfacaa0b006c7ddc55356c85510b25"; - sha256 = "0950x8js3ypv2rw99qgrilmg8il3j6n5g3m6pxxx2q3npfm4vy8v"; + rev = "9616b73670ffeb92679677554ded88854ae42cf8"; + sha256 = "09rflfns0qba3r0qrz0p9g0p4vjf5x74phis0nb14fxjalz9cxcc"; }; meta.homepage = "https://github.com/LunarVim/bigfile.nvim/"; }; @@ -1135,12 +1135,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline.nvim"; - version = "2023-06-26"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "bf2f6b7edd0abf6b0732f5e5c0a8f30e51611c75"; - sha256 = "054r6543m6hdq6z44qbnp9kcxnhy6qanrhsabq82g3g3bk59xcy1"; + rev = "2f391fde91b9c3876eee359ee24cc352050e5e48"; + sha256 = "0qg2ia2a0rz8g419dmvyl2djrz3xp6ra01bq5gkpgyj8yrgdmr3v"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -1963,12 +1963,12 @@ final: prev: codeium-vim = buildVimPluginFrom2Nix { pname = "codeium.vim"; - version = "2023-06-25"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "Exafunction"; repo = "codeium.vim"; - rev = "c6d83d0f917dd3f0259674eb4fb71ff0173b1c78"; - sha256 = "0q9qdpqzxawmczny317c1z5bnkmcvyn5x7398z9y9i190ffgsyhc"; + rev = "3cd85d90c112c72ecd93763e0602b93e263f194c"; + sha256 = "074jw9h972ngax0pm6yi9qfppq73lkadn7m94snn86qjchn4fw24"; }; meta.homepage = "https://github.com/Exafunction/codeium.vim/"; }; @@ -2263,24 +2263,24 @@ final: prev: coq-artifacts = buildVimPluginFrom2Nix { pname = "coq.artifacts"; - version = "2023-06-25"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.artifacts"; - rev = "13f1fcbfd18386392a7aaa1e920d433951051302"; - sha256 = "0dwwg32j6qr1mm26y7h1y4nvmy123l3r401zhisxs8i1ibcnngnd"; + rev = "864307e4edd1cf8a83ff9b45b1310f9762cfd1de"; + sha256 = "0kfhgs70ldbrm7mcy7c0fnd4h8jz5sk9whsq0a4hj8inlypyrvm2"; }; meta.homepage = "https://github.com/ms-jpq/coq.artifacts/"; }; coq-thirdparty = buildVimPluginFrom2Nix { pname = "coq.thirdparty"; - version = "2023-06-25"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq.thirdparty"; - rev = "87b462fc70d95712eabdb2a27d80c05f79941242"; - sha256 = "1q7jjfw45i96r3a71k2ajicpsy9zwg1w5z8xrszvicn1hrp6nbm4"; + rev = "f4b97c68bcd217e6aebc301c69deb125ea6f390f"; + sha256 = "1fjigaark1lkdavdrxgm4szywif10lsvalrcgah4rf6vaz48lndb"; }; meta.homepage = "https://github.com/ms-jpq/coq.thirdparty/"; }; @@ -2299,12 +2299,12 @@ final: prev: coq_nvim = buildVimPluginFrom2Nix { pname = "coq_nvim"; - version = "2023-06-25"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "coq_nvim"; - rev = "63d53b14f5ad26b23a58c138a194bc04b49d4de9"; - sha256 = "1vn1vhjmhpvacw1i8znn5fis80slsrl14slp7j3gj0d8syzcg75d"; + rev = "b31a6fc0ac3794780e60d3f12bffc43727ac859e"; + sha256 = "1y3d8avbhabgw97yx21524zz9svanavlyc3rqwk26ha194k0p3b7"; }; meta.homepage = "https://github.com/ms-jpq/coq_nvim/"; }; @@ -3095,12 +3095,12 @@ final: prev: eyeliner-nvim = buildVimPluginFrom2Nix { pname = "eyeliner.nvim"; - version = "2023-06-22"; + version = "2023-06-27"; src = fetchFromGitHub { owner = "jinh0"; repo = "eyeliner.nvim"; - rev = "214e6ff4a0c786b9facac9d2bd267f08cc5fc0bb"; - sha256 = "0fa5y8vgydi63xk99dgryhvcja0zq7jb004bm1fd3g4dd0jpvgar"; + rev = "0b21a862fa0782090350c13c8b32ccd58adc4d82"; + sha256 = "16qx8nlwrbgpdypp4s052gk166k5bq2258i8728ri7ikqbj6vm1a"; }; meta.homepage = "https://github.com/jinh0/eyeliner.nvim/"; }; @@ -3252,12 +3252,12 @@ final: prev: flash-nvim = buildVimPluginFrom2Nix { pname = "flash.nvim"; - version = "2023-06-26"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "folke"; repo = "flash.nvim"; - rev = "7f2d68528c4395a84fdbcea1857049217d7f3dda"; - sha256 = "0gmwb769hhpmx1q2cjz1d40ll1gsgy5xg5slyvnlv22f0a9dwq36"; + rev = "feda1d5a98a1705e86966e62a052661a7369b3c0"; + sha256 = "1rh9gkpaabqs98a4q57xqwqaf7ds193b4yfkhs6b2h3mbgw3p0w2"; }; meta.homepage = "https://github.com/folke/flash.nvim/"; }; @@ -3480,12 +3480,12 @@ final: prev: fzf-lua = buildVimPluginFrom2Nix { pname = "fzf-lua"; - version = "2023-06-26"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "ibhagwan"; repo = "fzf-lua"; - rev = "5039478fd0e11657eb8abf81c40b9f61fb6b6914"; - sha256 = "150ncwcip1wx98vdi899q66x00vgrb04z18b2p3s37lnb8vir2vf"; + rev = "26cc8e35ecdd02e03aeab39149187c3af3641add"; + sha256 = "1i7wps57sd87yx5zkqlck9nj5hr8ganr37dcb1cjkylx960kzij8"; }; meta.homepage = "https://github.com/ibhagwan/fzf-lua/"; }; @@ -3576,12 +3576,12 @@ final: prev: git-blame-nvim = buildVimPluginFrom2Nix { pname = "git-blame.nvim"; - version = "2023-06-24"; + version = "2023-06-27"; src = fetchFromGitHub { owner = "f-person"; repo = "git-blame.nvim"; - rev = "66ba799b1a45ff0b81ccfb1df2ea79a860044618"; - sha256 = "07vss302dbh33v8j7gj787kifbygnhis1bg64rsilxr4l8l46kbz"; + rev = "93d983806a0c76692bebd6f804c8eaa2a3844452"; + sha256 = "1hinhha75gx74swaamgnm0igqqbvxxywq2v5xz7s0bz9kyyabii6"; }; meta.homepage = "https://github.com/f-person/git-blame.nvim/"; }; @@ -3911,12 +3911,12 @@ final: prev: haskell-tools-nvim = buildNeovimPlugin { pname = "haskell-tools.nvim"; - version = "2023-06-25"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "MrcJkb"; repo = "haskell-tools.nvim"; - rev = "385563527de4a9e3b8eefdf350f396cdfff183da"; - sha256 = "0q2mwna8c385hic6gg5hbpw8qwnirpajs5lf4c3693g7fzg1bq0j"; + rev = "614dc618925d2de9ddec2be06762930a4bc32149"; + sha256 = "0czwgjvrcdzrxraq7dyan55crcna4ml87g7hfwzkp9zvavv5alig"; }; meta.homepage = "https://github.com/MrcJkb/haskell-tools.nvim/"; }; @@ -4607,24 +4607,24 @@ final: prev: leap-nvim = buildVimPluginFrom2Nix { pname = "leap.nvim"; - version = "2023-06-26"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "ggandor"; repo = "leap.nvim"; - rev = "c390eab0950ea01a0d118c2c3c29db7781430b33"; - sha256 = "1pminnalq75r4cw0j8f4mh0qhvzakzgmr106p9c3qhj54km22jsp"; + rev = "f41de5c1cfeb146e4b8c5ed20e5b32230457ff25"; + sha256 = "0wga34195dg19x4y01mhs2pipxlkmhdlzjhp6qybwd860d696hhi"; }; meta.homepage = "https://github.com/ggandor/leap.nvim/"; }; legendary-nvim = buildVimPluginFrom2Nix { pname = "legendary.nvim"; - version = "2023-06-23"; + version = "2023-06-27"; src = fetchFromGitHub { owner = "mrjones2014"; repo = "legendary.nvim"; - rev = "d6166169f3cc2214398a6f516f2f2a0ccc2472c4"; - sha256 = "0rva1qwjjklfxjr7bn3vxv4ma4hrhjg469ynws1y69q5475vbj2v"; + rev = "fa8f72c13874146953c4d07c3b24b5c00d7d7d7a"; + sha256 = "0w7cdqb5hvsrps91lvdbiyg7jqbq6q6gr97gbzsnh9ynhrgcd7vn"; }; meta.homepage = "https://github.com/mrjones2014/legendary.nvim/"; }; @@ -5171,12 +5171,12 @@ final: prev: mason-lspconfig-nvim = buildVimPluginFrom2Nix { pname = "mason-lspconfig.nvim"; - version = "2023-06-12"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason-lspconfig.nvim"; - rev = "d381fcb78d7a562c3244e1c8f76406954649db36"; - sha256 = "1wfdb1cbqkyh24f3y7hswl2b41s7r2cz0s6ms5az5jfa2a56m1wl"; + rev = "4c3baba22189aa2a08d32bb8d08b32c7e22a2e84"; + sha256 = "0yakim6qqjacii1q8rp4ywwmlyn4pr47325qiwvzysz1yw2angcl"; }; meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/"; }; @@ -5195,12 +5195,12 @@ final: prev: mason-nvim = buildVimPluginFrom2Nix { pname = "mason.nvim"; - version = "2023-06-21"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "williamboman"; repo = "mason.nvim"; - rev = "664c987c3b14d2262a4e580f993a3e5045baded0"; - sha256 = "0pvxp5zdd2jxy0gkz913rny0p7k9zam5dzsdvgv8ihcdwn0c5mdg"; + rev = "8adaf0bc58ddadd70dad563f949042fb1cb0211c"; + sha256 = "0c4y6gjc7f2yd83hm09arqyq9bli5f7k2h80qd114n2snarvd09f"; }; meta.homepage = "https://github.com/williamboman/mason.nvim/"; }; @@ -5279,12 +5279,12 @@ final: prev: mini-nvim = buildVimPluginFrom2Nix { pname = "mini.nvim"; - version = "2023-06-25"; + version = "2023-06-27"; src = fetchFromGitHub { owner = "echasnovski"; repo = "mini.nvim"; - rev = "59a0e2387afffc953285baa1ab8578e948c52495"; - sha256 = "0qwqzjs8mq457xqmvkc9yzb9l32al4493sjkigjxbj41dihhgyd6"; + rev = "a4241b6f51393d5e4d91a12d94e386bae287dae5"; + sha256 = "03mhcvlw7nx0l9dsflj3kkg829kl5icjxdynmc3wna0cxmajp1na"; }; meta.homepage = "https://github.com/echasnovski/mini.nvim/"; }; @@ -5675,12 +5675,12 @@ final: prev: neodev-nvim = buildVimPluginFrom2Nix { pname = "neodev.nvim"; - version = "2023-06-26"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "folke"; repo = "neodev.nvim"; - rev = "a59e3e612e85462b0410a7dce4040fd2ba37f294"; - sha256 = "1wi1sfjpdy5462maijiv08pi73il9027jwf0sbpygafh36d1p84y"; + rev = "a2b1d8fb9fa4daa35d3fd9123bccccccbd4a3520"; + sha256 = "1ym0xb23kk3z2v0sgg16dj1fyqck1mslzsg7r8zaj6nn77pghr8n"; }; meta.homepage = "https://github.com/folke/neodev.nvim/"; }; @@ -5781,6 +5781,18 @@ final: prev: meta.homepage = "https://github.com/nvim-neorg/neorg/"; }; + neorg-telescope = buildVimPluginFrom2Nix { + pname = "neorg-telescope"; + version = "2023-05-20"; + src = fetchFromGitHub { + owner = "nvim-neorg"; + repo = "neorg-telescope"; + rev = "d24f445c912451ddbf17cbe8da36561b51b10d39"; + sha256 = "00nn3v2294mzd1y35r4ykns42n3n0zmfg1q3dybmvv2lnrz8a9n5"; + }; + meta.homepage = "https://github.com/nvim-neorg/neorg-telescope/"; + }; + neoscroll-nvim = buildVimPluginFrom2Nix { pname = "neoscroll.nvim"; version = "2023-01-15"; @@ -6825,6 +6837,18 @@ final: prev: meta.homepage = "https://github.com/mfussenegger/nvim-lint/"; }; + nvim-lsp-notify = buildVimPluginFrom2Nix { + pname = "nvim-lsp-notify"; + version = "2023-03-19"; + src = fetchFromGitHub { + owner = "mrded"; + repo = "nvim-lsp-notify"; + rev = "9986955e0423f2f5cdb3bd4f824bc980697646a0"; + sha256 = "06zaydcsmmdblqvrkiv827lv3z9smf90v57f62fqgbxn5rhx38r7"; + }; + meta.homepage = "https://github.com/mrded/nvim-lsp-notify/"; + }; + nvim-lsp-ts-utils = buildVimPluginFrom2Nix { pname = "nvim-lsp-ts-utils"; version = "2022-07-17"; @@ -7055,12 +7079,12 @@ final: prev: nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2023-06-27"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "0cb9efeb03eba99292de1a83e44f9c4196bb6825"; - sha256 = "1jfq5cnbygs3qllb69c3xng93s9jy3xmwgsh6vg86lqcc0sglgl8"; + rev = "445f21d6e73e7c62c79e45ea70a45285c2deb153"; + sha256 = "11n7fbdzw38k0l242cq2v4bsxzac7aik5s31590r0k3hifly2p4g"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -7175,12 +7199,12 @@ final: prev: nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2023-06-26"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "d49ba798c95398e62321b40041e8ac4654fea251"; - sha256 = "065qr5wsrd4hrf3hag6ak2acdnk2lsc6n41pykwhkgxcxhlwvv7d"; + rev = "e7f2b1276b7aa68099acc8169ce51f7e389b1772"; + sha256 = "0q8wgw46pxdgs41agf9ldwyzn3gjznrq66kxza74s6mn20blmpwc"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -7199,12 +7223,12 @@ final: prev: nvim-treesitter-endwise = buildVimPluginFrom2Nix { pname = "nvim-treesitter-endwise"; - version = "2023-04-30"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "RRethy"; repo = "nvim-treesitter-endwise"; - rev = "944b0d85bb6817948eaaf78893cbb23c25641d8f"; - sha256 = "0nh5aiqbnia832hq4rbm0ijj4wb5djncqdz8zmpvf137mh0qp66q"; + rev = "9298b3ac8fd6d0d8f9e321194c6d3fd37e417cf9"; + sha256 = "1zkc892v347380awywfyfk0q8nsavi37zgz9yhizc4am6lphn391"; }; meta.homepage = "https://github.com/RRethy/nvim-treesitter-endwise/"; }; @@ -7414,12 +7438,12 @@ final: prev: oil-nvim = buildVimPluginFrom2Nix { pname = "oil.nvim"; - version = "2023-06-26"; + version = "2023-06-27"; src = fetchFromGitHub { owner = "stevearc"; repo = "oil.nvim"; - rev = "a2b7ab5e99907ac04d75ce04d8dcd5728b0ad2f8"; - sha256 = "06n4cmn06w0nprswy3p7izskj92ng9yr72pkdlq1cx98ys9zyrgs"; + rev = "0138a2e0f9baacd98d5531ebb5078fafc5114fae"; + sha256 = "06kskpjhb5n59ls4wpv9a6mxyyv24zyfs7rahfb7p0jd96mnwylp"; fetchSubmodules = true; }; meta.homepage = "https://github.com/stevearc/oil.nvim/"; @@ -7896,12 +7920,12 @@ final: prev: python-mode = buildVimPluginFrom2Nix { pname = "python-mode"; - version = "2023-06-24"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "python-mode"; repo = "python-mode"; - rev = "71a7f0805212a54bd961c828bbb8e7ba4f83923f"; - sha256 = "18hnsp1jn223w07ifafiqyrja6srac3nr2lj0jv5v0zykzzvp3p8"; + rev = "c86c4dbf5276c5950f4651c021ff05e9296aff37"; + sha256 = "1vw3ga1v8pykl9cmgb690l8b5wadpvym329v2ccgayby73jb9812"; fetchSubmodules = true; }; meta.homepage = "https://github.com/python-mode/python-mode/"; @@ -8053,12 +8077,12 @@ final: prev: refactoring-nvim = buildVimPluginFrom2Nix { pname = "refactoring.nvim"; - version = "2023-06-19"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "theprimeagen"; repo = "refactoring.nvim"; - rev = "9f28801ed1803306ddbe5b8058849da412a90648"; - sha256 = "0114mak2152x1df3r649p5nb11cd3d2ldfq1xn6nm7jjk7qi3y8h"; + rev = "859289acc0fda13bf42834dbeef10b8c1148d444"; + sha256 = "0nipkn9yfgy3606kkaiyq6rvmasq4jmivdnhr102bl86xsccm4yw"; }; meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/"; }; @@ -8245,24 +8269,24 @@ final: prev: scnvim = buildVimPluginFrom2Nix { pname = "scnvim"; - version = "2023-04-29"; + version = "2023-06-27"; src = fetchFromGitHub { owner = "davidgranstrom"; repo = "scnvim"; - rev = "5cd5a28b972eced0d03f2d3cf887a8f5bdbfecfd"; - sha256 = "0ns0wh79bgwxbsvq26cx0xzdw71zp761isif6p3144gh7ndqxmpd"; + rev = "c44d57aeadc4b01888bc10a249f8867df8d1a461"; + sha256 = "0pbji2c5rs3d6kqixm7xz5ararix2iq7rh58hap9ssgr88rzqjng"; }; meta.homepage = "https://github.com/davidgranstrom/scnvim/"; }; scope-nvim = buildVimPluginFrom2Nix { pname = "scope.nvim"; - version = "2023-06-23"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "tiagovla"; repo = "scope.nvim"; - rev = "107214792bb77a35588e5112dde629aa316c80cc"; - sha256 = "1xzl7zfhj1rkaxxnrspxzcfw19ix5ya89qzggzcqj1wj3xvnrx54"; + rev = "4a67c3e16867b2b241f5f2db2ab291497b76bece"; + sha256 = "18j83wwh1sb7bkk5nmf9sn7dc0n9bbzgr9k0qxcavz40v3x68b92"; }; meta.homepage = "https://github.com/tiagovla/scope.nvim/"; }; @@ -8365,12 +8389,12 @@ final: prev: sg-nvim = buildVimPluginFrom2Nix { pname = "sg.nvim"; - version = "2023-06-21"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "sourcegraph"; repo = "sg.nvim"; - rev = "f1fa0cf7f1c8d73b2631aaed9c73f706da8be4b5"; - sha256 = "1firdr23l58zdb9kvhar5ksc88ix6iy5pgifp4r9wks88k16gbr0"; + rev = "3574508d9a48caeb8813bd58080024b8363589ce"; + sha256 = "0s53nxvcyjp90frcvlpfpl5sn9x28kqfiw80bj2j8dbhkmz395k7"; }; meta.homepage = "https://github.com/sourcegraph/sg.nvim/"; }; @@ -8787,12 +8811,12 @@ final: prev: suda-vim = buildVimPluginFrom2Nix { pname = "suda.vim"; - version = "2023-06-24"; + version = "2023-06-27"; src = fetchFromGitHub { owner = "lambdalisue"; repo = "suda.vim"; - rev = "6c54de33d388204b26d72e5bfa43aa4be0362e55"; - sha256 = "18f8ddp4ysamvczqa1lb3lv3zbdfgfav6kmh0qg4v3wcwqwsjc2l"; + rev = "8b0fc3711760195aba104e2d190cff9af8267052"; + sha256 = "196fl3anzpw5999035xjmm00qsrg2d2mmbkjr7f72bk7rqiqyl8c"; }; meta.homepage = "https://github.com/lambdalisue/suda.vim/"; }; @@ -9752,12 +9776,12 @@ final: prev: typst-vim = buildVimPluginFrom2Nix { pname = "typst.vim"; - version = "2023-06-12"; + version = "2023-06-27"; src = fetchFromGitHub { owner = "kaarmu"; repo = "typst.vim"; - rev = "e990294efa7ea9b4116f03291dce7dea6b3250d3"; - sha256 = "0jkz2jyc5x2d2wbwp29x0z11v5fjlhyjr0fz4hq16vv533ywwhwg"; + rev = "d1e598dadf4d52bf33b52c7e5f1861227906a15c"; + sha256 = "07xaibd3rx65i5d2g3i5z1ix6m66pm8lnq3ci3q4xsycw34rb43h"; }; meta.homepage = "https://github.com/kaarmu/typst.vim/"; }; @@ -9800,12 +9824,12 @@ final: prev: unison = buildVimPluginFrom2Nix { pname = "unison"; - version = "2023-06-26"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "unisonweb"; repo = "unison"; - rev = "24fc7cea79f54ccd6ab165c9adaaa34e741c6ebb"; - sha256 = "0whh4hagdvsdhg3dsr55d4nb7bbc39xz9hn3jyz7i4dg24h4a73y"; + rev = "bb0e539222c8169353380b4822190c08e12a0f60"; + sha256 = "0qs40nzidvf8zhrawkfz9y1d9b594ia1gnv2cyvqm1x4s8i8vy2h"; }; meta.homepage = "https://github.com/unisonweb/unison/"; }; @@ -11264,12 +11288,12 @@ final: prev: vim-eunuch = buildVimPluginFrom2Nix { pname = "vim-eunuch"; - version = "2022-10-12"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-eunuch"; - rev = "291ef1f8c8996ca7715df1032a35a27b12d7b5cf"; - sha256 = "0fy40dh98z5rmhja6czaxwv48lfpph71vbqsfz55119686zgmc5p"; + rev = "67f3dd32b4dcd1c427085f42ff5f29c7adc645c6"; + sha256 = "1jhql40ffxxmxs5wfwx0k54h2d3gdg0ajjbxwjiqdnmhyw9wfv9x"; }; meta.homepage = "https://github.com/tpope/vim-eunuch/"; }; @@ -14832,12 +14856,12 @@ final: prev: vimspector = buildVimPluginFrom2Nix { pname = "vimspector"; - version = "2023-06-14"; + version = "2023-06-27"; src = fetchFromGitHub { owner = "puremourning"; repo = "vimspector"; - rev = "8d9ead4fefc1899bd94da231c97c99def8829dad"; - sha256 = "19awga4jcrc8xa3ij6gk35ad4v1cshvqw3hfwmj6a7n3inkkxplx"; + rev = "02c8da857bbb1b5fc2cf7dfbdda85ba1201a8d8c"; + sha256 = "1r4j4hilfrccrfpq08i24qdc7560lra3zvwd15y9371nkgbvrjqg"; fetchSubmodules = true; }; meta.homepage = "https://github.com/puremourning/vimspector/"; @@ -15290,12 +15314,12 @@ final: prev: catppuccin-nvim = buildVimPluginFrom2Nix { pname = "catppuccin-nvim"; - version = "2023-06-25"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "catppuccin"; repo = "nvim"; - rev = "8d02781a638123394f9bc160aad47a9560a113f9"; - sha256 = "1gjr5anvbahxzdzs1x7xsb6kqhfw50lw8yzdj4lxma0pxkgd0aw1"; + rev = "12894370fa3c9e2200f3724c4184354d6b79733a"; + sha256 = "1fr5aanff0b456pw7d56hmca2qxvplirmqhqsqrv1ahdi892r57y"; }; meta.homepage = "https://github.com/catppuccin/nvim/"; }; @@ -15314,12 +15338,12 @@ final: prev: chad = buildVimPluginFrom2Nix { pname = "chad"; - version = "2023-06-25"; + version = "2023-06-28"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "0145af11a29557b91d0640500e5ff383dcfb2a51"; - sha256 = "1x66mbdkyxr7spwianajchz4qlba1q5n2gvki5mz786sfprgfcjk"; + rev = "c9e066075d440a246caeb5434abd31e79e788ee6"; + sha256 = "12dq2b7w6pkf4qbq48qz0drqzdm2fq3ndcz5czrlkq1pimh1zjr4"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; diff --git a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix index 65eb2f2e78b0..34a85920801a 100644 --- a/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix +++ b/pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix @@ -126,12 +126,12 @@ }; c = buildGrammar { language = "c"; - version = "0.0.0+rev=f1b2a0b"; + version = "0.0.0+rev=84bdf40"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-c"; - rev = "f1b2a0b2102ff001a4ed9a26cd9a9405d09c590c"; - hash = "sha256-35aKCSulI4Fi5Y8DMjCUSnUMvR6JdnVAF7dirVAWptM="; + rev = "84bdf409067676dd5c003b2a7cb7760456e731bf"; + hash = "sha256-dm6Hn3KOCRLWRCUxg0tOOXKz2znOMIqlsHkFPFHlkh4="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-c"; }; @@ -181,12 +181,12 @@ }; cmake = buildGrammar { language = "cmake"; - version = "0.0.0+rev=aafadc0"; + version = "0.0.0+rev=3dfc596"; src = fetchFromGitHub { owner = "uyha"; repo = "tree-sitter-cmake"; - rev = "aafadc0d657faa99e483a4f2c70dbe64491b1802"; - hash = "sha256-DBchVEIyElDReVawEkwvy2b07Z7w2bZTCQdOgWICxFc="; + rev = "3dfc596025431b21e839d392c171f6f97c2a4258"; + hash = "sha256-SrNsKtZ/BYa6wWkuseHuwwvcC37IKFuGtS5oNefWG0U="; }; meta.homepage = "https://github.com/uyha/tree-sitter-cmake"; }; @@ -491,12 +491,12 @@ }; foam = buildGrammar { language = "foam"; - version = "0.0.0+rev=c238f4a"; + version = "0.0.0+rev=ec73f2e"; src = fetchFromGitHub { owner = "FoamScience"; repo = "tree-sitter-foam"; - rev = "c238f4af9a5723a212cf1a4c9b31dd5c1d5270a2"; - hash = "sha256-GCVV7kj+5S12jedyMajw2OcFOJ0Wz8hiDCImh/G1ngg="; + rev = "ec73f2e317f9c09356e7be452d85671b9923a428"; + hash = "sha256-S/j4evMQiSmtA9V8GCedCHCZe8nqpE1R5zJFmzHHEQI="; }; meta.homepage = "https://github.com/FoamScience/tree-sitter-foam"; }; @@ -709,14 +709,25 @@ }; meta.homepage = "https://github.com/bkegley/tree-sitter-graphql"; }; + groovy = buildGrammar { + language = "groovy"; + version = "0.0.0+rev=7ebfaf3"; + src = fetchFromGitHub { + owner = "Decodetalkers"; + repo = "tree-sitter-groovy"; + rev = "7ebfaf33a0f68f9283be17903ebecfdac05a1f3b"; + hash = "sha256-9Jngzug6N8agdiWHs0DMK8LyhSg0s8hWpP6kInwDPY0="; + }; + meta.homepage = "https://github.com/Decodetalkers/tree-sitter-groovy"; + }; hack = buildGrammar { language = "hack"; - version = "0.0.0+rev=b1c41e4"; + version = "0.0.0+rev=95e63e7"; src = fetchFromGitHub { owner = "slackhq"; repo = "tree-sitter-hack"; - rev = "b1c41e4b82c625cc33ddb8701f6aa5a09c72fcf5"; - hash = "sha256-eEvT8pZeGwtnEanYG2qdkCWR6ifh2qm/yxGOTbuZhdE="; + rev = "95e63e79e0d9f91000bd11d458997fabed1bb1e2"; + hash = "sha256-++WvcNWPEs2Ax4KSWaA7sQ1ga2dJVoUnleLkjuQ6tFA="; }; meta.homepage = "https://github.com/slackhq/tree-sitter-hack"; }; @@ -810,12 +821,12 @@ }; html = buildGrammar { language = "html"; - version = "0.0.0+rev=ff48883"; + version = "0.0.0+rev=03e9435"; src = fetchFromGitHub { owner = "tree-sitter"; repo = "tree-sitter-html"; - rev = "ff48883eb679bbb71b7ac08c8023c8defbf9e234"; - hash = "sha256-o4yQsFosxGHj60nezRXDGVBVEPsgITHqE7Ub4rOEAAU="; + rev = "03e9435d5a95e3fcb9d7e2720c2aac5fc1b9ae8f"; + hash = "sha256-iDdWrjvj7f4COanuqcRZQNpAJypLPQc7vbwrO8bSYnE="; }; meta.homepage = "https://github.com/tree-sitter/tree-sitter-html"; }; @@ -1320,6 +1331,17 @@ }; meta.homepage = "https://github.com/ath3/tree-sitter-passwd"; }; + pem = buildGrammar { + language = "pem"; + version = "0.0.0+rev=3662443"; + src = fetchFromGitHub { + owner = "ObserverOfTime"; + repo = "tree-sitter-pem"; + rev = "3662443335bc95bac0168a338b0f29f87162c244"; + hash = "sha256-J6ktfMcH7umeDaK+r2YRljb+5dwKiXJ7dJazuDoBgno="; + }; + meta.homepage = "https://github.com/ObserverOfTime/tree-sitter-pem"; + }; perl = buildGrammar { language = "perl"; version = "0.0.0+rev=60aa138"; @@ -2033,12 +2055,12 @@ }; vimdoc = buildGrammar { language = "vimdoc"; - version = "0.0.0+rev=8c0469d"; + version = "0.0.0+rev=c0f8580"; src = fetchFromGitHub { owner = "neovim"; repo = "tree-sitter-vimdoc"; - rev = "8c0469d1f84f1e2733d4490dfb3cf8f8b100e2da"; - hash = "sha256-8Y2Ow9Hppo8qB8SoaxF/vnOTC8pXZg/d5HjlBxy0wwg="; + rev = "c0f85802485afe4d15e65bbf995ae864bb8ed7c4"; + hash = "sha256-pBdfFeJbZJy6pjr2a0SgFyjEZKvajKOfrqoRAMB66V8="; }; meta.homepage = "https://github.com/neovim/tree-sitter-vimdoc"; }; diff --git a/pkgs/applications/editors/vim/plugins/overrides.nix b/pkgs/applications/editors/vim/plugins/overrides.nix index 7a126fdc2520..6481f76f5ef4 100644 --- a/pkgs/applications/editors/vim/plugins/overrides.nix +++ b/pkgs/applications/editors/vim/plugins/overrides.nix @@ -804,6 +804,10 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }); + neorg = super.neorg.overrideAttrs (old: { + dependencies = with self; [ plenary-nvim ]; + }); + neo-tree-nvim = super.neo-tree-nvim.overrideAttrs (old: { dependencies = with self; [ plenary-nvim nui-nvim ]; }); @@ -933,7 +937,7 @@ self: super: { pname = "sg-nvim-rust"; inherit (old) version src; - cargoHash = "sha256-lYyIWNn10wFU97k6c2F5fCtHKMP5Y5tW41cvMRWXzTk="; + cargoHash = "sha256-IRp4avOvM2tz2oC1Cwr4W/d4i0pzawcZLP+c1+jnm+I="; nativeBuildInputs = [ pkg-config ]; diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names index b73e2f673219..30b96b94b0f5 100644 --- a/pkgs/applications/editors/vim/plugins/vim-plugin-names +++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names @@ -486,6 +486,7 @@ https://github.com/neomake/neomake/,, https://github.com/Shougo/neomru.vim/,, https://github.com/rafamadriz/neon/,, https://github.com/nvim-neorg/neorg/,, +https://github.com/nvim-neorg/neorg-telescope/,HEAD, https://github.com/karb94/neoscroll.nvim/,, https://github.com/Shougo/neosnippet-snippets/,, https://github.com/Shougo/neosnippet.vim/,, diff --git a/pkgs/applications/emulators/ryujinx/updater.sh b/pkgs/applications/emulators/ryujinx/updater.sh index 5827271138d6..3aae3943aa5a 100755 --- a/pkgs/applications/emulators/ryujinx/updater.sh +++ b/pkgs/applications/emulators/ryujinx/updater.sh @@ -3,8 +3,6 @@ set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" -DEPS_FILE="$(realpath "./deps.nix")" - # provide a github token so you don't get rate limited # if you use gh cli you can use: # `export GITHUB_TOKEN="$(cat ~/.config/gh/config.yml | yq '.hosts."github.com".oauth_token' -r)"` @@ -75,4 +73,4 @@ fi echo "building Nuget lockfile" -$(nix-build -A ryujinx.fetch-deps --no-out-link) "$DEPS_FILE" +$(nix-build -A ryujinx.fetch-deps --no-out-link) diff --git a/pkgs/applications/emulators/wine/packages.nix b/pkgs/applications/emulators/wine/packages.nix index dcdb75626de1..21e0db3e7b60 100644 --- a/pkgs/applications/emulators/wine/packages.nix +++ b/pkgs/applications/emulators/wine/packages.nix @@ -42,4 +42,15 @@ in with src; { platforms = [ "x86_64-linux" ]; mainProgram = "wine64"; }; + wineWow64 = callPackage ./base.nix { + pname = "wine-wow64"; + inherit src version supportFlags patches moltenvk; + pkgArches = [ pkgs ]; + mingwGccs = with pkgsCross; [ mingw32.buildPackages.gcc mingwW64.buildPackages.gcc ]; + geckos = [ gecko64 ]; + monos = [ mono ]; + configureFlags = [ "--enable-archs=x86_64,i386" ]; + platforms = [ "x86_64-linux" "x86_64-darwin" ]; + mainProgram = "wine"; + }; } diff --git a/pkgs/applications/graphics/pinta/default.nix b/pkgs/applications/graphics/pinta/default.nix index f38a9a9dcfe1..2f523813a24b 100644 --- a/pkgs/applications/graphics/pinta/default.nix +++ b/pkgs/applications/graphics/pinta/default.nix @@ -26,7 +26,6 @@ buildDotnetModule rec { # How-to update deps: # $ nix-build -A pinta.fetch-deps # $ ./result - # $ cp /tmp/Pinta-deps.nix ./pkgs/applications/graphics/pinta/deps.nix # TODO: create update script nugetDeps = ./deps.nix; diff --git a/pkgs/applications/misc/ArchiSteamFarm/update.sh b/pkgs/applications/misc/ArchiSteamFarm/update.sh index 84e25328fbfd..9af9acb69835 100755 --- a/pkgs/applications/misc/ArchiSteamFarm/update.sh +++ b/pkgs/applications/misc/ArchiSteamFarm/update.sh @@ -3,8 +3,6 @@ set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" -deps_file="$(realpath ./deps.nix)" - new_version="$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/JustArchiNET/ArchiSteamFarm/releases" | jq -r 'map(select(.prerelease == false)) | .[0].tag_name')" old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" @@ -22,7 +20,7 @@ if [[ "${1:-}" != "--deps-only" ]]; then update-source-version ArchiSteamFarm "$new_version" fi -$(nix-build -A ArchiSteamFarm.fetch-deps --no-out-link) "$deps_file" +$(nix-build -A ArchiSteamFarm.fetch-deps --no-out-link) popd "$asf_path/web-ui/update.sh" diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 31cea2d08709..435d8a547ee8 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,8 +1,8 @@ { "stable": { - "version": "114.0.5735.133", - "sha256": "0qnj4gr4b9gmla1hbz1ir64hfmpc45vzkg0hmw9h6m72r4gfr2c2", - "sha256bin64": "0gk9l1xspbqdxv9q16zdcrrr6bxx677cnz7vv4pgg85k1pwhyw3g", + "version": "114.0.5735.198", + "sha256": "1shxlkass3s744mwc571cyzlb9cc8lxvi5wp35mzaldbxq7l9wx9", + "sha256bin64": "0367sks2z7xj130bszimznkjjimfdimknd7qzi68335y9qzl1y92", "deps": { "gn": { "version": "2023-04-19", diff --git a/pkgs/applications/networking/cluster/terraform/default.nix b/pkgs/applications/networking/cluster/terraform/default.nix index 6995ee8f1c4d..111ec28dfaab 100644 --- a/pkgs/applications/networking/cluster/terraform/default.nix +++ b/pkgs/applications/networking/cluster/terraform/default.nix @@ -166,8 +166,8 @@ rec { mkTerraform = attrs: pluggable (generic attrs); terraform_1 = mkTerraform { - version = "1.5.1"; - hash = "sha256-dqnJGIoUJP37Z77TR2RBxP94Hx3AZbx90m8z1FoYdw0="; + version = "1.5.2"; + hash = "sha256-Ri2nWLjPPBINXyPIQSbnd1L+t7QLgXiTOgqX8Dk/rXg="; vendorHash = "sha256-tfCfJj39VP+P4qhJTpEIAi4XB+6VYtVKkV/bTrtnFA0="; patches = [ ./provider-path-0_15.patch ]; passthru = { diff --git a/pkgs/applications/science/biology/mosdepth/default.nix b/pkgs/applications/science/biology/mosdepth/default.nix index fa93ab3fcdb0..13094e7484e6 100644 --- a/pkgs/applications/science/biology/mosdepth/default.nix +++ b/pkgs/applications/science/biology/mosdepth/default.nix @@ -2,14 +2,14 @@ nimPackages.buildNimPackage rec { pname = "mosdepth"; - version = "0.3.3"; + version = "0.3.4"; nimBinOnly = true; src = fetchFromGitHub { owner = "brentp"; repo = "mosdepth"; rev = "v${version}"; - sha256 = "sha256-de3h3SXnXlqjuLT1L66jj/1AoiTuFc3PVJYjm7s8Fj8="; + sha256 = "sha256-7uteYTCbAaXedPqk0WtHpqTfUWH/+rRW8aSlFixkEko="; }; buildInputs = with nimPackages; [ docopt hts-nim pcre ]; diff --git a/pkgs/applications/version-management/git-credential-manager/update.sh b/pkgs/applications/version-management/git-credential-manager/update.sh index e1a03f296f1f..a24eed3f2710 100755 --- a/pkgs/applications/version-management/git-credential-manager/update.sh +++ b/pkgs/applications/version-management/git-credential-manager/update.sh @@ -20,5 +20,4 @@ hash="$(nix-prefetch ./.)" sed -i -Ee "s/hash = \"sha256-[A-Za-z0-9=]{44}\"/hash = \"${hash}\"/" default.nix -nugetDeps="$(realpath ./deps.nix)" -$(nix-build ../../../.. -A git-credential-manager.fetch-deps --no-out-link) "$nugetDeps" +$(nix-build ../../../.. -A git-credential-manager.fetch-deps --no-out-link) diff --git a/pkgs/build-support/dotnet/build-dotnet-module/default.nix b/pkgs/build-support/dotnet/build-dotnet-module/default.nix index a9c49d1e526e..686d89f8c11c 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/default.nix +++ b/pkgs/build-support/dotnet/build-dotnet-module/default.nix @@ -112,7 +112,11 @@ let if (nugetDeps != null) then if lib.isDerivation nugetDeps then nugetDeps - else mkNugetDeps { inherit name; nugetDeps = import nugetDeps; } + else mkNugetDeps { + inherit name; + nugetDeps = import nugetDeps; + sourceFile = nugetDeps; + } else throw "Defining the `nugetDeps` attribute is required, as to lock the NuGet dependencies. This file can be generated by running the `passthru.fetch-deps` script."; # contains the actual package dependencies @@ -138,6 +142,8 @@ let name = "${name}-nuget-source"; paths = [ dependenciesSource sdkSource ]; }; + + nugetDepsFile = _nugetDeps.sourceFile; in stdenvNoCC.mkDerivation (args // { nativeBuildInputs = args.nativeBuildInputs or [ ] ++ [ @@ -166,7 +172,7 @@ stdenvNoCC.mkDerivation (args // { passthru = { inherit nuget-source; - + } // lib.optionalAttrs (nugetDepsFile != null) { fetch-deps = let flags = dotnetFlags ++ dotnetRestoreFlags; @@ -180,8 +186,8 @@ stdenvNoCC.mkDerivation (args // { # Note that toString is necessary here as it results in the path at # eval time (i.e. to the file in your local Nixpkgs checkout) rather # than the Nix store path of the path after it's been imported. - if lib.isPath nugetDeps && !lib.hasPrefix "${builtins.storeDir}/" (toString nugetDeps) - then toString nugetDeps + if lib.isPath nugetDepsFile && !lib.hasPrefix "${builtins.storeDir}/" (toString nugetDepsFile) + then toString nugetDepsFile else ''$(mktemp -t "${pname}-deps-XXXXXX.nix")''; in writeShellScript "fetch-${pname}-deps" '' @@ -208,7 +214,7 @@ stdenvNoCC.mkDerivation (args // { if [[ ''${TMPDIR:-} == /run/user/* ]]; then # /run/user is usually a tmpfs in RAM, which may be too small # to store all downloaded dotnet packages - TMPDIR= + unset TMPDIR fi export tmp=$(mktemp -td "deps-${pname}-XXXXXX") @@ -281,13 +287,15 @@ stdenvNoCC.mkDerivation (args // { echo "Succesfully restored project" echo "Writing lockfile..." - echo -e "# This file was automatically generated by passthru.fetch-deps.\n# Please dont edit it manually, your changes might get overwritten!\n" > "$depsFile" excluded_sources="${lib.concatStringsSep " " sdkDeps}" for excluded_source in ''${excluded_sources[@]}; do ls "$excluded_source" >> "$tmp/excluded_list" done - nuget-to-nix "$tmp/nuget_pkgs" "$tmp/excluded_list" >> "$depsFile" + tmpFile="$tmp"/deps.nix + echo -e "# This file was automatically generated by passthru.fetch-deps.\n# Please dont edit it manually, your changes might get overwritten!\n" > "$tmpFile" + nuget-to-nix "$tmp/nuget_pkgs" "$tmp/excluded_list" >> "$tmpFile" + mv "$tmpFile" "$depsFile" echo "Succesfully wrote lockfile to $depsFile" ''; } // args.passthru or { }; diff --git a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh index 8035b42d0860..3f2a89c41404 100644 --- a/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh +++ b/pkgs/build-support/dotnet/build-dotnet-module/hooks/dotnet-install-hook.sh @@ -40,15 +40,15 @@ dotnetInstallHook() { dotnetPack() { local -r project="${1-}" - env dotnet pack ${project-} \ - -p:ContinuousIntegrationBuild=true \ - -p:Deterministic=true \ - --output "$out/share" \ - --configuration "@buildType@" \ - --no-build \ + env dotnet pack ${project-} \ + -p:ContinuousIntegrationBuild=true \ + -p:Deterministic=true \ + --output "$out/share" \ + --configuration "@buildType@" \ + --no-build \ --runtime "@runtimeId@" \ - ${dotnetPackFlags[@]} \ - ${dotnetFlags[@]} + ${dotnetPackFlags[@]} \ + ${dotnetFlags[@]} } if (( "${#projectFile[@]}" == 0 )); then diff --git a/pkgs/build-support/dotnet/make-nuget-deps/default.nix b/pkgs/build-support/dotnet/make-nuget-deps/default.nix index 723646c5fdca..8281976df626 100644 --- a/pkgs/build-support/dotnet/make-nuget-deps/default.nix +++ b/pkgs/build-support/dotnet/make-nuget-deps/default.nix @@ -1,5 +1,5 @@ { linkFarmFromDrvs, fetchurl }: -{ name, nugetDeps }: +{ name, nugetDeps, sourceFile ? null }: linkFarmFromDrvs "${name}-nuget-deps" (nugetDeps { fetchNuGet = { pname, version, sha256 , url ? "https://www.nuget.org/api/v2/package/${pname}/${version}" }: @@ -7,4 +7,6 @@ linkFarmFromDrvs "${name}-nuget-deps" (nugetDeps { name = "${pname}.${version}.nupkg"; inherit url sha256; }; -}) +}) // { + inherit sourceFile; +} diff --git a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh index ce2a7070ea31..86bc4482088b 100755 --- a/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh +++ b/pkgs/build-support/dotnet/nuget-to-nix/nuget-to-nix.sh @@ -1,6 +1,7 @@ #!@runtimeShell@ set -euo pipefail +shopt -s nullglob export PATH="@binPath@" # used for glob ordering of package names diff --git a/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs b/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs index 3dd6b7da4978..2dc640522797 100644 --- a/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs +++ b/pkgs/build-support/node/fetch-npm-deps/src/parse/mod.rs @@ -5,8 +5,11 @@ use serde_json::{Map, Value}; use std::{ fs, io, process::{Command, Stdio}, + thread, + time::Duration, }; use tempfile::{tempdir, TempDir}; +use ureq::{Error, ErrorKind, Response}; use url::Url; pub mod lock; @@ -103,7 +106,7 @@ impl Package { let specifics = match get_hosted_git_url(&resolved)? { Some(hosted) => { - let mut body = ureq::get(hosted.as_str()).call()?.into_reader(); + let mut body = get_response(hosted.as_str())?.into_reader(); let workdir = tempdir()?; @@ -154,8 +157,7 @@ impl Package { Specifics::Registry { .. } => { let mut body = Vec::new(); - ureq::get(self.url.as_str()) - .call()? + get_response(self.url.as_str())? .into_reader() .read_to_end(&mut body)?; @@ -189,6 +191,31 @@ impl Package { } } +#[allow(clippy::result_large_err)] +fn get_response(url: &str) -> Result { + for _ in 0..4 { + match ureq::get(url).call() { + Err(Error::Status(503 | 429, r)) => { + let retry: Option = r.header("retry-after").and_then(|h| h.parse().ok()); + let retry = retry.unwrap_or(5); + eprintln!("{} for {}, retry in {}", r.status(), r.get_url(), retry); + thread::sleep(Duration::from_secs(retry)); + } + Err(Error::Transport(t)) => match t.kind() { + ErrorKind::ConnectionFailed | ErrorKind::Dns | ErrorKind::Io => { + let retry = 5; + eprintln!("{} for {}, retry in {}", t.kind(), url, retry); + thread::sleep(Duration::from_secs(retry)); + } + _ => return Err(Error::Transport(t)), + }, + result => return result, + }; + } + // Ran out of retries; try one last time and return whatever result we get. + ureq::get(url).call() +} + #[allow(clippy::case_sensitive_file_extension_comparisons)] fn get_hosted_git_url(url: &Url) -> anyhow::Result> { if ["git", "git+ssh", "git+https", "ssh"].contains(&url.scheme()) { diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index 8afa06eac6fc..be7461582303 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "emscripten"; - version = "3.1.41"; + version = "3.1.42"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - sha256 = "sha256-yQZrAQfNZZd65a14AFObrLrBzePBDnK0J87oTEB1Dcw="; + hash = "sha256-elp/LPd9SAuVZy42Wkgb6pCbPi2GnETTfyRJqU92S0E="; rev = version; }; diff --git a/pkgs/development/compilers/roslyn/default.nix b/pkgs/development/compilers/roslyn/default.nix index 4fa028bc00ef..6ab2799f46c4 100644 --- a/pkgs/development/compilers/roslyn/default.nix +++ b/pkgs/development/compilers/roslyn/default.nix @@ -21,7 +21,7 @@ buildDotnetModule rec { projectFile = [ "src/NuGet/Microsoft.Net.Compilers.Toolset/Microsoft.Net.Compilers.Toolset.Package.csproj" ]; - nugetDeps = ./extended-deps.nix; + nugetDeps = ./deps.nix; dontDotnetFixup = true; diff --git a/pkgs/development/compilers/roslyn/deps.nix b/pkgs/development/compilers/roslyn/deps.nix index 7261823943cb..9362f8aab133 100644 --- a/pkgs/development/compilers/roslyn/deps.nix +++ b/pkgs/development/compilers/roslyn/deps.nix @@ -19,6 +19,7 @@ (fetchNuGet { pname = "Microsoft.CodeAnalysis.PublicApiAnalyzers"; version = "3.3.4-beta1.22160.2"; sha256 = "0ih091ls51x5k9q998g14pfy4r3g1ygvzihj1gkrl79wydn7b0n3"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/49e5305d-d845-4a14-9d69-6f5dbfb9570c/nuget/v3/flat2/microsoft.codeanalysis.publicapianalyzers/3.3.4-beta1.22160.2/microsoft.codeanalysis.publicapianalyzers.3.3.4-beta1.22160.2.nupkg"; }) (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.csharp/4.7.0/microsoft.csharp.4.7.0.nupkg"; }) (fetchNuGet { pname = "Microsoft.DiaSymReader.Native"; version = "17.0.0-beta1.21524.1"; sha256 = "0gash3xgzvcb78w2xqv003l0cld199zpfilnjbagwbr5ikdh6f3s"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.diasymreader.native/17.0.0-beta1.21524.1/microsoft.diasymreader.native.17.0.0-beta1.21524.1.nupkg"; }) + (fetchNuGet { pname = "Microsoft.DotNet.Arcade.Sdk"; version = "7.0.0-beta.22171.2"; sha256 = "15y26skavivkwhnpfa984if3cnpnllbbwbdsjiyfdcalp32fhmjq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/7.0.0-beta.22171.2/microsoft.dotnet.arcade.sdk.7.0.0-beta.22171.2.nupkg"; }) (fetchNuGet { pname = "Microsoft.DotNet.XliffTasks"; version = "1.0.0-beta.22169.1"; sha256 = "12fcin3d4m0lawla9fflz9f2qispzgvzf1mwkpscmlk5lnvb0riw"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.xlifftasks/1.0.0-beta.22169.1/microsoft.dotnet.xlifftasks.1.0.0-beta.22169.1.nupkg"; }) (fetchNuGet { pname = "Microsoft.Net.Compilers.Toolset"; version = "4.2.0-1.final"; sha256 = "02zas22hj29gv2w7h74q786i0cvxffgwqai21ri0zj41nb2hwhyq"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.net.compilers.toolset/4.2.0-1.final/microsoft.net.compilers.toolset.4.2.0-1.final.nupkg"; }) (fetchNuGet { pname = "Microsoft.NETCore.App.Host.linux-arm64"; version = "3.1.32"; sha256 = "1zygp70xrk5zggs3q4a6yc6jfdwzcsjjsapqpwn6qyx35m69b72p"; url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/45bacae2-5efb-47c8-91e5-8ec20c22b4f8/nuget/v3/flat2/microsoft.netcore.app.host.linux-arm64/3.1.32/microsoft.netcore.app.host.linux-arm64.3.1.32.nupkg"; }) diff --git a/pkgs/development/compilers/roslyn/extended-deps.nix b/pkgs/development/compilers/roslyn/extended-deps.nix deleted file mode 100644 index 9401e0709d56..000000000000 --- a/pkgs/development/compilers/roslyn/extended-deps.nix +++ /dev/null @@ -1,11 +0,0 @@ -# Some required nuget packages are not picked up by the deps generation script, -# since they are referenced as a SDK reference, which unfortunately only gets -# downloaded during build time. So we include them manually. -{ fetchNuGet }: (import ./deps.nix { inherit fetchNuGet; }) ++ [ - (fetchNuGet rec { - pname = "Microsoft.DotNet.Arcade.Sdk"; - version = "7.0.0-beta.22171.2"; - url = "https://pkgs.dev.azure.com/dnceng/9ee6d478-d288-47f7-aacc-f6e6d082ae6d/_packaging/1a5f89f6-d8da-4080-b15f-242650c914a8/nuget/v3/flat2/microsoft.dotnet.arcade.sdk/${version}/microsoft.dotnet.arcade.sdk.${version}.nupkg"; - sha256 = "15y26skavivkwhnpfa984if3cnpnllbbwbdsjiyfdcalp32fhmjq"; - }) -] diff --git a/pkgs/development/python-modules/lime/default.nix b/pkgs/development/python-modules/lime/default.nix new file mode 100644 index 000000000000..a3296f09c52c --- /dev/null +++ b/pkgs/development/python-modules/lime/default.nix @@ -0,0 +1,61 @@ +{ lib +, fetchPypi +, buildPythonPackage + +, matplotlib +, numpy +, scipy +, tqdm +, scikit-learn +, scikit-image + +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "lime"; + version = "0.2.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.5"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-dpYOTwVf61Pom1AiODuvyHtj8lusYmWYSwozPRpX94E="; + }; + + propagatedBuildInputs = [ + matplotlib + numpy + scipy + tqdm + scikit-learn + scikit-image + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # touches network + "lime/tests/test_lime_text.py" + ]; + + pythonImportsCheck = [ + "lime.exceptions" + "lime.explanation" + "lime.lime_base" + "lime.lime_image" + "lime.lime_text" + ]; + + meta = with lib; { + description = "Local Interpretable Model-Agnostic Explanations for machine learning classifiers"; + homepage = "https://github.com/marcotcr/lime"; + changelog = "https://github.com/marcotcr/lime/releases/tag/${version}"; + license = licenses.bsd2; + maintainers = with lib.maintainers; [ khaser ]; + }; +} diff --git a/pkgs/development/python-modules/matplotlib-sixel/default.nix b/pkgs/development/python-modules/matplotlib-sixel/default.nix new file mode 100644 index 000000000000..e3f661571879 --- /dev/null +++ b/pkgs/development/python-modules/matplotlib-sixel/default.nix @@ -0,0 +1,26 @@ +{ lib +, buildPythonPackage +, fetchPypi +, matplotlib +}: + +buildPythonPackage rec { + pname = "matplotlib-sixel"; + version = "0.0.2"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-JXOb1/IacJV8bhDvF+OPs2Yg1tgRDOqwiAQfiSKTlew="; + }; + + propagatedBuildInputs = [ matplotlib ]; + + pythonImportsCheck = [ "sixel" ]; + + meta = with lib; { + description = "A sixel graphics backend for matplotlib"; + homepage = "https://github.com/jonathf/matplotlib-sixel"; + license = licenses.bsd3; + maintainers = with maintainers; [ GaetanLepage ]; + }; +} diff --git a/pkgs/development/tools/allure/default.nix b/pkgs/development/tools/allure/default.nix index 8b7269f90b3d..14ce73b05dfa 100644 --- a/pkgs/development/tools/allure/default.nix +++ b/pkgs/development/tools/allure/default.nix @@ -2,7 +2,7 @@ let pname = "allure"; - version = "2.22.1"; + version = "2.22.4"; in stdenv.mkDerivation rec { inherit pname version; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/allure-framework/allure2/releases/download/${version}/allure-${version}.tgz"; - sha256 = "sha256-4eXYIZp44ymim1wVqAGZq3RPftAVbSHrZm6P9m3W8ro="; + sha256 = "sha256-oqxobClWwPNeZZhFdoX2tzD2/unG/XmvSp6hU+zzyos="; }; dontConfigure = true; dontBuild = true; diff --git a/pkgs/development/tools/continuous-integration/github-runner/update.sh b/pkgs/development/tools/continuous-integration/github-runner/update.sh index 3ebbfa9f507c..26b54bf6ac0e 100755 --- a/pkgs/development/tools/continuous-integration/github-runner/update.sh +++ b/pkgs/development/tools/continuous-integration/github-runner/update.sh @@ -15,5 +15,5 @@ if [[ "$latestVersion" == "$currentVersion" ]]; then fi update-source-version github-runner "$latestVersion" -$(nix-build -A github-runner.fetch-deps --no-out-link) "$(dirname "$BASH_SOURCE")/deps.nix" +$(nix-build -A github-runner.fetch-deps --no-out-link) diff --git a/pkgs/development/tools/marksman/update.sh b/pkgs/development/tools/marksman/update.sh index 0f4a416e7df9..b17097e683c4 100755 --- a/pkgs/development/tools/marksman/update.sh +++ b/pkgs/development/tools/marksman/update.sh @@ -15,4 +15,4 @@ fi update-source-version marksman "$version" -$(nix-build -A marksman.fetch-deps --no-out-link) "$(dirname -- "${BASH_SOURCE[0]}")/deps.nix" +$(nix-build -A marksman.fetch-deps --no-out-link) diff --git a/pkgs/development/tools/ocaml/dune/3.nix b/pkgs/development/tools/ocaml/dune/3.nix index d0149f356aa7..1fe1383203f0 100644 --- a/pkgs/development/tools/ocaml/dune/3.nix +++ b/pkgs/development/tools/ocaml/dune/3.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "3.8.2"; + version = "3.9.0"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "sha256-Wm7HkBKGFra0ZhZCf6nI8roNbvWkBb+P28b4LcDZNf0="; + hash = "sha256-xIJaneRUrt9FDC2yWsNTAz4x0yap0bS3os1yYGOb1UQ="; }; nativeBuildInputs = [ ocaml findlib ]; diff --git a/pkgs/development/tools/omnisharp-roslyn/updater.sh b/pkgs/development/tools/omnisharp-roslyn/updater.sh index 1007c77fe2f3..10868fbd0992 100755 --- a/pkgs/development/tools/omnisharp-roslyn/updater.sh +++ b/pkgs/development/tools/omnisharp-roslyn/updater.sh @@ -6,8 +6,6 @@ set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" -deps_file="$(realpath "./deps.nix")" - new_version="$(curl -s "https://api.github.com/repos/OmniSharp/omnisharp-roslyn/releases?per_page=1" | jq -r '.[0].name')" old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" @@ -19,4 +17,4 @@ fi cd ../../../.. update-source-version omnisharp-roslyn "${new_version//v}" -$(nix-build -A omnisharp-roslyn.fetch-deps --no-out-link) "$deps_file" +$(nix-build -A omnisharp-roslyn.fetch-deps --no-out-link) diff --git a/pkgs/games/gogui/default.nix b/pkgs/games/gogui/default.nix index d2c25e031d2e..212f0af0e8e3 100644 --- a/pkgs/games/gogui/default.nix +++ b/pkgs/games/gogui/default.nix @@ -1,28 +1,94 @@ -{ fetchurl, lib, stdenv, openjdk, unzip, makeWrapper }: +{ ant +, docbook-xsl-ns +, docbook_xml_dtd_42 +, fetchFromGitHub +, imagemagick +, lib +, libxslt +, makeWrapper +, openjdk +, stdenv +}: let - version = "1.4.9"; + version = "1.5.3"; in stdenv.mkDerivation { pname = "gogui"; inherit version; - nativeBuildInputs = [ makeWrapper unzip ]; - src = fetchurl { - url = "mirror://sourceforge/project/gogui/gogui/${version}/gogui-${version}.zip"; - sha256 = "0qk6p1bhi1816n638bg11ljyj6zxvm75jdf02aabzdmmd9slns1j"; + + src = fetchFromGitHub { + owner = "Remi-Coulom"; + repo = "gogui"; + rev = "v${version}"; + hash = "sha256-GezFhNYB542JnAIUeUVa188+SR5mCedwj0hZN8L83UQ="; }; - dontConfigure = true; - installPhase = '' - mkdir -p $out/share/doc - mv -vi {bin,lib} $out/ - mv -vi doc $out/share/doc/gogui - for x in $out/bin/*; do - wrapProgram $x --prefix PATH ":" ${openjdk}/bin + + nativeBuildInputs = [ + makeWrapper + ant + ]; + + buildInputs = [ + docbook-xsl-ns + imagemagick + libxslt + openjdk + ]; + + buildPhase = '' + runHook preBuild + + substituteInPlace doc/manual/xml/book.xml \ + --replace http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd \ + ${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd + substituteInPlace doc/manual/xml/manpages.xml \ + --replace http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd \ + ${docbook_xml_dtd_42}/xml/dtd/docbook/docbookx.dtd + + # generate required gui images from svg + # see https://github.com/Remi-Coulom/gogui/issues/36 + sizes=( 16x16 24x24 32x32 48x48 64x64 ) + for i in src/net/sf/gogui/images/*.svg; do + for j in ''${sizes[@]}; do + convert $i -resize $j src/net/sf/gogui/images/$(basename $i .svg)-''${j}.png + done done + + for i in src/net/sf/gogui/images/gogui-{black,white,setup}.svg; do + convert $i -resize 8x8 src/net/sf/gogui/images/$(basename $i .svg)-8x8.png + done + + ant -Ddocbook-xsl.dir=${docbook-xsl-ns}/xml/xsl/docbook + + runHook postBuild ''; + + installPhase = '' + runHook preInstall + + # copy documentation + mkdir -p $out/share/doc + mv -vi doc $out/share/doc/gogui + + # make man pages available + mkdir -p $out/share/man/ + ln -s $out/share/doc/gogui/manual/man $out/share/man/man1 + + # copy programs + mv -vi {bin,lib} $out/ + + # wrap programs + for x in $out/bin/*; do + wrapProgram $x --prefix PATH ":" ${openjdk}/bin --set GOGUI_JAVA_HOME ${openjdk} + done + + runHook postInstall + ''; + meta = { - maintainers = [ lib.maintainers.cleverca22 ]; + maintainers = [ lib.maintainers.cleverca22 lib.maintainers.omnipotententity]; description = "A graphical user interface to programs that play the board game Go and support the Go Text Protocol such as GNU Go"; - homepage = "https://gogui.sourceforge.net/"; + homepage = "https://github.com/Remi-Coulom/gogui"; platforms = lib.platforms.unix; license = lib.licenses.gpl3; }; diff --git a/pkgs/games/osu-lazer/update.sh b/pkgs/games/osu-lazer/update.sh index 1ecca32d54a3..8e9849db1e16 100755 --- a/pkgs/games/osu-lazer/update.sh +++ b/pkgs/games/osu-lazer/update.sh @@ -3,8 +3,6 @@ set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" -deps_file="$(realpath "./deps.nix")" - new_version="$(curl -s "https://api.github.com/repos/ppy/osu/releases?per_page=1" | jq -r '.[0].name')" old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" if [[ "$new_version" == "$old_version" ]]; then @@ -18,4 +16,4 @@ if [[ "$1" != "--deps-only" ]]; then update-source-version osu-lazer "$new_version" fi -$(nix-build . -A osu-lazer.fetch-deps --no-out-link) "$deps_file" +$(nix-build . -A osu-lazer.fetch-deps --no-out-link) diff --git a/pkgs/games/space-station-14-launcher/update.sh b/pkgs/games/space-station-14-launcher/update.sh index 8cfab508b0cc..6e8b337d3842 100755 --- a/pkgs/games/space-station-14-launcher/update.sh +++ b/pkgs/games/space-station-14-launcher/update.sh @@ -3,8 +3,6 @@ set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" -deps_file="$(realpath "./deps.nix")" - new_version="$(curl -s "https://api.github.com/repos/space-wizards/SS14.Launcher/releases?per_page=1" | jq -r '.[0].tag_name' | sed 's/v//')" old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./space-station-14-launcher.nix)" @@ -15,4 +13,4 @@ fi cd ../../.. update-source-version space-station-14-launcher.unwrapped "$new_version" -$(nix-build -A space-station-14-launcher.fetch-deps --no-out-link) "$deps_file" +$(nix-build -A space-station-14-launcher.fetch-deps --no-out-link) diff --git a/pkgs/servers/jackett/updater.sh b/pkgs/servers/jackett/updater.sh index d39452d2afc6..1714565edd49 100755 --- a/pkgs/servers/jackett/updater.sh +++ b/pkgs/servers/jackett/updater.sh @@ -3,8 +3,6 @@ set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" -deps_file="$(realpath "./deps.nix")" - new_version="$(curl -s "https://api.github.com/repos/jackett/jackett/releases?per_page=1" | jq -r '.[0].name')" old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" @@ -15,4 +13,4 @@ fi cd ../../.. update-source-version jackett "${new_version//v}" -$(nix-build -A jackett.fetch-deps --no-out-link) "$deps_file" +$(nix-build -A jackett.fetch-deps --no-out-link) diff --git a/pkgs/servers/jellyfin/update.sh b/pkgs/servers/jellyfin/update.sh index bbced42742c9..918b68940cad 100755 --- a/pkgs/servers/jellyfin/update.sh +++ b/pkgs/servers/jellyfin/update.sh @@ -11,10 +11,6 @@ if [[ "$currentVersion" == "$latestVersion" ]]; then exit 0 fi -pushd "$(dirname "${BASH_SOURCE[0]}")" -nugetDepsFile=$(realpath ./nuget-deps.nix) -popd - update-source-version jellyfin "$latestVersion" -$(nix-build . -A jellyfin.fetch-deps --no-out-link) "$nugetDepsFile" +$(nix-build . -A jellyfin.fetch-deps --no-out-link) diff --git a/pkgs/servers/monitoring/unpoller/default.nix b/pkgs/servers/monitoring/unpoller/default.nix index fc47453832ba..65d8b960781b 100644 --- a/pkgs/servers/monitoring/unpoller/default.nix +++ b/pkgs/servers/monitoring/unpoller/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "unpoller"; - version = "2.7.13"; + version = "2.7.14"; src = fetchFromGitHub { owner = "unpoller"; repo = "unpoller"; rev = "v${version}"; - hash = "sha256-X7ZolDmYXexmERiCUvzKqADpwT1W/pQcaIEwMzfSTR4="; + hash = "sha256-rIAqR13TKHv4i7n8s7QehFlU4C3z/Cgw8lQaKFZcCt0="; }; - vendorHash = "sha256-VkVU+1zX8ENmq7qY7NAEQtLyqc8UNwRQF2wU65B9vpE="; + vendorHash = "sha256-fPUwMQQK8D0FA/X4E0yFEIP2ZO0iwyVapYctGCKyMjk="; ldflags = [ "-w" "-s" diff --git a/pkgs/servers/nosql/eventstore/updater.sh b/pkgs/servers/nosql/eventstore/updater.sh index 85be2c8aa8cc..77c2f733e5f8 100755 --- a/pkgs/servers/nosql/eventstore/updater.sh +++ b/pkgs/servers/nosql/eventstore/updater.sh @@ -6,8 +6,6 @@ set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" -deps_file="$(realpath "./deps.nix")" - new_version="$(curl -s "https://api.github.com/repos/EventStore/EventStore/releases/latest" | jq -r '.name')" new_version="${new_version#oss-v}" old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" @@ -20,4 +18,4 @@ fi cd ../../../.. update-source-version eventstore "${new_version//v}" -$(nix-build -A eventstore.fetch-deps --no-out-link) "$deps_file" +$(nix-build -A eventstore.fetch-deps --no-out-link) diff --git a/pkgs/test/texlive/default.nix b/pkgs/test/texlive/default.nix index 754358cdf29d..cea3e621ebf7 100644 --- a/pkgs/test/texlive/default.nix +++ b/pkgs/test/texlive/default.nix @@ -1,4 +1,4 @@ -{ lib, runCommand, fetchurl, file, texlive, writeShellScript }: +{ lib, stdenv, runCommand, fetchurl, file, texlive, writeShellScript, writeText }: { @@ -210,4 +210,118 @@ mkdir "$out" ''; + # check that all binaries run successfully, in the following sense: + # (1) run --version, -v, --help, -h successfully; or + # (2) run --help, -h, or no argument with error code but show help text; or + # (3) run successfully on a test.tex or similar file + # we ignore the binaries that cannot be tested as above, and are either + # compiled binaries or trivial shell wrappers + binaries = let + # TODO known broken binaries + broken = [ "albatross" "arara" "bbl2bib" "bib2gls" "bibdoiadd" "bibmradd" "bibzbladd" "citeproc" "convbkmk" + "convertgls2bib" "ctan-o-mat" "ctanify" "ctanupload" "dtxgen" "ebong" "epspdftk" "exceltex" "gsx" "htcontext" + "installfont-tl" "kanji-fontmap-creator" "ketcindy" "latex-git-log" "latex2nemeth" "ltxfileinfo" "match_parens" + "pdfannotextractor" "purifyeps" "pythontex" "svn-multi" "texexec" "texosquery" "texosquery-jre5" + "texosquery-jre8" "texplate" "tlcockpit" "tlmgr" "tlshell" "ulqda" "xhlatex" ] + # texluajitc is seemingly outdated and broken on native Linux aarch64 + # some info at https://github.com/NixOS/nixpkgs/pull/239804#issuecomment-1609832232 + ++ lib.optional (with stdenv; isAarch64 && isLinux) "texluajitc"; + # (1) binaries requiring -v + shortVersion = [ "devnag" "diadia" "pmxchords" "ptex2pdf" "simpdftex" "ttf2afm" ]; + # (1) binaries requiring --help or -h + help = [ "arlatex" "bundledoc" "cachepic" "checklistings" "dvipos" "extractres" "fig4latex" "fragmaster" + "kpsewhere" "mendex" "pn2pdf" "psbook" "psnup" "psresize" "simpdftex" "tex2xindy" "texluac" "texluajitc" + "urlbst" "yplan" ]; + shortHelp = [ "adhocfilelist" "authorindex" "biburl2doi" "disdvi" "dvibook" "dviconcat" "getmapdl" "latex2man" + "lprsetup.sh" "pygmentex" ]; + # (2) binaries that return non-zero exit code even if correctly asked for help + ignoreExitCode = [ "authorindex" "dvibook" "dviconcat" "dvipos" "extractres" "fig4latex" "fragmaster" "latex2man" + "lprsetup.sh" "pdf2dsc" "psbook" "psnup" "psresize" "tex2xindy" "texluac" "texluajitc" ]; + # (2) binaries that print help on no argument, returning non-zero exit code + noArg = [ "a2ping" "bg5+latex" "bg5+pdflatex" "bg5latex" "bg5pdflatex" "cef5latex" "cef5pdflatex" "ceflatex" + "cefpdflatex" "cefslatex" "cefspdflatex" "chkdvifont" "dvi2fax" "dvipdf" "dvired" "dviselect" + "dvitodvi" "eps2eps" "epsffit" "findhyph" "gbklatex" "gbkpdflatex" "komkindex" "kpsepath" "listbib" + "listings-ext" "mag" "mathspic" "mf2pt1" "mk4ht" "mkt1font" "mkgrkindex" "musixflx" "pdf2ps" "pdftosrc" + "pdfxup" "pedigree" "pfb2pfa" "pfbtopfa" "pk2bm" "pphs" "prepmx" "ps2pk" "ps2pdf*" "ps2ps*" "psselect" "pstops" + "rubibtex" "rubikrotation" "sjislatex" "sjispdflatex" "srcredact" "t4ht" "tex4ht" "texdiff" "texdirflatten" + "texplate" "tie" "ttf2kotexfont" "ttfdump" "vlna" "vpl2ovp" "vpl2vpl" "yplan" ]; + # (3) binary requiring a .tex file + tex = [ "de-macro" "e2pall" "makeindex" "pslatex" "rumakeindex" "tpic2pdftex" "wordcount" ]; + # tricky binaries or scripts that are obviously working but are hard to test + # (e.g. because they expect user input no matter the arguments) + # (printafm comes from ghostscript, not texlive) + ignored = [ "dt2dv" "dv2dt" "dvi2tty" "dvidvi" "dvispc" "fontinst" "ht" "htlatex" "htmex" "httex" "httexi" + "htxelatex" "htxetex" "otp2ocp" "outocp" "pmxab" "printafm" ]; + testTex = writeText "test.tex" '' + \documentclass{article} + \begin{document} + A simple test file. + \end{document} + ''; + in + runCommand "texlive-test-binaries" { inherit testTex; } + '' + mkdir -p "$out" + export HOME="$(mktemp -d)" + declare -i binCount=0 ignoredCount=0 brokenCount=0 failedCount=0 + cp "$testTex" test.tex + + testBin () { + if [[ -z "$ignoreExitCode" ]] ; then + "$bin" $args >"$out/$base.log" 2>&1 + return $? + else + "$bin" $args >"$out/$base.log" 2>&1 + ret=$? + if ! grep -Ei '(Example:|Options:|Syntax:|Usage:|improper command|SYNOPSIS)' "$out/$base.log" >/dev/null ; then + echo "did not find usage info when running '$base''${args:+ $args}'" + return $ret + fi + fi + } + + for bin in ${texlive.combined.scheme-full}/bin/* ; do + base="''${bin##*/}" + args= + ignoreExitCode= + binCount=$((binCount + 1)) + case "$base" in + ${lib.concatStringsSep "|" ignored}) + ignoredCount=$((ignoredCount + 1)) + continue ;; + ${lib.concatStringsSep "|" broken}) + brokenCount=$((brokenCount + 1)) + continue ;; + ${lib.concatStringsSep "|" help}) + args=--help ;; + ${lib.concatStringsSep "|" shortHelp}) + args=-h ;; + ${lib.concatStringsSep "|" noArg}) + ;; + ${lib.concatStringsSep "|" tex}) + args=test.tex ;; + ${lib.concatStringsSep "|" shortVersion}) + args=-v ;; + pdf2dsc) + args='--help --help --help' ;; + typeoutfileinfo) + args=/dev/null ;; + *) + args=--version ;; + esac + + case "$base" in + ${lib.concatStringsSep "|" (ignoreExitCode ++ noArg)}) + ignoreExitCode=1 ;; + esac + + if testBin ; then : ; else # preserve exit code + echo "failed '$base''${args:+ $args}' (exit code: $?)" + failedCount=$((failedCount + 1)) + fi + done + + echo "tested $binCount binCount: $ignoredCount ignored, $brokenCount broken, $failedCount failed" + [[ $failedCount = 0 ]] + ''; } diff --git a/pkgs/tools/X11/opentabletdriver/update.sh b/pkgs/tools/X11/opentabletdriver/update.sh index 322350415e7a..665f5ac526aa 100755 --- a/pkgs/tools/X11/opentabletdriver/update.sh +++ b/pkgs/tools/X11/opentabletdriver/update.sh @@ -3,8 +3,6 @@ set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" -deps_file="$(realpath "./deps.nix")" - new_version="$(curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s "https://api.github.com/repos/OpenTabletDriver/OpenTabletDriver/releases" | jq -r 'map(select(.prerelease == false)) | .[0].tag_name' | cut -c2-)" old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" @@ -23,4 +21,4 @@ sed -i ./default.nix -re "s|\"$oldDebSha256\"|\"$newDebSha256\"|" pushd ../../../.. update-source-version opentabletdriver "$new_version" -$(nix-build -A opentabletdriver.fetch-deps --no-out-link) "$deps_file" +$(nix-build -A opentabletdriver.fetch-deps --no-out-link) diff --git a/pkgs/tools/admin/eksctl/default.nix b/pkgs/tools/admin/eksctl/default.nix index 269a0ae8fada..b5b62658656c 100644 --- a/pkgs/tools/admin/eksctl/default.nix +++ b/pkgs/tools/admin/eksctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "eksctl"; - version = "0.145.0"; + version = "0.146.0"; src = fetchFromGitHub { owner = "weaveworks"; repo = pname; rev = version; - hash = "sha256-kVkehU6QiT3aQRR15hHc5pGtlRL5fb8/0Df2PR4hvxk="; + hash = "sha256-428+Yjcj8oQhqjx2casRW85rkOcdslJpTM3LpRIy5YM="; }; - vendorHash = "sha256-pqA67TRXmnO7CV/QqwN6ngnS6u1gwKJFQYQtKHOGbMY="; + vendorHash = "sha256-n97M33CC1Wro8Stme6wn0NQNNtyy7UHGeSnO99HWkRg="; doCheck = false; diff --git a/pkgs/tools/admin/try/default.nix b/pkgs/tools/admin/try/default.nix new file mode 100644 index 000000000000..e44f92d1002b --- /dev/null +++ b/pkgs/tools/admin/try/default.nix @@ -0,0 +1,25 @@ +{ stdenvNoCC, lib, fetchFromGitHub, fuse-overlayfs, util-linux, makeWrapper }: +stdenvNoCC.mkDerivation rec { + pname = "try"; + version = "0.1.0"; + src = fetchFromGitHub { + owner = "binpash"; + repo = pname; + rev = "v${version}"; + hash = "sha256-TTKr22FwXfPL/YrFT+r12nFSxbk/47N6rrb3Vw/lSPI="; + }; + nativeBuildInputs = [ makeWrapper ]; + installPhase = '' + runHook preInstall + install -Dt $out/bin try + wrapProgram $out/bin/try --prefix PATH : ${lib.makeBinPath [ fuse-overlayfs util-linux ]} + runHook postInstall + ''; + meta = with lib;{ + homepage = "https://github/binpash/try"; + description = "Lets you run a command and inspect its effects before changing your live system"; + maintainers = with maintainers; [ pasqui23 ]; + license = with licenses; [ mit ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/backup/awsbck/default.nix b/pkgs/tools/backup/awsbck/default.nix new file mode 100644 index 000000000000..6d4bacb7902f --- /dev/null +++ b/pkgs/tools/backup/awsbck/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, installShellFiles +, Security +}: + +rustPlatform.buildRustPackage rec { + pname = "awsbck"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "beeb"; + repo = "awsbck"; + rev = "v${version}"; + hash = "sha256-4iFPHMCWKOfwqdjCLQqWHSs5SwXi+K2sQu75ecsolSs="; + }; + + nativeBuildInputs = [ installShellFiles ]; + + buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + + cargoSha256 = "sha256-GH7ybr9ncbcvtyYCmYrG1aSA3lc+qmqivAbNVVqpMPQ="; + + doCheck = false; + + meta = with lib; { + description = "Backup a folder to AWS S3, once or periodically"; + homepage = "https://github.com/beeb/awsbck"; + license = with licenses; [ mit asl20 ]; + maintainers = with maintainers; [ beeb ]; + }; +} diff --git a/pkgs/tools/backup/discordchatexporter-cli/updater.sh b/pkgs/tools/backup/discordchatexporter-cli/updater.sh index 6628cceaa958..cc81761b93d9 100755 --- a/pkgs/tools/backup/discordchatexporter-cli/updater.sh +++ b/pkgs/tools/backup/discordchatexporter-cli/updater.sh @@ -3,8 +3,6 @@ set -eo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" -deps_file="$(realpath "./deps.nix")" - new_version="$(curl -s "https://api.github.com/repos/tyrrrz/DiscordChatExporter/releases?per_page=1" | jq -r '.[0].name')" old_version="$(sed -nE 's/\s*version = "(.*)".*/\1/p' ./default.nix)" if [[ "$new_version" == "$old_version" ]]; then @@ -14,4 +12,4 @@ fi cd ../../../.. update-source-version discordchatexporter-cli "$new_version" -$(nix-build -A discordchatexporter-cli.fetch-deps --no-out-link) "$deps_file" +$(nix-build -A discordchatexporter-cli.fetch-deps --no-out-link) diff --git a/pkgs/tools/misc/depotdownloader/update.sh b/pkgs/tools/misc/depotdownloader/update.sh index 9e6efdfceaa5..2adbb6037a9d 100755 --- a/pkgs/tools/misc/depotdownloader/update.sh +++ b/pkgs/tools/misc/depotdownloader/update.sh @@ -3,7 +3,6 @@ set -eou pipefail -depsFile="$(realpath "$(dirname "${BASH_SOURCE[0]}")/deps.nix")" currentVersion="$(nix eval --raw -f . depotdownloader.version)" latestVersion="$(curl -s ${GITHUB_TOKEN:+-u ":$GITHUB_TOKEN"} "https://api.github.com/repos/SteamRE/DepotDownloader/releases?per_page=1" \ | jq -r '.[].name' | cut -d' ' -f2)" @@ -14,4 +13,4 @@ if [[ "$currentVersion" = "$latestVersion" ]]; then fi update-source-version depotdownloader "$latestVersion" -$(nix-build -A depotdownloader.fetch-deps --no-out-link) "$depsFile" +$(nix-build -A depotdownloader.fetch-deps --no-out-link) diff --git a/pkgs/tools/misc/fclones/gui.nix b/pkgs/tools/misc/fclones/gui.nix index 2652b674e39b..7b2d063d45b7 100644 --- a/pkgs/tools/misc/fclones/gui.nix +++ b/pkgs/tools/misc/fclones/gui.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "fclones-gui"; - version = "0.1.4"; + version = "0.2.0"; src = fetchFromGitHub { owner = "pkolaczk"; repo = "fclones-gui"; rev = "v${version}"; - hash = "sha256-zJ5TqFmvUL1nKR8E+jGR4K6OGHJ4ckRky+bdKW0T30s="; + hash = "sha256-ad7wyoCjSQ8i6c+4IorImqAY2Q6pwBtI2JkkbkGa46U="; }; - cargoHash = "sha256-QT4ZxjarPkEqJLKPsGAaMIaSUmKWZ1xtxWMe2uXaUek="; + cargoHash = "sha256-7+I0Tj+DcrItU2apB1iMiYiTv9AeDparke86HkJNF3A="; nativeBuildInputs = [ pkg-config @@ -36,6 +36,15 @@ rustPlatform.buildRustPackage rec { darwin.apple_sdk_11_0.frameworks.IOKit ]; + postInstall = '' + substituteInPlace snap/gui/fclones-gui.desktop \ + --replace Exec=fclones-gui Exec=$out/bin/fclones-gui \ + --replace 'Icon=''${SNAP}/meta/gui/fclones-gui.png' Icon=fclones-gui + + install -Dm444 snap/gui/fclones-gui.desktop -t $out/share/applications + install -Dm444 snap/gui/fclones-gui.png -t $out/share/pixmaps + ''; + meta = with lib; { description = "Interactive duplicate file remover"; homepage = "https://github.com/pkolaczk/fclones-gui"; diff --git a/pkgs/tools/security/jsluice/default.nix b/pkgs/tools/security/jsluice/default.nix new file mode 100644 index 000000000000..18a386c94b0d --- /dev/null +++ b/pkgs/tools/security/jsluice/default.nix @@ -0,0 +1,30 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "jsluice"; + version = "unstable-2023-06-23"; + + src = fetchFromGitHub { + owner = "BishopFox"; + repo = "jsluice"; + rev = "f10429e1016a9573da0157eacde8f7feb9deb8c7"; + hash = "sha256-l9rwC1ljtt7Q+FYKdQFhtnLJDS8OwMJXIIpZgya0zwU="; + }; + + vendorHash = "sha256-u4E+b/vChXArovtaZ4LODaINWit86i5K4GyHLR0JSyU="; + + ldflags = [ + "-s" + "-w" + ]; + + meta = with lib; { + description = "Tool for extracting URLs, paths, secrets, and other data from JavaScript source code"; + homepage = "https://github.com/BishopFox/jsluice"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/zmap/cmake-json-0.14-fix.patch b/pkgs/tools/security/zmap/cmake-json-0.14-fix.patch deleted file mode 100644 index 1c132948af6a..000000000000 --- a/pkgs/tools/security/zmap/cmake-json-0.14-fix.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 8bd825f..694d9b2 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -72,6 +72,8 @@ if(WITH_JSON) - endif() - - add_definitions("-DJSON") -+ # JSON_CFLAGS is a list, i.e. semicolon-separated, convert it to space-separated -+ string(REPLACE ";" " " JSON_CFLAGS "${JSON_CFLAGS}") - set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${JSON_CFLAGS}") - endif() - diff --git a/pkgs/tools/security/zmap/default.nix b/pkgs/tools/security/zmap/default.nix index 0e37b725db49..de1bc354cf62 100644 --- a/pkgs/tools/security/zmap/default.nix +++ b/pkgs/tools/security/zmap/default.nix @@ -1,28 +1,22 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, libjson, json_c, gengetopt, flex, byacc, gmp -, libpcap +, libpcap, libunistring }: stdenv.mkDerivation rec { pname = "zmap"; - version = "2.1.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "zmap"; repo = pname; rev = "v${version}"; - sha256 = "0yaahaiawkjk020hvsb8pndbrk8k10wxkfba1irp12a4sj6rywcs"; + sha256 = "sha256-OJZKcnsuBi3z/AI05RMBitgn01bhVTqx2jFYJLuIJk4="; }; - patches = [ - # fix build with json-c 0.14 https://github.com/zmap/zmap/pull/609 - ./cmake-json-0.14-fix.patch - ]; - cmakeFlags = [ "-DRESPECT_INSTALL_PREFIX_CONFIG=ON" ]; - dontUseCmakeBuildDir = true; nativeBuildInputs = [ cmake pkg-config gengetopt flex byacc ]; - buildInputs = [ libjson json_c gmp libpcap ]; + buildInputs = [ libjson json_c gmp libpcap libunistring ]; outputs = [ "out" "man" ]; diff --git a/pkgs/tools/system/automatic-timezoned/default.nix b/pkgs/tools/system/automatic-timezoned/default.nix index 2d44f726de84..b4f702e6e123 100644 --- a/pkgs/tools/system/automatic-timezoned/default.nix +++ b/pkgs/tools/system/automatic-timezoned/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "automatic-timezoned"; - version = "1.0.100"; + version = "1.0.102"; src = fetchFromGitHub { owner = "maxbrunet"; repo = pname; rev = "v${version}"; - sha256 = "sha256-RyfUJJ4XgC8mNss4mPMxogQ4nL1uvPwDisVPtgF6+OU="; + sha256 = "sha256-4iHQ6mYG6DZa5RYPHW791J9kFqMDM9W+T3ufOg43u5g="; }; - cargoHash = "sha256-Dp8UUMWAOYdNAljktrMHpPxTIPDCY/VPWA33kzZNCuc="; + cargoHash = "sha256-i98kWlkaijWNVycbkqrjo4GrQPz8wmZTO3vQaqukCuI="; meta = with lib; { description = "Automatically update system timezone based on location"; diff --git a/pkgs/tools/virtualization/jumppad/default.nix b/pkgs/tools/virtualization/jumppad/default.nix index 1742e2d95835..85cfab585746 100644 --- a/pkgs/tools/virtualization/jumppad/default.nix +++ b/pkgs/tools/virtualization/jumppad/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "jumppad"; - version = "0.5.27"; + version = "0.5.28"; src = fetchFromGitHub { owner = "jumppad-labs"; repo = pname; rev = "v${version}"; - hash = "sha256-WTywuQ1sl5zKpwUYyHFb+eTRxlUUDWFIrmhsPDB+iyc="; + hash = "sha256-j1m95RiT4cymSK9PuJuNc+ixia4DNj+8lZ0KloB+kWo="; }; vendorHash = "sha256-OtixGeQY1wPqs3WU6gKvrzEgxnMORxr4BWCpn/VYxRc="; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0501024e5172..45c9ba6b080b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1551,6 +1551,10 @@ with pkgs; asleap = callPackage ../tools/networking/asleap { }; + awsbck = callPackage ../tools/backup/awsbck { + inherit (darwin.apple_sdk.frameworks) Security; + }; + balena-cli = callPackage ../tools/admin/balena-cli { }; basez = callPackage ../tools/misc/basez { }; @@ -9155,6 +9159,8 @@ with pkgs; jsduck = callPackage ../development/tools/jsduck { }; + jsluice = callPackage ../tools/security/jsluice { }; + json-schema-for-humans = with python3Packages; toPythonApplication json-schema-for-humans; jsonfmt = callPackage ../development/tools/misc/jsonfmt { }; @@ -37604,6 +37610,8 @@ with pkgs; trackballs = callPackage ../games/trackballs { }; + try = callPackage ../tools/admin/try { }; + tumiki-fighters = callPackage ../games/tumiki-fighters { }; tuxpaint = callPackage ../games/tuxpaint { }; @@ -40449,6 +40457,7 @@ with pkgs; winePackages = recurseIntoAttrs (winePackagesFor (config.wine.build or "wine32")); wine64Packages = recurseIntoAttrs (winePackagesFor "wine64"); wineWowPackages = recurseIntoAttrs (winePackagesFor "wineWow"); + wineWow64Packages = recurseIntoAttrs (winePackagesFor "wineWow64"); wine = winePackages.full; wine64 = wine64Packages.full; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9a1750fc924b..71b66cd0b074 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5846,6 +5846,8 @@ self: super: with self; { lima = callPackage ../development/python-modules/lima { }; + lime = callPackage ../development/python-modules/lime { }; + limiter= callPackage ../development/python-modules/limiter { }; limitlessled = callPackage ../development/python-modules/limitlessled { }; @@ -6145,6 +6147,8 @@ self: super: with self; { matplotlib-inline = callPackage ../development/python-modules/matplotlib-inline { }; + matplotlib-sixel = callPackage ../development/python-modules/matplotlib-sixel { }; + matplotx = callPackage ../development/python-modules/matplotx { }; matrix-api-async = callPackage ../development/python-modules/matrix-api-async { };