diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2024-01-24 00:13:15 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-01-24 00:13:15 +0000 |
commit | 796d5dd60c6fa1a9b6bb6a0e0ae5dcdde50b4e27 (patch) | |
tree | 58d4561d436f7c9d0dfa264eab89689b89764d83 /pkgs/development | |
parent | c0e251a92cec2b25301e5fd03bc8a515f8de8afc (diff) | |
parent | e81467f581f3283171e58bde727a2d8aa10647b8 (diff) | |
download | nixlib-796d5dd60c6fa1a9b6bb6a0e0ae5dcdde50b4e27.tar nixlib-796d5dd60c6fa1a9b6bb6a0e0ae5dcdde50b4e27.tar.gz nixlib-796d5dd60c6fa1a9b6bb6a0e0ae5dcdde50b4e27.tar.bz2 nixlib-796d5dd60c6fa1a9b6bb6a0e0ae5dcdde50b4e27.tar.lz nixlib-796d5dd60c6fa1a9b6bb6a0e0ae5dcdde50b4e27.tar.xz nixlib-796d5dd60c6fa1a9b6bb6a0e0ae5dcdde50b4e27.tar.zst nixlib-796d5dd60c6fa1a9b6bb6a0e0ae5dcdde50b4e27.zip |
Merge master into haskell-updates
Diffstat (limited to 'pkgs/development')
43 files changed, 708 insertions, 264 deletions
diff --git a/pkgs/development/compilers/chicken/5/deps.toml b/pkgs/development/compilers/chicken/5/deps.toml index 4a6a39ce7185..743da0b0cfe4 100644 --- a/pkgs/development/compilers/chicken/5/deps.toml +++ b/pkgs/development/compilers/chicken/5/deps.toml @@ -2,16 +2,16 @@ [7off] dependencies = ["anaphora", "define-options", "lowdown", "matchable", "srfi-1", "sxml-transforms", "sxpath", "utf8", "srfi-42", "srfi-69", "strse", "uri-common"] license = "agpl" -sha256 = "01dp84dnvvvg26k27bwh8m64qss5jqy8iifykaymz3brragg3406" +sha256 = "0hsqxva92k3yasrlgl7bbq3z3d2d2nd3r3i2v6vimv7mp2chfkdr" synopsis = "Markdown to Gemini text" -version = "1.30" +version = "1.31" [F-operator] -dependencies = ["utf8", "miscmacros", "datatype", "box"] +dependencies = ["miscmacros", "datatype", "box"] license = "bsd" -sha256 = "1zhfvcv8628s9sria1i63sdp88h5gpm96iv023qvm07g9z9qv5dv" +sha256 = "0i7yfc8pxszvsgls871s2bwy11yxyxr4sqbl8gc21g29xm7vjivq" synopsis = "Shift/Reset Control Operators" -version = "4.1.3" +version = "4.1.4" [abnf] dependencies = ["srfi-1", "utf8", "lexgen"] @@ -79,9 +79,9 @@ version = "3.0.0" [amb] dependencies = ["srfi-1"] license = "bsd" -sha256 = "1kkzmbym1xhgxby9grjamjs3yajz5l32v3wg2b6xsl7v0infkszs" +sha256 = "0ggwmsd4igg099ikn5qja5nkqmrnsw0byyk3q9y04ygvzalqyb36" synopsis = "The non-deterministic backtracking ambivalence operator" -version = "3.0.8" +version = "3.0.9" [amqp] dependencies = ["bitstring", "mailbox", "srfi-18", "uri-generic"] @@ -146,6 +146,13 @@ sha256 = "1yq819vbb813svxvxad4h99vrhvf7rs8cv9dsnj85rcvi60w7299" synopsis = "Automatically compile Scheme scripts on demand" version = "1.1.0" +[awful-main] +dependencies = ["awful", "spiffy", "define-options"] +license = "bsd" +sha256 = "1zpnk3xjkn2pdfw953ximq6i0d3v3mak8ydl6a3nb2zz1daq7044" +synopsis = "Turn awful web applications into static executables" +version = "0.1.0" + [awful-path-matchers] dependencies = [] license = "bsd" @@ -254,9 +261,9 @@ version = "0.4.1" [binary-search] dependencies = [] license = "bsd" -sha256 = "1r3a5387knvg29hp3pn0xs5zzql6g7pkjzl2h6b0ds8gsyqf65b7" +sha256 = "0hycs33782xvcc4p0jl2a716fi388v8vbvf9isgrnl9ahqnk9kia" synopsis = "Binary search algorithm" -version = "0.1" +version = "0.2" [bind] dependencies = ["silex", "matchable", "coops", "srfi-1", "regex"] @@ -345,16 +352,16 @@ version = "0.11" [brev-separate] dependencies = ["matchable", "miscmacros", "srfi-1", "srfi-69"] license = "bsd-1-clause" -sha256 = "12pl79bfgii9d7kg30qlk94ag0rm0ca4zr4nc95spiva4p8j6ixx" +sha256 = "0ycm95vcf1dj6m3kqii7b2a5kxyd1m6lzksz77ispay14srgw8rd" synopsis = "Hodge podge of macros and combinators" -version = "1.92" +version = "1.95" [brev] dependencies = ["anaphora", "brev-separate", "clojurian", "combinators", "define-options", "dwim-sort", "fix-me-now", "acetone", "html-parser", "match-generics", "http-client", "matchable", "miscmacros", "scsh-process", "sequences", "srfi-1", "srfi-42", "srfi-69", "strse", "sxml-serializer", "sxml-transforms", "sxpath", "tree", "uri-common"] license = "public-domain" -sha256 = "0ddf3j3lxv35kgnrzi9lq6ckn1sj149nr0nckj8ghqvfzkqa9flw" +sha256 = "1kbphbz21rlrsfcfqg77hm1vv7wh9z1gcwh5lb2hlrqp2yl7m7yc" synopsis = "A huge pile of batteries and shortcuts" -version = "1.37" +version = "1.41" [byte-blob] dependencies = ["srfi-1"] @@ -415,9 +422,9 @@ version = "0.4" [check-errors] dependencies = [] license = "bsd" -sha256 = "1ra8pvs0qnfqsjbrsn0k94drwx5ydvhapziv6dcqcb118iimnrmd" +sha256 = "09ffyffrv3gamjsjgbisn3yxb40wbqy5pfrs6dxw20n1ffimgfw5" synopsis = "Argument checks & errors" -version = "3.7.1" +version = "3.8.0" [checks] dependencies = ["simple-exceptions"] @@ -436,9 +443,9 @@ version = "0.1.3" [chickadee] dependencies = ["matchable", "uri-common", "uri-generic", "intarweb", "simple-sha1", "spiffy", "spiffy-request-vars", "sxml-transforms", "chicken-doc", "chicken-doc-admin", "chicken-doc-html", "srfi-18"] license = "bsd" -sha256 = "02wrg3s1hx5slbx0vmg1zmknchwksxxw75yld1nyqxf5wyv2dibj" +sha256 = "0blbxy2l7kii85glczrxrqc8n7794qxswq67v0vl6hxajwij197i" synopsis = "chicken-doc web server" -version = "0.12.1" +version = "0.12.2" [chicken-belt] dependencies = ["matchable", "srfi-1", "srfi-13"] @@ -524,6 +531,13 @@ sha256 = "1rxyr6di07zqfjzbb0kgdx43m2b1zpjrkaph8x078jgqawyblc6v" synopsis = "A chicken wrapper for cmark with markdown to sxml capabilities" version = "0.1.0" +[coin-change] +dependencies = ["srfi-1"] +license = "unlicense" +sha256 = "09p83afsh2dx4y2cpyi55bf2br03ysdpq9xrqik7fmks3913kxmk" +synopsis = "Greedy solver for the coin change problem" +version = "1.0.2" + [color] dependencies = ["fmt", "records", "srfi-13"] license = "bsd" @@ -632,9 +646,9 @@ version = "1.4" [csm] dependencies = ["matchable", "srfi-1", "srfi-13", "srfi-14", "miscmacros"] license = "bsd" -sha256 = "0rfysqqxn92asa6wd1dnzc372982nsr81ay7i7x1cn62bw5gs1pl" +sha256 = "1bvawrbslsfzxlhal5abyss0nj0jddqbs5ran58nygfc1myn3vfs" synopsis = "a build system" -version = "0.4" +version = "0.5" [cst] dependencies = ["brev-separate", "srfi-1", "define-options", "match-generics"] @@ -693,11 +707,11 @@ synopsis = "explicitly implicit renaming" version = "1.2" [define-options] -dependencies = ["tree", "brev-separate", "getopt-long", "srfi-1"] +dependencies = ["brev-separate", "getopt-long", "matchable", "quasiwalk", "srfi-1"] license = "lgpl" -sha256 = "03l46ma7d1yy5c8b4b71bwr0vhd0h3w57b3wr25bawk10ngr2qn6" +sha256 = "1j9lj5kj3j8jhclxnxrrc2wn6qn9j0bhr2y9fydg05an9q7jmrh0" synopsis = "Conveniently bind to getopt-long options" -version = "1.7" +version = "1.23" [define-record-and-printer] dependencies = ["hahn", "matchable"] @@ -1043,11 +1057,11 @@ synopsis = "Client library for the gemini:// protocol" version = "0.2.1" [geminih] -dependencies = ["clojurian", "acetone", "anaphora", "strse", "match-generics", "brev-separate", "srfi-1"] +dependencies = ["clojurian", "acetone", "anaphora", "html-parser", "strse", "match-generics", "brev-separate", "srfi-1"] license = "bsd-1-clause" -sha256 = "158jprg7y49avv4wnbmp2i0zxw1vwk2am8nfb7nc603rhrc0xism" +sha256 = "1i2nmzk61szkpg0a2r4i6gx00hnj78b3dqkk34y349h29dm2jv56" synopsis = "Gemtext to SXML" -version = "1.10" +version = "1.13" [gemrefinder] dependencies = ["scsh-process", "srfi-1", "srfi-42", "define-options", "combinators", "brev-separate", "match-generics", "strse"] @@ -1094,9 +1108,9 @@ version = "1.21" [getopt-utils] dependencies = ["utf8", "srfi-1", "getopt-long"] license = "bsd" -sha256 = "0jbzv8s0b3pnlqzl4vls0fssw56ivz1g9afdj90kxaxlxv1b1l0k" +sha256 = "0i17fj29zbbm05x68h7fy524ypk8vbr62gq6jkrwf18371l0l767" synopsis = "Utilities for getopt-long" -version = "1.1.0" +version = "1.1.1" [git] dependencies = ["srfi-69", "foreigners", "module-declarations", "srfi-1"] @@ -1353,9 +1367,9 @@ version = "1.2" [intarweb] dependencies = ["srfi-1", "srfi-13", "srfi-14", "defstruct", "uri-common", "base64"] license = "bsd" -sha256 = "1vpdrbrmjsdbl4cb3c82iqcvyn9318jzapg6bl00dkbn6ykyisr3" +sha256 = "0khzz6w8dh8sbiaqw3b68p0v8lv4bjwxipkb9cqj2q9r7zl84555" synopsis = "A more convenient HTTP library" -version = "2.0.3" +version = "2.1.0" [integer-map] dependencies = ["srfi-1", "srfi-128", "srfi-143", "srfi-158"] @@ -1388,9 +1402,9 @@ version = "0.2" [ioctl] dependencies = ["foreigners"] license = "bsd" -sha256 = "1knyb80hm9l3j2cw71i5j73vjhw0g5l4vyyjyp1h5j6fwnsywpfb" +sha256 = "0qs2daw16zw4jpqnb0q2nnb0qanki7nl0k437b9m4a7qslhdqw6r" synopsis = "ioctl system call interface" -version = "0.3" +version = "0.4" [ipfs] dependencies = ["http-client", "intarweb", "medea", "srfi-1", "srfi-13", "srfi-189", "srfi-197", "uri-common"] @@ -1449,11 +1463,11 @@ synopsis = "Parser combinators for JavaScript Object Notation (JSON)." version = "7.0" [json-rpc] -dependencies = ["r7rs", "srfi-1", "srfi-18", "srfi-69", "srfi-180"] +dependencies = ["r7rs", "srfi-1", "srfi-18", "srfi-69", "srfi-180", "utf8"] license = "mit" -sha256 = "09ydq35aaap14vxw0533mnxvqq9c8yir1dc7bn61q4l7vzfl44k8" +sha256 = "10f2iw93fhc0vha6axqzd27akh0ys7a6q0vwhpl0jzw4s48h3ss3" synopsis = "A JSON RPC library for R7RS scheme." -version = "0.4.2" +version = "0.4.5a" [json-utils] dependencies = ["utf8", "srfi-1", "srfi-69", "vector-lib", "miscmacros", "moremacros"] @@ -1528,9 +1542,9 @@ version = "1.2" [levenshtein] dependencies = ["srfi-1", "srfi-13", "srfi-63", "srfi-69", "vector-lib", "utf8", "miscmacros", "record-variants", "check-errors"] license = "bsd" -sha256 = "1v8g5ghilraz2lx0fif3yb1rlg3n51zvvik2l12ycqh0wj0pz59l" +sha256 = "07jwz006c6yhibg7d9nb35rif04810820pss5mg7c7mbn2nzmq1q" synopsis = "Levenshtein edit distance" -version = "2.2.8" +version = "2.4.0" [lexgen] dependencies = ["srfi-1", "utf8", "srfi-127"] @@ -1624,11 +1638,11 @@ synopsis = "A pure Chicken Markdown parser" version = "3" [lsp-server] -dependencies = ["apropos", "chicken-doc", "json-rpc", "nrepl", "r7rs", "srfi-1", "srfi-130", "srfi-133", "srfi-18", "srfi-69", "uri-generic", "utf8"] +dependencies = ["apropos", "chicken-doc", "json-rpc", "nrepl", "r7rs", "srfi-1", "srfi-18", "srfi-69", "srfi-130", "srfi-133", "srfi-180", "uri-generic", "utf8"] license = "mit" -sha256 = "0wbigf0s37377hjfxspwydhvnds165mhp2qa14iskvsw5zbp8g80" +sha256 = "09fak8d29qmxynh4361prhfg971j74mha6pw311a6kmz88h9zp0h" synopsis = "LSP Server for CHICKEN." -version = "0.4.1" +version = "0.4.4" [macaw] dependencies = [] @@ -1654,9 +1668,9 @@ version = "3.3.10" [make-tests] dependencies = ["brev-separate", "srfi-1", "uri-common"] license = "public-domain" -sha256 = "0ca8fx40x42zqqsp3dmw5cb9xsjlz4cp71yh9kgcb29n4ig80r97" +sha256 = "174nbjy27iiz29g906p9rsg036mgwjnl7ll0qc2clqzq1svkgqc7" synopsis = "Create unit tests from a file of expressions" -version = "1.10" +version = "1.12" [make] dependencies = ["srfi-1"] @@ -1682,9 +1696,9 @@ version = "0.3.1" [match-generics] dependencies = ["brev-separate", "matchable", "quasiwalk", "srfi-1"] license = "bsd-1-clause" -sha256 = "07ssmsa52ixwn5wj8b11a0adglyxycf2f7qkkfrwwikalwpvnwdp" +sha256 = "1js4kq8hp6n8182mzyrs7q7aa6hf9q5y8q3zp2lkplpp862x2sks" synopsis = "matchable generics" -version = "2.4" +version = "2.8" [matchable] dependencies = [] @@ -1827,11 +1841,11 @@ synopsis = "Various helper macros" version = "1.0" [mistie] -dependencies = [] +dependencies = ["srfi-1"] license = "bsd" -sha256 = "0j5cqkqqfmq3g0brws02vsvn7c68rdw4k0i17gm7pbsjwjb6qggw" +sha256 = "0qfz8zc41wm2afwwbg1c8gmpzlph07nsj4r86lx01af9s03nvpfa" synopsis = "A programmable filter" -version = "1.6" +version = "1.9" [modular-arithmetic] dependencies = ["srfi-1", "matchable"] @@ -1868,6 +1882,13 @@ sha256 = "09kc4wmhwkdhspk8g0i357qdq9mp1xcalgnqi8z9yasfy2k6gk1h" synopsis = "More miscellaneous macros" version = "2.5.0" +[mosquitto] +dependencies = ["srfi-1"] +license = "mit" +sha256 = "0v03hljm71hl6xr1pffzcpk2izil9w2sp9k68a7iirvpcvqg9iph" +synopsis = "Bindings to mosquitto MQTT client library" +version = "0.1.3" + [mpd-client] dependencies = ["regex", "srfi-1"] license = "bsd" @@ -1903,6 +1924,13 @@ sha256 = "01ma6cxmbc0bmk4598q3ag28pnbqlmcfq11mbs4c87ir82bkvz7h" synopsis = "" version = "1.0.0.6" +[nanosleep] +dependencies = [] +license = "bsd" +sha256 = "1nynvd6sv8ffxk0jlvr77mgm0r1rww4c1n5k5m799b36w4gs6df9" +synopsis = "Interface to POSIX nanosleep" +version = "0.3.0" + [natural-sort] dependencies = [] license = "mit" @@ -1976,9 +2004,9 @@ version = "1.21" [openssl] dependencies = ["srfi-1", "srfi-13", "srfi-18", "address-info"] license = "bsd" -sha256 = "06bj8jqmfk9vlwny5w53bfrahv9wdbxvqyqijxvhmzy8z0p3slx0" +sha256 = "018x80cxs7glvqn7nhjcfbvw36bn3pf4y24a6cn7mz25z6597vg0" synopsis = "Bindings to the OpenSSL SSL/TLS library" -version = "2.2.4" +version = "2.2.5" [operations] dependencies = ["srfi-1"] @@ -2403,9 +2431,9 @@ version = "1.7.1" [salmonella] dependencies = [] license = "bsd" -sha256 = "1xr01d9ax106c5q3xx0lj92q24jqiywasamimpzvda4b17bb34n5" +sha256 = "1r60dlr1qcjlirbwqpn23aphczlkhrhskgqmw51973w46ww839nf" synopsis = "A tool for testing eggs" -version = "3.0.1" +version = "3.1.1" [salt] dependencies = ["datatype", "matchable", "make", "mathh", "lalr", "datatype", "unitconv", "fmt"] @@ -2435,6 +2463,13 @@ sha256 = "03nn90fi18gn29vxvslyi5zxhl5hx2m7f7ikfy9a3ypnkw1bh8qk" synopsis = "Tools for Scheme development" version = "0.3.2" +[scheme-indent] +dependencies = ["srfi-1"] +license = "bsd" +sha256 = "0brwmphr724shd32dcixsn9wz9zqrhg27g7rjbiz96885maj6nwf" +synopsis = "A Scheme code indenter" +version = "0.5" + [scheme2c-compatibility] dependencies = ["srfi-1", "srfi-13", "srfi-14", "traversal", "foreigners", "xlib"] license = "lgpl" @@ -2508,9 +2543,9 @@ version = "0.0.13" [sendfile] dependencies = ["memory-mapped-files"] license = "bsd" -sha256 = "00fnmx6frrvms7s61in2jmfp852rif8nlh3akv1wrn3xm6i7gsyw" +sha256 = "1vi5i8df146j2gh4x7s8fry0bdzfm57f7v62zd5sd0x45h72lffw" synopsis = "Sending a file over the network" -version = "1.9.1" +version = "2.0" [sequences-utils] dependencies = ["srfi-1", "srfi-69", "sequences"] @@ -2596,6 +2631,13 @@ sha256 = "0phsfz2263yiy9z33sf7qjf4i8kh51n5yf1g2wmb0pb63vcdqy8n" synopsis = "Some user-friendly exception routines" version = "1.3.1" +[simple-logger] +dependencies = [] +license = "bsd" +sha256 = "05d9fjn6m9m8c4n2blig844vhv9cp1rmyrcxnkzxfxxiw9y4wfhf" +synopsis = "A very simple logger" +version = "1.0.0" + [simple-loops] dependencies = [] license = "bsd" @@ -2795,9 +2837,9 @@ version = "0.2" [sql-de-lite] dependencies = ["foreigners", "object-evict", "srfi-1", "srfi-18", "srfi-69"] license = "bsd" -sha256 = "06pr2b0ix5f27cd3ymxbbihdng3n9i9a22dr2g0dlp3ks6i174g3" +sha256 = "1vx7j1y6b1wkhf3wn3bgf62a3zn3wk9clcygn80k4cjpma2p8ig5" synopsis = "SQLite 3 interface" -version = "0.10.0" +version = "0.10.1" [sql-null] dependencies = [] @@ -2849,11 +2891,11 @@ synopsis = "SRFI-111: Boxes" version = "0.5" [srfi-113] -dependencies = ["srfi-69", "srfi-128"] +dependencies = ["r7rs", "srfi-69", "srfi-128"] license = "bsd" -sha256 = "1psipd38r5jwb4l2q7rxj5yjq3zmisqnmqq64dqx1nxhhbh01wrw" +sha256 = "0ripxgwfwizj9mzb04lsbvavvy7qima81cyqm830j59sixj6ldc2" synopsis = "SRFI-113: Sets and Bags" -version = "1.1" +version = "1.2.0" [srfi-115] dependencies = ["srfi-14", "srfi-152"] @@ -3124,9 +3166,9 @@ version = "2.0.0" [srfi-209] dependencies = ["srfi-1", "srfi-69", "srfi-113", "srfi-128", "srfi-178", "typed-records"] license = "mit" -sha256 = "0dphpi92afn569pgi3jfwdxm7h63nd0s9s42f5m106wfkf79si9r" +sha256 = "04fghjk0rfcz0fp71dvwvlxmxshrbmrs85g4l5cx8sp74y047qlv" synopsis = "SRFI 209: Enums and enum sets" -version = "1.2.2" +version = "1.3.1" [srfi-216] dependencies = ["srfi-18"] @@ -3173,9 +3215,9 @@ version = "4.2.3" [srfi-29] dependencies = ["srfi-1", "srfi-69", "utf8", "locale", "posix-utils", "condition-utils", "check-errors"] license = "bsd" -sha256 = "15g2knq5b76f3nhxnmxidhkvbw9dyyc00hrzvsnpkmnfqzcmxbxw" +sha256 = "1pz31xrfja4y43ci5n8gplhdnasbyxx0kwlmcjzycs1js4b66ld1" synopsis = "Localization" -version = "3.0.7" +version = "3.0.8" [srfi-34] dependencies = [] @@ -3432,9 +3474,9 @@ version = "2.7.3" [strse] dependencies = ["matchable", "srfi-13", "miscmacros"] license = "bsd-1-clause" -sha256 = "0gmc7pzhhs964swgq709j89z9lkydy1y267lbw0mza949h6dx5fv" +sha256 = "1abwb27l8ms7cwdc03wfa51jdqngjdfxdfayjynsvbhw5hp4rxmf" synopsis = "A string DSL" -version = "1.38" +version = "1.39" [stty] dependencies = ["foreigners", "srfi-69"] @@ -3635,9 +3677,9 @@ version = "2.4.2" [tiny-prolog] dependencies = ["srfi-69"] license = "bsd" -sha256 = "0bw1l5vsyw2z3yvv6zlgvzk1hlm16ql6m8gdfd94fk691pvjpnd0" +sha256 = "0zz468zvr7v1dh2sg48kmlq43dbim66md3dv2dchdpzfjg378w8k" synopsis = "Tiny PROLOG interpreter." -version = "2.0" +version = "2.1" [tokyocabinet] dependencies = [] @@ -3668,18 +3710,18 @@ synopsis = "tracing and breakpoints" version = "2.0" [transducers] -dependencies = ["srfi-1", "srfi-128", "srfi-133", "srfi-143", "srfi-146", "srfi-160", "check-errors", "r7rs"] +dependencies = ["r7rs", "srfi-1", "srfi-128", "srfi-133", "srfi-146", "srfi-160", "check-errors"] license = "mit" -sha256 = "080lwlgvqpwdlqjdb71c1i657wq6ax2v4r9117fh83wr8bs3h1j9" +sha256 = "1bz05dy7kjypk85yck3a8h6iji6kkmnb48kpqdqvj9nm0kvg2nwd" synopsis = "Transducers for working with foldable data types." -version = "0.5.1" +version = "0.5.4" [transmission] dependencies = ["http-client", "intarweb", "medea", "r7rs", "srfi-1", "srfi-189", "uri-common"] license = "unlicense" -sha256 = "0x94ihhpway5rzsrviwnmzm7h38p1s0np7f59nxp0a99vcy9x2f0" +sha256 = "1483d5kz13zvrqpacvb7lfvc178x3j9236vmdv37ndsvjfy7m6fc" synopsis = "Transmission RPC" -version = "0.2.2" +version = "0.3.0" [traversal] dependencies = ["srfi-1", "vector-lib"] @@ -3810,9 +3852,9 @@ version = "3.6.3" [uuid-lib] dependencies = ["record-variants"] license = "bsd" -sha256 = "1hk5p2yvwq4dx93a1wnxggrbwkh050b6m9jlw44s7xvhxhvdqyns" +sha256 = "16b03b6d29mjn8bcil0ln0vq85dxxvzlxrpnpblf68n7l9ix8qnc" synopsis = "OSF DCE 1.1 UUID" -version = "0.0.14" +version = "0.0.15" [uuid] dependencies = [] @@ -3880,9 +3922,9 @@ version = "1.1" [xj] dependencies = ["fmt", "html-parser", "srfi-1", "utf8", "brev-separate"] license = "bsd-3-clause" -sha256 = "0ygznmn4p5df6q7f1m0nv4hz4l5ym3nmm2zp8y3h80piy0cb9c0a" +sha256 = "15a7p9qq33mlxa3h50s142zy9zchpdpkdkx51kfcadh0rbj0x7bi" synopsis = "Unix filter that turns XML into JSON" -version = "1.28" +version = "1.29" [xlib] dependencies = ["matchable", "srfi-13"] @@ -3936,9 +3978,9 @@ version = "0.2" [zshbrev] dependencies = ["brev"] license = "lgplv3" -sha256 = "1id8a728ibi3fzcpfdd7ary41g7nrlb7pc3vjpmz70jp1q53qppx" +sha256 = "1zmb84z22p8gv1bk05x7daqpl5h1z71hpivkyc1wbjfxyymmyaxj" synopsis = "Access Chicken functions from any shell and access zsh functions from Chicken" -version = "1.20" +version = "1.21" [zstd] dependencies = [] diff --git a/pkgs/development/compilers/chicken/5/overrides.nix b/pkgs/development/compilers/chicken/5/overrides.nix index a5fd3f94830b..adaad31b52bb 100644 --- a/pkgs/development/compilers/chicken/5/overrides.nix +++ b/pkgs/development/compilers/chicken/5/overrides.nix @@ -57,6 +57,7 @@ in mdh = addToBuildInputs pkgs.pcre; # missing dependency in upstream egg mistie = addToPropagatedBuildInputs (with chickenEggs; [ srfi-1 ]); + mosquitto = addToPropagatedBuildInputs ([ pkgs.mosquitto ]); nanomsg = addToBuildInputs pkgs.nanomsg; ncurses = addToBuildInputsWithPkgConfig [ pkgs.ncurses ]; opencl = addToBuildInputs ([ pkgs.opencl-headers pkgs.ocl-icd ] diff --git a/pkgs/development/libraries/CoinMP/default.nix b/pkgs/development/libraries/CoinMP/default.nix index 25b9ba0fb574..0a2954f4a7dd 100644 --- a/pkgs/development/libraries/CoinMP/default.nix +++ b/pkgs/development/libraries/CoinMP/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + env = lib.optionalAttrs stdenv.cc.isClang { + CXXFLAGS = "-std=c++14"; + }; + hardeningDisable = [ "format" ]; meta = with lib; { diff --git a/pkgs/development/libraries/libubox/default.nix b/pkgs/development/libraries/libubox/default.nix index 2bcc5d0498c4..09837cd0c1d8 100644 --- a/pkgs/development/libraries/libubox/default.nix +++ b/pkgs/development/libraries/libubox/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "libubox"; - version = "unstable-2023-11-28"; + version = "unstable-2023-12-18"; src = fetchgit { url = "https://git.openwrt.org/project/libubox.git"; - rev = "e80dc00ee90c29ef56ae28f414b0e5bb361206e7"; - hash = "sha256-R4Yz4C63LQTNBKyNyiLMQHfc5KJBPFldP1trmtEBb9U="; + rev = "6339204c212b2c3506554a8842030df5ec6fe9c6"; + hash = "sha256-QgpORITt6MYgfzUpaI2T0Ge2a0iVHjDhdYI/nZ2HbJ8="; }; cmakeFlags = [ "-DBUILD_EXAMPLES=OFF" (if with_lua then "-DLUAPATH=${placeholder "out"}/lib/lua" else "-DBUILD_LUA=OFF") ]; diff --git a/pkgs/development/libraries/mpich/default.nix b/pkgs/development/libraries/mpich/default.nix index f53a3268b739..d3bc279506f9 100644 --- a/pkgs/development/libraries/mpich/default.nix +++ b/pkgs/development/libraries/mpich/default.nix @@ -36,14 +36,16 @@ stdenv.mkDerivation rec { "FFLAGS=-fallow-argument-mismatch" # https://github.com/pmodels/mpich/issues/4300 "FCFLAGS=-fallow-argument-mismatch" ] ++ lib.optionals pmixSupport [ - "--with-pmix=${lib.getDev pmix}" + "--with-pmix" ]; enableParallelBuilding = true; nativeBuildInputs = [ gfortran python3 ]; buildInputs = [ perl openssh hwloc ] - ++ lib.optional (!stdenv.isDarwin) ch4backend; + ++ lib.optional (!stdenv.isDarwin) ch4backend + ++ lib.optional pmixSupport pmix; + doCheck = true; diff --git a/pkgs/development/libraries/nss/latest.nix b/pkgs/development/libraries/nss/latest.nix index 21c96d8bc923..43cb876fa884 100644 --- a/pkgs/development/libraries/nss/latest.nix +++ b/pkgs/development/libraries/nss/latest.nix @@ -5,6 +5,6 @@ # Example: nix-shell ./maintainers/scripts/update.nix --argstr package cacert import ./generic.nix { - version = "3.96.1"; - hash = "sha256-HhN3wZEdi9R/KD0nl3+et+94LBJjGLDVqDX8v5qGrqQ="; + version = "3.97"; + hash = "sha256-d26v8a+5EkQ6cFg5SZirT4L22AxfIteiUx4I42msyqw="; } diff --git a/pkgs/development/libraries/pmix/default.nix b/pkgs/development/libraries/pmix/default.nix index f5fb65f7989b..78605179f710 100644 --- a/pkgs/development/libraries/pmix/default.nix +++ b/pkgs/development/libraries/pmix/default.nix @@ -1,5 +1,7 @@ { lib, stdenv, fetchFromGitHub, perl, autoconf, automake -, libtool, python3, flex, libevent, hwloc, munge, zlib, pandoc, gitMinimal +, removeReferencesTo, libtool, python3, flex, libevent +, targetPackages, makeWrapper +, hwloc, munge, zlib, pandoc, gitMinimal } : stdenv.mkDerivation rec { @@ -14,6 +16,8 @@ stdenv.mkDerivation rec { fetchSubmodules = true; }; + outputs = [ "out" "dev" ]; + postPatch = '' patchShebangs ./autogen.pl patchShebangs ./config @@ -28,6 +32,8 @@ stdenv.mkDerivation rec { flex gitMinimal python3 + removeReferencesTo + makeWrapper ]; buildInputs = [ libevent hwloc munge zlib ]; @@ -46,6 +52,27 @@ stdenv.mkDerivation rec { postInstall = '' find $out/lib/ -name "*.la" -exec rm -f \{} \; + + moveToOutput "bin/pmix_info" "''${!outputDev}" + moveToOutput "bin/pmixcc" "''${!outputDev}" + moveToOutput "share/pmix/pmixcc-wrapper-data.txt" "''${!outputDev}" + + # The path to the pmixcc-wrapper-data.txt is hard coded and + # points to $out instead of dev. Use wrapper to fix paths. + wrapProgram $dev/bin/pmixcc \ + --set PMIX_INCLUDEDIR $dev/include \ + --set PMIX_PKGDATADIR $dev/share/pmix + ''; + + postFixup = '' + # The build info (parameters to ./configure) are hardcoded + # into the library. This clears all references to $dev/include. + remove-references-to -t $dev $(readlink -f $out/lib/libpmix.so) + + # Pin the compiler to the current version in a cross compiler friendly way. + # Same pattern as for openmpi (see https://github.com/NixOS/nixpkgs/pull/58964#discussion_r275059427). + sed -i 's:compiler=.*:compiler=${targetPackages.stdenv.cc}/bin/${targetPackages.stdenv.cc.targetPrefix}cc:' \ + $dev/share/pmix/pmixcc-wrapper-data.txt ''; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/ubus/default.nix b/pkgs/development/libraries/ubus/default.nix index 4419b4e67a66..2150ed7b0e82 100644 --- a/pkgs/development/libraries/ubus/default.nix +++ b/pkgs/development/libraries/ubus/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { pname = "ubus"; - version = "unstable-2023-11-28"; + version = "unstable-2023-12-18"; src = fetchgit { url = "https://git.openwrt.org/project/ubus.git"; - rev = "f84eb5998c6ea2d34989ca2d3254e56c66139313"; - hash = "sha256-5pIovqIeJczWAA9KQPKFnTnGRrIZVdSNdxBR8AEFtO4="; + rev = "65bb027054def3b94a977229fd6ad62ddd32345b"; + hash = "sha256-n82Ub0IiuvWbnlDCoN+0hjo/1PbplEbc56kuOYMrHxQ="; }; cmakeFlags = [ "-DBUILD_LUA=OFF" ]; diff --git a/pkgs/development/python-modules/aesedb/default.nix b/pkgs/development/python-modules/aesedb/default.nix index 5dd95fe9eae5..62f9b0dd5b94 100644 --- a/pkgs/development/python-modules/aesedb/default.nix +++ b/pkgs/development/python-modules/aesedb/default.nix @@ -12,16 +12,16 @@ buildPythonPackage rec { pname = "aesedb"; - version = "0.1.4"; - format = "pyproject"; + version = "0.1.6"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "skelsec"; - repo = pname; + repo = "aesedb"; rev = "refs/tags/${version}"; - hash = "sha256-QqPy68rWabRY0Y98W+odwP/10gMtLAQ0Ah2+ZLkqHPI="; + hash = "sha256-nYuMWE03Rsw1XuD/bxccpu8rddeXgS/EKJcO1VBLTLU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix index d97070df5907..35e558fdc262 100644 --- a/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix +++ b/pkgs/development/python-modules/aio-geojson-geonetnz-volcano/default.nix @@ -1,20 +1,22 @@ { lib , aio-geojson-client , aiohttp -, aresponses +, aioresponses , mock , buildPythonPackage , fetchFromGitHub , pytest-asyncio +, pytest-xdist , pytestCheckHook , pytz , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "aio-geojson-geonetnz-volcano"; - version = "0.8"; - format = "setuptools"; + version = "0.9"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -22,9 +24,13 @@ buildPythonPackage rec { owner = "exxamalte"; repo = "python-aio-geojson-geonetnz-volcano"; rev = "refs/tags/v${version}"; - hash = "sha256-wJVFjy6QgYb6GX9pZTylYFvCRWmD2lAFZKnodsa8Yqo="; + hash = "sha256-ZmGDO9EROFMlxdj5txNh719M+3l/0jRFbB2h2AyZAdI="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ aio-geojson-client aiohttp @@ -34,9 +40,10 @@ buildPythonPackage rec { __darwinAllowLocalNetworking = true; nativeCheckInputs = [ - aresponses + aioresponses mock pytest-asyncio + pytest-xdist pytestCheckHook ]; @@ -46,7 +53,7 @@ buildPythonPackage rec { meta = with lib; { description = "Python module for accessing the GeoNet NZ Volcanic GeoJSON feeds"; - homepage = "https://github.com/exxamalte/pythonaio-geojson-geonetnz-volcano"; + homepage = "https://github.com/exxamalte/python-aio-geojson-geonetnz-volcano"; changelog = "https://github.com/exxamalte/python-aio-geojson-geonetnz-volcano/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; diff --git a/pkgs/development/python-modules/airthings-ble/default.nix b/pkgs/development/python-modules/airthings-ble/default.nix index eec4830837f0..d5b1b5e2c1d2 100644 --- a/pkgs/development/python-modules/airthings-ble/default.nix +++ b/pkgs/development/python-modules/airthings-ble/default.nix @@ -1,16 +1,18 @@ { lib +, async-interrupt , bleak , bleak-retry-connector , buildPythonPackage , fetchFromGitHub , poetry-core +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "airthings-ble"; - version = "0.5.6-4"; - format = "pyproject"; + version = "0.6.0"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -18,12 +20,12 @@ buildPythonPackage rec { owner = "vincegio"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-Ft5A2ZGVH9VHoRDAqDcc0rBfnQRxoXMylCAwUSwmViE="; + hash = "sha256-T+KtB6kPrLahI73W/Bb3A9ws91v4n1EtURgm3RcLzW8="; }; postPatch = '' substituteInPlace pyproject.toml \ - --replace 'bleak-retry-connector = "^0.15.1"' 'bleak = "*"' + --replace "-v -Wdefault --cov=airthings_ble --cov-report=term-missing:skip-covered" "" ''; nativeBuildInputs = [ @@ -31,12 +33,14 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + async-interrupt bleak bleak-retry-connector ]; - # Module has no tests - doCheck = false; + nativeCheckInputs = [ + pytestCheckHook + ]; pythonImportsCheck = [ "airthings_ble" diff --git a/pkgs/development/python-modules/aranet4/default.nix b/pkgs/development/python-modules/aranet4/default.nix index dda10a9d6f22..49000324ac27 100644 --- a/pkgs/development/python-modules/aranet4/default.nix +++ b/pkgs/development/python-modules/aranet4/default.nix @@ -5,12 +5,13 @@ , pytestCheckHook , pythonOlder , requests +, setuptools }: buildPythonPackage rec { pname = "aranet4"; - version = "2.2.2"; - format = "setuptools"; + version = "2.2.3"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -18,9 +19,13 @@ buildPythonPackage rec { owner = "Anrijs"; repo = "Aranet4-Python"; rev = "refs/tags/v${version}"; - hash = "sha256-HiveHkGQUCvG4aqK2HSCbONObidT7yof4LzKSJPEOKU="; + hash = "sha256-Jd7yuddxwRrO7XFQsVGy5vRQxwIUZdwFSjiZZHdkE3g="; }; + nativeBuildInputs = [ + setuptools + ]; + propagatedBuildInputs = [ bleak requests diff --git a/pkgs/development/python-modules/asyncinotify/default.nix b/pkgs/development/python-modules/asyncinotify/default.nix index feb778c729aa..6fe187bfc3cf 100644 --- a/pkgs/development/python-modules/asyncinotify/default.nix +++ b/pkgs/development/python-modules/asyncinotify/default.nix @@ -1,35 +1,45 @@ { lib , buildPythonPackage -, fetchFromGitLab +, fetchFromGitHub , flit-core -, python +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "asyncinotify"; - version = "4.0.2"; - format = "pyproject"; + version = "4.0.6"; + pyproject = true; - src = fetchFromGitLab { - owner = "Taywee"; + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "absperf"; repo = "asyncinotify"; - rev = "v${version}"; - hash = "sha256-Q7b406UENCmD9SGbaml+y2YLDi7VLZBmDkYMo8CLuVw="; + rev = "refs/tags/v${version}"; + hash = "sha256-RXx6i5dIB2oySVaLoHPRGD9VKgiO5OAXmrzVBq8Ad18="; }; nativeBuildInputs = [ flit-core ]; - checkPhase = '' - ${python.pythonOnBuildForHost.interpreter} ${src}/test.py - ''; - pythonImportsCheck = ["asyncinotify"]; + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "asyncinotify" + ]; + + pytestFlagsArray = [ + "test.py" + ]; meta = with lib; { - description = "A simple optionally-async python inotify library, focused on simplicity of use and operation, and leveraging modern Python features"; - homepage = "https://pypi.org/project/asyncinotify/"; - changelog = "https://gitlab.com/Taywee/asyncinotify/-/blob/master/CHANGELOG.md"; + description = "Module for inotify"; + homepage = "https://github.com/absperf/asyncinotify/"; + changelog = "https://github.com/absperf/asyncinotify/releases/tag/v${version}"; license = licenses.mit; maintainers = with maintainers; [ cynerd ]; }; diff --git a/pkgs/development/python-modules/base2048/default.nix b/pkgs/development/python-modules/base2048/default.nix index 889ef9f81f17..8d75bd93e336 100644 --- a/pkgs/development/python-modules/base2048/default.nix +++ b/pkgs/development/python-modules/base2048/default.nix @@ -1,8 +1,10 @@ { lib +, stdenv , buildPythonPackage , cargo , fetchFromGitHub , frelatage +, libiconv , maturin , pytestCheckHook , pythonOlder @@ -39,6 +41,10 @@ buildPythonPackage rec { rustc ]; + buildInputs = lib.optionals stdenv.isDarwin [ + libiconv + ]; + passthru.optional-dependencies = { fuzz = [ frelatage diff --git a/pkgs/development/python-modules/certipy-ad/default.nix b/pkgs/development/python-modules/certipy-ad/default.nix index ce55ab982925..bccf5c066799 100644 --- a/pkgs/development/python-modules/certipy-ad/default.nix +++ b/pkgs/development/python-modules/certipy-ad/default.nix @@ -12,7 +12,7 @@ , pyopenssl , pythonOlder , requests -, requests_ntlm +, requests-ntlm , unicrypto }: @@ -47,7 +47,7 @@ buildPythonPackage rec { pycryptodome pyopenssl requests - requests_ntlm + requests-ntlm unicrypto ]; diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index e4bd3686b161..26fed6a0b493 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -23,8 +23,8 @@ buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "6.3.0"; - format = "pyproject"; + version = "6.4.0"; + pyproject = true; disabled = pythonOlder "3.9"; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = "cyclonedx-python-lib"; rev = "refs/tags/v${version}"; - hash = "sha256-Q4mz6qNqR7lkZqb70COBkrXsv0+z5TEC149dnSpzhtI="; + hash = "sha256-WPXhla5VGyexZPxq9R86G9CNWuGyn79H+lPDCmWitN0="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/django-hijack/default.nix b/pkgs/development/python-modules/django-hijack/default.nix index a5c85a485695..427a8e231139 100644 --- a/pkgs/development/python-modules/django-hijack/default.nix +++ b/pkgs/development/python-modules/django-hijack/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "django-hijack"; - version = "3.4.3"; + version = "3.4.5"; format = "setuptools"; src = fetchFromGitHub { owner = "django-hijack"; repo = "django-hijack"; rev = "refs/tags/${version}"; - hash = "sha256-D9IyuM+ZsvFZL0nhMt1VQ1DYcKg4CS8FPAgSWLtsXeE="; + hash = "sha256-FXh5OFMTjsKgjEeIS+CiOwyGOs4AisJA+g49rCILDsQ="; }; postPatch = '' @@ -40,7 +40,7 @@ buildPythonPackage rec { npmDeps = fetchNpmDeps { inherit src; - hash = "sha256-X3bJ6STFq6zGIzXHSd2C67d4kSOVJJR5aBSM3o5T850="; + hash = "sha256-cZEr/7FW4vCR8gpraT+/rPwYK9Xn22b5WH7lnuK5L4U="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/django-simple-captcha/default.nix b/pkgs/development/python-modules/django-simple-captcha/default.nix index d43892cb04d3..11c3e862804a 100644 --- a/pkgs/development/python-modules/django-simple-captcha/default.nix +++ b/pkgs/development/python-modules/django-simple-captcha/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "django-simple-captcha"; - version = "0.5.20"; + version = "0.6.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-ICcwCae+tEKX6fbHpr0hraPS+pPDFNL2v145TO62opc="; + hash = "sha256-0YhRbTJvrdLVrQduuJZJ1VwCyrr+P9zCFUrBjp9tS5c="; }; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/dvc-render/default.nix b/pkgs/development/python-modules/dvc-render/default.nix index a4527cd1b6c5..fc0a13004970 100644 --- a/pkgs/development/python-modules/dvc-render/default.nix +++ b/pkgs/development/python-modules/dvc-render/default.nix @@ -15,16 +15,16 @@ buildPythonPackage rec { pname = "dvc-render"; - version = "1.0.0"; - format = "pyproject"; + version = "1.0.1"; + pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "iterative"; - repo = pname; + repo = "dvc-render"; rev = "refs/tags/${version}"; - hash = "sha256-OrfepQuLBNa5m3Sy4NzFOArtFFvaNtNNVJ8DNN3yT6s="; + hash = "sha256-7rmmhf6Y6teoHR8u1+Ce1Xq0rdtC1/MWLXb282OOEnc="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/dvc/default.nix b/pkgs/development/python-modules/dvc/default.nix index 33cddb5b0e99..c4fc1b7c78c0 100644 --- a/pkgs/development/python-modules/dvc/default.nix +++ b/pkgs/development/python-modules/dvc/default.nix @@ -58,7 +58,7 @@ buildPythonPackage rec { pname = "dvc"; - version = "3.40.1"; + version = "3.41.0"; pyproject = true; disabled = pythonOlder "3.8"; @@ -67,7 +67,7 @@ buildPythonPackage rec { owner = "iterative"; repo = "dvc"; rev = "refs/tags/${version}"; - hash = "sha256-ik2WVq7cXhOc9kwBep38HELgvj0CGLtpx5EzzdJzAsc="; + hash = "sha256-j4UkPHav97s5GAuR9yYWaI1ObfKcsyozlTDC9jeBfK4="; }; pythonRelaxDeps = [ diff --git a/pkgs/development/python-modules/dvclive/default.nix b/pkgs/development/python-modules/dvclive/default.nix index 67f70fffb3e0..f657ab37083c 100644 --- a/pkgs/development/python-modules/dvclive/default.nix +++ b/pkgs/development/python-modules/dvclive/default.nix @@ -1,21 +1,39 @@ { lib , buildPythonPackage +, datasets , dvc +, dvc-render , dvc-studio-client +, fastai , fetchFromGitHub , funcy +, gto +, jsonargparse +, lightgbm +, lightning +, matplotlib +, mmcv +, numpy +, optuna +, pandas +, pillow , pytestCheckHook , pythonOlder , ruamel-yaml +, scikit-learn , scmrepo , setuptools-scm , tabulate +, tensorflow +, torch +, transformers +, xgboost }: buildPythonPackage rec { pname = "dvclive"; - version = "3.5.1"; - format = "pyproject"; + version = "3.41.1"; + pyproject = true; disabled = pythonOlder "3.8"; @@ -23,7 +41,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-QsA8HZ6wIWKvtQ+f3nyRKKZRNJS56eZ1sKw+KNHxfXc="; + hash = "sha256-PbgazRK3+CoJISh1ZXGjxDfbKHY/XqSvVrkpycvPi7c="; }; nativeBuildInputs = [ @@ -32,12 +50,78 @@ buildPythonPackage rec { propagatedBuildInputs = [ dvc + dvc-render dvc-studio-client funcy + gto ruamel-yaml scmrepo ]; + passthru.optional-dependencies = { + all = [ + jsonargparse + lightgbm + lightning + matplotlib + mmcv + numpy + optuna + pandas + pillow + scikit-learn + tensorflow + torch + transformers + xgboost + ] ++ jsonargparse.optional-dependencies.signatures; + image = [ + numpy + pillow + ]; + sklearn = [ + scikit-learn + ]; + plots = [ + pandas + scikit-learn + numpy + ]; + markdown = [ + matplotlib + ]; + mmcv = [ + mmcv + ]; + tf = [ + tensorflow + ]; + xgb = [ + xgboost + ]; + lgbm = [ + lightgbm + ]; + huggingface = [ + datasets + transformers + ]; + # catalyst = [ + # catalyst + # ]; + fastai = [ + fastai + ]; + lightning = [ + lightning + torch + jsonargparse + ] ++ jsonargparse.optional-dependencies.signatures; + optuna = [ + optuna + ]; + }; + # Circular dependency with dvc doCheck = false; diff --git a/pkgs/development/python-modules/exchangelib/default.nix b/pkgs/development/python-modules/exchangelib/default.nix index b7d4cda7df7c..9b4078ba47f6 100644 --- a/pkgs/development/python-modules/exchangelib/default.nix +++ b/pkgs/development/python-modules/exchangelib/default.nix @@ -17,7 +17,7 @@ , pytz , pyyaml , requests -, requests_ntlm +, requests-ntlm , requests-oauthlib , requests-kerberos , requests-mock @@ -57,7 +57,7 @@ buildPythonPackage rec { oauthlib pygments requests - requests_ntlm + requests-ntlm requests-oauthlib requests-kerberos tzdata diff --git a/pkgs/development/python-modules/garminconnect/default.nix b/pkgs/development/python-modules/garminconnect/default.nix index 43604aa29333..42363ecdcdd4 100644 --- a/pkgs/development/python-modules/garminconnect/default.nix +++ b/pkgs/development/python-modules/garminconnect/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "garminconnect"; - version = "0.2.12"; + version = "0.2.13"; pyproject = true; disabled = pythonOlder "3.10"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "cyberjunky"; repo = "python-garminconnect"; rev = "refs/tags/${version}"; - hash = "sha256-uq3biWZvcORvrAMd/Ix0Cj1ol5fiqdDsO54zD82G2vA="; + hash = "sha256-9At9v+7jOt43qPOhZpFYBEXA2zUfp8MAGO4/676kcBU="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/httpie-ntlm/default.nix b/pkgs/development/python-modules/httpie-ntlm/default.nix index 22a995ebd24b..cbf3b29bcf03 100644 --- a/pkgs/development/python-modules/httpie-ntlm/default.nix +++ b/pkgs/development/python-modules/httpie-ntlm/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , httpie -, requests_ntlm +, requests-ntlm }: buildPythonPackage rec { @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "b1f757180c0bd60741ea16cf91fc53d47df402a5c287c4a61a14b335ea0552b3"; }; - propagatedBuildInputs = [ httpie requests_ntlm ]; + propagatedBuildInputs = [ httpie requests-ntlm ]; # Package have no tests doCheck = false; diff --git a/pkgs/development/python-modules/jsonargparse/default.nix b/pkgs/development/python-modules/jsonargparse/default.nix new file mode 100644 index 000000000000..afe6f4220904 --- /dev/null +++ b/pkgs/development/python-modules/jsonargparse/default.nix @@ -0,0 +1,109 @@ +{ lib +, argcomplete +, attrs +, buildPythonPackage +, docstring-parser +, fetchFromGitHub +, fsspec +, jsonnet +, jsonschema +, omegaconf +, pydantic +, pytest-subtests +, pytestCheckHook +, pythonOlder +, pyyaml +, reconplogger +, requests +, responses +, ruyaml +, setuptools +, types-pyyaml +, types-requests +, typeshed-client +}: + +buildPythonPackage rec { + pname = "jsonargparse"; + version = "4.27.2"; + pyproject = true; + + disabled = pythonOlder "3.11"; + + src = fetchFromGitHub { + owner = "omni-us"; + repo = "jsonargparse"; + rev = "refs/tags/v${version}"; + hash = "sha256-qvc0HpwgYXDayA0q0D598rCb+I3LuaPm2tmmd0E3rrk="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + pyyaml + ]; + + passthru.optional-dependencies = { + all = [ + argcomplete + fsspec + jsonnet + jsonschema + omegaconf + ruyaml + docstring-parser + typeshed-client + requests + ]; + argcomplete = [ + argcomplete + ]; + fsspec = [ + fsspec + ]; + jsonnet = [ + jsonnet + # jsonnet-binary + ]; + jsonschema = [ + jsonschema + ]; + omegaconf = [ + omegaconf + ]; + reconplogger = [ + reconplogger + ]; + ruyaml = [ + ruyaml + ]; + signatures = [ + docstring-parser + typeshed-client + ]; + urls = [ + requests + ]; + }; + + nativeCheckInputs = [ + pytest-subtests + pytestCheckHook + types-pyyaml + types-requests + ]; + + pythonImportsCheck = [ + "jsonargparse" + ]; + + meta = with lib; { + description = "Module to mplement minimal boilerplate CLIs derived from various sources"; + homepage = "https://github.com/omni-us/jsonargparse"; + changelog = "https://github.com/omni-us/jsonargparse/blob/${version}/CHANGELOG.rst"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/logmatic-python/default.nix b/pkgs/development/python-modules/logmatic-python/default.nix new file mode 100644 index 000000000000..24416041f7b2 --- /dev/null +++ b/pkgs/development/python-modules/logmatic-python/default.nix @@ -0,0 +1,44 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, python-json-logger +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "logmatic-python"; + version = "0.1.7"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "logmatic"; + repo = "logmatic-python"; + rev = "refs/tags/${version}"; + hash = "sha256-UYKm00KhXnPQDkKJVm7s0gOwZ3GNY07O0oKbzPhAdVE="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + python-json-logger + ]; + + # Only functional tests, no unit tests + doCheck = false; + + pythonImportsCheck = [ + "logmatic" + ]; + + meta = with lib; { + description = "Python helpers to send logs to Logmatic.io"; + homepage = "https://github.com/logmatic/logmatic-python"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/msgspec/default.nix b/pkgs/development/python-modules/msgspec/default.nix index 5af0adeb0300..6dac69d22db8 100644 --- a/pkgs/development/python-modules/msgspec/default.nix +++ b/pkgs/development/python-modules/msgspec/default.nix @@ -4,22 +4,27 @@ , msgpack , pytestCheckHook , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "msgspec"; - version = "0.18.5"; - format = "setuptools"; + version = "0.18.6"; + pyproject = true; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "jcrist"; - repo = pname; + repo = "msgspec"; rev = "refs/tags/${version}"; - hash = "sha256-BcENL1vPCspzYdAHicC5AHs/7xZPWf+Yys37vKgbris="; + hash = "sha256-xqtV60saQNINPMpOnZRSDnicedPSPBUQwPSE5zJGrTo="; }; + nativeBuildInputs = [ + setuptools + ]; + # Requires libasan to be accessible doCheck = false; diff --git a/pkgs/development/python-modules/ndeflib/default.nix b/pkgs/development/python-modules/ndeflib/default.nix index 3699955627ec..165aed8942df 100644 --- a/pkgs/development/python-modules/ndeflib/default.nix +++ b/pkgs/development/python-modules/ndeflib/default.nix @@ -2,13 +2,15 @@ , buildPythonPackage , fetchFromGitHub , pytestCheckHook +, pythonAtLeast , pythonOlder +, setuptools }: buildPythonPackage rec { pname = "ndeflib"; version = "0.3.3"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -19,6 +21,10 @@ buildPythonPackage rec { hash = "sha256-cpfztE+/AW7P0J7QeTDfVGYc2gEkr7gzA352hC9bdTM="; }; + nativeBuildInputs = [ + setuptools + ]; + nativeCheckInputs = [ pytestCheckHook ]; @@ -30,11 +36,14 @@ buildPythonPackage rec { disabledTests = [ # AssertionError caused due to wrong size "test_decode_error" + ] ++ lib.optionals (pythonAtLeast "3.12") [ + "test_encode_error" ]; meta = with lib; { description = "Python package for parsing and generating NFC Data Exchange Format messages"; homepage = "https://github.com/nfcpy/ndeflib"; + changelog = "https://github.com/nfcpy/ndeflib/releases/tag/v${version}"; license = licenses.isc; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/podman/default.nix b/pkgs/development/python-modules/podman/default.nix index 3279c4212cee..e3174a0a93ac 100644 --- a/pkgs/development/python-modules/podman/default.nix +++ b/pkgs/development/python-modules/podman/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "podman"; - version = "4.8.2"; + version = "4.9.0"; pyproject = true; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "containers"; repo = "podman-py"; rev = "refs/tags/v${version}"; - hash = "sha256-XJ+KD3HM+Sygq8Oxht80G9DnZadvR3fFyXrJsWny65g="; + hash = "sha256-fLuWOfv4kW5a9h658s8pBgXsBfcYdkXNp9+bWtgKHv8="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/py-serializable/default.nix b/pkgs/development/python-modules/py-serializable/default.nix index 3f342a1469ca..12bdef693e20 100644 --- a/pkgs/development/python-modules/py-serializable/default.nix +++ b/pkgs/development/python-modules/py-serializable/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "py-serializable"; - version = "0.17.1"; + version = "1.0.0"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "madpah"; repo = "serializable"; rev = "refs/tags/v${version}"; - hash = "sha256-G7bIsvWdL4qVg4akJ2KtXVS10DiJSFUYEzyQSp9ry9o="; + hash = "sha256-7WYe3X4wVUC7HyYoCVQYWm61C+J3r91Ci8IHNeWBTVE="; }; nativeBuildInputs = [ @@ -50,7 +50,7 @@ buildPythonPackage rec { meta = with lib; { description = "Pythonic library to aid with serialisation and deserialisation to/from JSON and XML"; homepage = "https://github.com/madpah/serializable"; - changelog = "https://github.com/madpah/serializable/blob/${version}/CHANGELOG.md"; + changelog = "https://github.com/madpah/serializable/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/pydeps/default.nix b/pkgs/development/python-modules/pydeps/default.nix index f84123163ccf..560a62348541 100644 --- a/pkgs/development/python-modules/pydeps/default.nix +++ b/pkgs/development/python-modules/pydeps/default.nix @@ -6,23 +6,28 @@ , pytestCheckHook , pythonOlder , pyyaml +, setuptools , toml }: buildPythonPackage rec { pname = "pydeps"; - version = "1.12.17"; - format = "setuptools"; + version = "1.12.18"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "thebjorn"; - repo = pname; + repo = "pydeps"; rev = "refs/tags/v${version}"; - hash = "sha256-DVSZeNuDz/y0jh/HimV+jFgNFevMhUKOu6EhZytMMqQ="; + hash = "sha256-89RrAf09n42mRiWOUdHFNP4JoCP9bXMofkISyVqd+4I="; }; + nativeBuildInputs = [ + setuptools + ]; + buildInputs = [ graphviz ]; diff --git a/pkgs/development/python-modules/pykoplenti/default.nix b/pkgs/development/python-modules/pykoplenti/default.nix index 99f90e17b028..a8930149b1bb 100644 --- a/pkgs/development/python-modules/pykoplenti/default.nix +++ b/pkgs/development/python-modules/pykoplenti/default.nix @@ -7,33 +7,33 @@ , pycryptodome , pydantic , pythonOlder +, pythonRelaxDepsHook , setuptools }: buildPythonPackage rec { pname = "pykoplenti"; version = "1.2.2"; - format = "pyproject"; + pyproject = true; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "stegm"; - repo = pname; + repo = "pykoplenti"; rev = "refs/tags/v${version}"; hash = "sha256-2sGkHCIGo1lzLurvQBmq+16sodAaK8v+mAbIH/Gd3+E="; }; + pythonRelaxDeps = [ + "pydantic" + ]; + nativeBuildInputs = [ + pythonRelaxDepsHook setuptools ]; - postPatch = '' - # remove with 1.1.0 - substituteInPlace setup.cfg \ - --replace 'version = unreleased' 'version = ${version}' - ''; - propagatedBuildInputs = [ aiohttp pycryptodome @@ -50,11 +50,14 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "pykoplenti" ]; + pythonImportsCheck = [ + "pykoplenti" + ]; meta = with lib; { description = "Python REST client API for Kostal Plenticore Inverters"; homepage = "https://github.com/stegm/pykoplenti/"; + changelog = "https://github.com/stegm/pykoplenti/releases/tag/v${version}"; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ fab ]; }; diff --git a/pkgs/development/python-modules/python-kasa/default.nix b/pkgs/development/python-modules/python-kasa/default.nix index f1b8467bda18..eb6f056ad156 100644 --- a/pkgs/development/python-modules/python-kasa/default.nix +++ b/pkgs/development/python-modules/python-kasa/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "python-kasa"; - version = "0.6.0"; + version = "0.6.0.1"; pyproject = true; disabled = pythonOlder "3.8"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "python-kasa"; repo = "python-kasa"; rev = "refs/tags/${version}"; - hash = "sha256-JFd9Ka/96Y4nu2HnL/Waf5EBKb06+7rZdI72F8G472I="; + hash = "sha256-Vx2ZRcm/Ob0oWB/Th7hF4ctppWoeeNiqKGjYVNsidrE="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/pywinrm/default.nix b/pkgs/development/python-modules/pywinrm/default.nix index 40e8c70ba83b..2455b476a4d9 100644 --- a/pkgs/development/python-modules/pywinrm/default.nix +++ b/pkgs/development/python-modules/pywinrm/default.nix @@ -5,7 +5,7 @@ , mock , pytestCheckHook , requests -, requests_ntlm +, requests-ntlm , six , xmltodict }: @@ -24,7 +24,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests - requests_ntlm + requests-ntlm six xmltodict ]; diff --git a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix index 24bee7d9dbc4..030f94efc852 100644 --- a/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix +++ b/pkgs/development/python-modules/qiskit-ibmq-provider/default.nix @@ -6,7 +6,7 @@ , nest-asyncio , qiskit-terra , requests -, requests_ntlm +, requests-ntlm , websocket-client # Visualization inputs , withVisualization ? true @@ -57,7 +57,7 @@ buildPythonPackage rec { nest-asyncio qiskit-terra requests - requests_ntlm + requests-ntlm websocket-client websockets ] ++ lib.optionals withVisualization visualizationPackages; diff --git a/pkgs/development/python-modules/reconplogger/default.nix b/pkgs/development/python-modules/reconplogger/default.nix new file mode 100644 index 000000000000..e6791dddb1d6 --- /dev/null +++ b/pkgs/development/python-modules/reconplogger/default.nix @@ -0,0 +1,63 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, flask +, logmatic-python +, pytestCheckHook +, pythonOlder +, pyyaml +, requests +, setuptools +, testfixtures +}: + +buildPythonPackage rec { + pname = "reconplogger"; + version = "4.13.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "omni-us"; + repo = "reconplogger"; + rev = "refs/tags/v${version}"; + hash = "sha256-eqo26u99nTO/8kgG9nqeVArWJiwP4wqkcisAju8vOPs="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + logmatic-python + pyyaml + ]; + + passthru.optional-dependencies = { + all = [ + flask + requests + ]; + }; + + nativeCheckInputs = [ + pytestCheckHook + testfixtures + ]; + + pythonImportsCheck = [ + "reconplogger" + ]; + + pytestFlagsArray = [ + "reconplogger_tests.py" + ]; + + meta = with lib; { + description = "Module to ease the standardization of logging within omni:us"; + homepage = "https://github.com/omni-us/reconplogger"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/requests_ntlm/default.nix b/pkgs/development/python-modules/requests-ntlm/default.nix index 43a002e1e19e..43a002e1e19e 100644 --- a/pkgs/development/python-modules/requests_ntlm/default.nix +++ b/pkgs/development/python-modules/requests-ntlm/default.nix diff --git a/pkgs/development/python-modules/safe-pysha3/default.nix b/pkgs/development/python-modules/safe-pysha3/default.nix index a71cce569ce7..bb96ee1c2dcb 100644 --- a/pkgs/development/python-modules/safe-pysha3/default.nix +++ b/pkgs/development/python-modules/safe-pysha3/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , pythonOlder -, python }: buildPythonPackage rec { @@ -16,6 +15,12 @@ buildPythonPackage rec { hash = "sha256-5CkUax7dGYssqTSiBGplZWxdMbDsiUu9YFUSf03q/xc="; }; + # AttributeError: 'Keccak_224Tests' object has no attribute 'failIf'. + postPatch = '' + substituteInPlace tests.py \ + --replace "failIf" "assertFalse" + ''; + pythonImportsCheck = [ "sha3" ]; diff --git a/pkgs/development/python-modules/scmrepo/default.nix b/pkgs/development/python-modules/scmrepo/default.nix index 281ff4cb1814..6faf74e51aa1 100644 --- a/pkgs/development/python-modules/scmrepo/default.nix +++ b/pkgs/development/python-modules/scmrepo/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { pname = "scmrepo"; - version = "2.0.3"; + version = "2.0.4"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -28,7 +28,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-P+Mbf8adSvQPkUgnTSPrqzvHc6lR0ns2mJ0/x9YGPKs="; + hash = "sha256-gBGfL6Xet7ASdwRTFJ5nHpyeXi/pqlrL9o5nC3m48hk="; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/typeshed-client/default.nix b/pkgs/development/python-modules/typeshed-client/default.nix new file mode 100644 index 000000000000..03877756e572 --- /dev/null +++ b/pkgs/development/python-modules/typeshed-client/default.nix @@ -0,0 +1,51 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, importlib-resources +, pytestCheckHook +, pythonOlder +, setuptools +}: + +buildPythonPackage rec { + pname = "typeshed-client"; + version = "2.4.0"; + pyproject = true; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "JelleZijlstra"; + repo = "typeshed_client"; + rev = "refs/tags/v${version}"; + hash = "sha256-g3FECKebKeM3JPWem6+Y9T27PcAxVxj1SiBd5siLSJ4="; + }; + + nativeBuildInputs = [ + setuptools + ]; + + propagatedBuildInputs = [ + importlib-resources + ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "typeshed_client" + ]; + + pytestFlagsArray = [ + "tests/test.py" + ]; + + meta = with lib; { + description = "Retrieve information from typeshed and other typing stubs"; + homepage = "https://github.com/JelleZijlstra/typeshed_client"; + changelog = "https://github.com/JelleZijlstra/typeshed_client/releases/tag/v${version}"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; +} diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix index 7b35a15a6d80..1282eebef211 100644 --- a/pkgs/development/tools/analysis/checkov/default.nix +++ b/pkgs/development/tools/analysis/checkov/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "checkov"; - version = "3.1.67"; + version = "3.1.69"; pyproject = true; src = fetchFromGitHub { owner = "bridgecrewio"; repo = "checkov"; rev = "refs/tags/${version}"; - hash = "sha256-mwXR4KEkbkvWIwqeHuQPgm+8W7EdBtAwcBkFx0YFlhs="; + hash = "sha256-hA0GmCNsds/dkSJ5PZYPiz1lsaISs62jb000k17aqAM="; }; patches = [ diff --git a/pkgs/development/tools/fermyon-spin/default.nix b/pkgs/development/tools/fermyon-spin/default.nix index a0ba21d60674..e7e1783e621f 100644 --- a/pkgs/development/tools/fermyon-spin/default.nix +++ b/pkgs/development/tools/fermyon-spin/default.nix @@ -17,20 +17,20 @@ let }.${system} or (throw "Unsupported system: ${system}"); packageHash = { - x86_64-linux = "sha256-Fp1h1X5UFOHLqgaAcXXl3oSioCMVLJLaOURHd3uu8sA="; - aarch64-linux = "sha256-F6/h98qZvzImuxPOMYr1cGWBjr1qWGvoYztvZzw2GRg="; - x86_64-darwin = "sha256-WegiHPHi9Qw4PPTEB2a9AdIgMlyOzzSpTRdJH43IEjM="; - aarch64-darwin = "sha256-BJER3Fp4AItqtLNYh6pH/tNB98H3iTARr3fKyTXGcP8="; + x86_64-linux = "sha256-i06Zp176zl7y8P32Hss64QkMc/+vXtkQy/tkOPSX3dc="; + aarch64-linux = "sha256-HEm3TaLeaws8G73CU9BmxeplQdeF9nQbBSnbctaVhqI="; + x86_64-darwin = "sha256-mlshpN/4Od4qrXiqIEYo7G84Dtb+tp2nK2VnrRG2rto="; + aarch64-darwin = "sha256-aJH/vOidj0vbkttGDgelaAC/dMYguQPLjxl+V3pOVzI="; }.${system} or (throw "Unsupported system: ${system}"); in stdenv.mkDerivation rec { pname = "fermyon-spin"; - version = "1.2.1"; + version = "2.1.0"; src = fetchzip { url = "https://github.com/fermyon/spin/releases/download/v${version}/spin-v${version}-${platform}.tar.gz"; stripRoot = false; - sha256 = packageHash; + hash = packageHash; }; nativeBuildInputs = lib.optionals stdenv.isLinux [ diff --git a/pkgs/development/tools/language-servers/jdt-language-server/default.nix b/pkgs/development/tools/language-servers/jdt-language-server/default.nix index 3de28f65145f..626db26e89b1 100644 --- a/pkgs/development/tools/language-servers/jdt-language-server/default.nix +++ b/pkgs/development/tools/language-servers/jdt-language-server/default.nix @@ -1,102 +1,60 @@ { lib , stdenv , fetchurl -, makeWrapper +, python3 , jdk }: -stdenv.mkDerivation rec { +let + timestamp = "202401111522"; +in +stdenv.mkDerivation (finalAttrs: { pname = "jdt-language-server"; - version = "1.26.0"; - timestamp = "202307271613"; + version = "1.31.0"; src = fetchurl { - url = "https://download.eclipse.org/jdtls/milestones/${version}/jdt-language-server-${version}-${timestamp}.tar.gz"; - sha256 = "sha256-ul/l7jsqg5UofiSu8gzm4Xg0z46HcRfmyqysamiKbFM="; + url = "https://download.eclipse.org/jdtls/milestones/${finalAttrs.version}/jdt-language-server-${finalAttrs.version}-${timestamp}.tar.gz"; + hash = "sha256-bCX2LQt00d2SqxmvuvvlBB6wbCuFPqtX9/Qv5v6wH3w="; }; sourceRoot = "."; buildInputs = [ - jdk + # Used for the included wrapper + python3 ]; - nativeBuildInputs = [ - makeWrapper - ]; + postPatch = '' + # We store the plugins, config, and features folder in different locations + # than in the original package. In addition, hard-code the path to the jdk + # in the wrapper, instead of searching for it in PATH at runtime. + substituteInPlace bin/jdtls.py \ + --replace "jdtls_base_path = Path(__file__).parent.parent" "jdtls_base_path = Path(\"$out/share/java/jdtls/\")" \ + --replace "java_executable = get_java_executable(known_args.validate_java_version)" "java_executable = '${lib.getExe jdk}'" + ''; installPhase = let - # The application ships with config directories for linux and mac + # The application ships with different config directories for each platform. + # Note the application come with ARM variants as well, although the + # current included wrapper doesn't use them. configDir = if stdenv.isDarwin then "config_mac" else "config_linux"; in - '' - # Copy jars - install -D -t $out/share/java/plugins/ plugins/*.jar - - # Copy config directories for linux and mac - install -Dm 444 -t $out/share/config ${configDir}/* - - # Get latest version of launcher jar - # e.g. org.eclipse.equinox.launcher_1.5.800.v20200727-1323.jar - launcher="$(ls $out/share/java/plugins/org.eclipse.equinox.launcher_* | sort -V | tail -n1)" - - # The wrapper script will create a directory in the user's cache, copy in the config - # files since this dir can't be read-only, and by default use this as the runtime dir. - # - # The following options are required as per the upstream documentation: - # - # -Declipse.application=org.eclipse.jdt.ls.core.id1 - # -Dosgi.bundles.defaultStartLevel=4 - # -Declipse.product=org.eclipse.jdt.ls.core.product - # --add-modules=ALL-SYSTEM - # --add-opens java.base/java.util=ALL-UNNAMED - # --add-opens java.base/java.lang=ALL-UNNAMED - # - # The following options configure the server to run without writing logs to the nix store: - # - # -Dosgi.sharedConfiguration.area.readOnly=true - # -Dosgi.checkConfiguration=true - # -Dosgi.configuration.cascaded=true - # -Dosgi.sharedConfiguration.area=$out/share/config - # - # Other options which the caller may change: - # - # -Dlog.level: - # Log level. - # This can be overidden by setting JAVA_OPTS. - # - # The caller must specify the following: - # - # -data: - # The application stores runtime data here. We set this to <cache-dir>/$PWD - # so that projects don't collide with each other. - # This can be overidden by specifying -configuration to the wrapper. - # - # Java options, such as -Xms and Xmx can be specified by setting JAVA_OPTS. - # - makeWrapper ${jdk}/bin/java $out/bin/jdt-language-server \ - --add-flags "-Declipse.application=org.eclipse.jdt.ls.core.id1" \ - --add-flags "-Dosgi.bundles.defaultStartLevel=4" \ - --add-flags "-Declipse.product=org.eclipse.jdt.ls.core.product" \ - --add-flags "-Dosgi.sharedConfiguration.area=$out/share/config" \ - --add-flags "-Dosgi.sharedConfiguration.area.readOnly=true" \ - --add-flags "-Dosgi.checkConfiguration=true" \ - --add-flags "-Dosgi.configuration.cascaded=true" \ - --add-flags "-Dlog.level=ALL" \ - --add-flags "\$JAVA_OPTS" \ - --add-flags "-jar $launcher" \ - --add-flags "--add-modules=ALL-SYSTEM" \ - --add-flags "--add-opens java.base/java.util=ALL-UNNAMED" \ - --add-flags "--add-opens java.base/java.lang=ALL-UNNAMED" + '' + install -Dm444 -t $out/share/java/jdtls/plugins/ plugins/* + install -Dm444 -t $out/share/java/jdtls/features/ features/* + install -Dm444 -t $out/share/java/jdtls/${configDir} ${configDir}/* + install -Dm555 -t $out/bin bin/jdtls + install -Dm444 -t $out/bin bin/jdtls.py ''; - meta = with lib; { + meta = { homepage = "https://github.com/eclipse/eclipse.jdt.ls"; description = "Java language server"; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - license = licenses.epl20; - maintainers = with maintainers; [ matt-snider ]; - platforms = platforms.all; + sourceProvenance = with lib.sourceTypes; [ binaryBytecode ]; + license = lib.licenses.epl20; + maintainers = with lib.maintainers; [ matt-snider ]; + platforms = lib.platforms.all; + mainProgram = "jdtls"; }; -} +}) |