From 3badec17c6987c2048a03ad9c1e30cc6a21469f7 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Wed, 12 Jul 2023 11:46:54 +0300 Subject: [PATCH 01/13] ipe: 7.2.26 -> 7.2.27 Diff: https://github.com/otfried/ipe/compare/None...v7.2.27 --- pkgs/applications/graphics/ipe/default.nix | 9 ++++----- pkgs/applications/graphics/ipe/headers-lookup.patch | 13 ------------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 pkgs/applications/graphics/ipe/headers-lookup.patch diff --git a/pkgs/applications/graphics/ipe/default.nix b/pkgs/applications/graphics/ipe/default.nix index 01f17bb41b95..834ab6198a87 100644 --- a/pkgs/applications/graphics/ipe/default.nix +++ b/pkgs/applications/graphics/ipe/default.nix @@ -17,19 +17,17 @@ , wrapQtAppsHook , zlib , withTeXLive ? true +, buildPackages }: stdenv.mkDerivation rec { pname = "ipe"; - version = "7.2.26"; + version = "7.2.27"; src = fetchurl { url = "https://github.com/otfried/ipe/releases/download/v${version}/ipe-${version}-src.tar.gz"; - sha256 = "sha256-5J0AV5E6SlFrIBfwDZrbJnkDUoVZ0fDH669s2RQ1CqU="; + sha256 = "sha256-wx/bZy8kB7dpZsz58BeRGdS1BzbrIoafgEmLyFg7wZU="; }; - patches = [ - ./headers-lookup.patch - ]; nativeBuildInputs = [ pkg-config copyDesktopItems wrapQtAppsHook ]; @@ -52,6 +50,7 @@ stdenv.mkDerivation rec { "-C src" "IPEPREFIX=${placeholder "out"}" "LUA_PACKAGE=lua" + "MOC=${buildPackages.qt6Packages.qtbase}/libexec/moc" "IPE_NO_SPELLCHECK=1" # qtSpell is not yet packaged ]; diff --git a/pkgs/applications/graphics/ipe/headers-lookup.patch b/pkgs/applications/graphics/ipe/headers-lookup.patch deleted file mode 100644 index a6adf1b16474..000000000000 --- a/pkgs/applications/graphics/ipe/headers-lookup.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/ipepresenter/Makefile b/src/ipepresenter/Makefile -index ae3664e..f4f74ff 100644 ---- a/src/ipepresenter/Makefile -+++ b/src/ipepresenter/Makefile -@@ -8,7 +8,7 @@ include ../common.mak - - TARGET = $(call exe_target,ipepresenter) - --CXXFLAGS += -I../include -I../ipecanvas -I../ipecairo \ -+CPPFLAGS += -I../include -I../ipecanvas -I../ipecairo \ - $(UI_CFLAGS) $(CAIRO_CFLAGS) $(ZLIB_CFLAGS) - LIBS += -L$(buildlib) -lipecanvas -lipecairo -lipe \ - $(UI_LIBS) $(CAIRO_LIBS) $(ZLIB_LIBS) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d5b746b49ea9..4a6696664283 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32280,7 +32280,7 @@ with pkgs; lua = lua5_1; }; - ipe = libsForQt5.callPackage ../applications/graphics/ipe { + ipe = qt6Packages.callPackage ../applications/graphics/ipe { ghostscript = ghostscriptX; texlive = texlive.combine { inherit (texlive) scheme-small; }; lua5 = lua5_3; From ce056317e30f1cd8cdba01bcbccba4b47aa09e35 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 27 Jul 2023 14:48:34 +0300 Subject: [PATCH 02/13] libsForQt5.kzones: 0.4 -> 0.5 Diff: https://github.com/gerritdevriese/kzones/compare/v0.4...v0.5 --- pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix index c801199a72a8..95050843d073 100644 --- a/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix +++ b/pkgs/desktops/plasma-5/3rdparty/kwin/scripts/kzones.nix @@ -9,13 +9,13 @@ mkDerivation rec { pname = "kzones"; - version = "0.4"; + version = "0.5"; src = fetchFromGitHub { owner = "gerritdevriese"; repo = "kzones"; rev = "v${version}"; - sha256 = "sha256-E5pi2ttar6bAt7s0m/NCw66Qgg5fL5p5QpXROWuUTvM="; + sha256 = "sha256-0f7Fv5cvRvqNrKjHpU/tLpjiBPN0ExwTDq1p9sdLd4o="; }; buildInputs = [ From 080b5682193fa3d2eca5fa0085e359e3f28e97c6 Mon Sep 17 00:00:00 2001 From: K900 Date: Thu, 27 Jul 2023 17:42:28 +0300 Subject: [PATCH 03/13] sqlcl: 22.4.0.342.1212 -> 23.2.0.178.1027 --- pkgs/development/tools/database/sqlcl/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/development/tools/database/sqlcl/default.nix b/pkgs/development/tools/database/sqlcl/default.nix index ccf3bd4a23d3..67d905ae0565 100644 --- a/pkgs/development/tools/database/sqlcl/default.nix +++ b/pkgs/development/tools/database/sqlcl/default.nix @@ -1,17 +1,12 @@ { lib, stdenv, makeWrapper, requireFile, unzip, jdk }: -let - version = "22.4.0.342.1212"; - fileVersion = "1032835-01"; -in - stdenv.mkDerivation { - - inherit version; +stdenv.mkDerivation rec { pname = "sqlcl"; + version = "23.2.0.178.1027"; src = requireFile rec { url = "https://www.oracle.com/database/sqldeveloper/technologies/sqlcl/download/"; - name = "V${fileVersion}.zip"; + name = "sqlcl-${version}.zip"; message = '' This Nix expression requires that ${name} already be part of the store. To obtain it you need to @@ -37,7 +32,7 @@ in nix-prefetch-url --type sha256 file:///path/to/${name} ''; - sha256 = "0i4xsj502s465fgmlcqn80r8rqzr11mv74x9fzrlbqmkkh5c782k"; + hash = "sha256-wGqLlV88yYJrVblKzeG6VerfsEgCi1JQd49ONZmUB4Y="; }; nativeBuildInputs = [ makeWrapper unzip ]; From 5054472759a3b0df8e18cfe4031a5eff92d4cdc3 Mon Sep 17 00:00:00 2001 From: r-vdp Date: Fri, 28 Jul 2023 18:10:41 +0200 Subject: [PATCH 04/13] nixos: make extendModules retain pkgs on nixos configs --- nixos/lib/eval-config.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index e1242276a74d..81a5ea1750de 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -109,8 +109,10 @@ let nixosWithUserModules = noUserModules.extendModules { modules = allUserModules; }; + withExtraArgs = nixosSystem: nixosSystem // { + inherit extraArgs; + inherit (nixosSystem._module.args) pkgs; + extendModules = args: withExtraArgs (nixosSystem.extendModules args); + }; in -withWarnings nixosWithUserModules // { - inherit extraArgs; - inherit (nixosWithUserModules._module.args) pkgs; -} +withWarnings (withExtraArgs nixosWithUserModules) From 6138453384b5ae4068beeabc261d06db2550e1c3 Mon Sep 17 00:00:00 2001 From: Seong Yong-ju Date: Fri, 7 Jul 2023 21:08:54 +0900 Subject: [PATCH 05/13] ruby-lsp: init at 0.7.4 --- .../ruby-modules/with-packages/Gemfile | 1 + pkgs/top-level/all-packages.nix | 2 + pkgs/top-level/ruby-packages.nix | 206 ++++++++++-------- 3 files changed, 117 insertions(+), 92 deletions(-) diff --git a/pkgs/development/ruby-modules/with-packages/Gemfile b/pkgs/development/ruby-modules/with-packages/Gemfile index b6cfd674cfcf..30cd0f6b72b9 100644 --- a/pkgs/development/ruby-modules/with-packages/Gemfile +++ b/pkgs/development/ruby-modules/with-packages/Gemfile @@ -128,6 +128,7 @@ gem 'rspec' gem 'rubocop' gem 'rubocop-performance' gem 'ruby-libvirt' +gem 'ruby-lsp' gem 'ruby-lxc' gem 'ruby-progressbar' gem 'ruby-terminfo' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f7f0aea87660..8bdb7b241270 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12509,6 +12509,8 @@ with pkgs; rubocop = rubyPackages.rubocop; + ruby-lsp = rubyPackages.ruby-lsp; + runningx = callPackage ../tools/X11/runningx { }; rund = callPackage ../development/tools/rund { }; diff --git a/pkgs/top-level/ruby-packages.nix b/pkgs/top-level/ruby-packages.nix index 3fe149acae85..4d1b6136a859 100644 --- a/pkgs/top-level/ruby-packages.nix +++ b/pkgs/top-level/ruby-packages.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "001cwsb6496wp8g0nkyjqxgmii63aljydq132yb2ksdp8ml5zlgj"; + sha256 = "1d72cqx1h9c0yl1vc8xakvji00krg118ih6lwqlg5nbw50gbx25c"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; actionmailbox = { dependencies = ["actionpack" "activejob" "activerecord" "activestorage" "activesupport" "mail" "net-imap" "net-pop" "net-smtp"]; @@ -16,10 +16,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0d990xy3jin8qa4l989r43kl5ykmi2kdlxqpnla10n5c7xp7xmci"; + sha256 = "12xkyfdpr7ljnd31yhc2kzl0rqrlwxzpg4qcn4yb2h364hwc6fh8"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; actionmailer = { dependencies = ["actionpack" "actionview" "activejob" "activesupport" "mail" "net-imap" "net-pop" "net-smtp" "rails-dom-testing"]; @@ -27,10 +27,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "033981lhbq0vl8ppfpamqpqj3sq15x759899hvwli2imp3yw49r5"; + sha256 = "01x11ijfg56585vj7a7az0235idnxcnyjp1nb1jvkm08jjll5d1k"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; actionpack = { dependencies = ["actionview" "activesupport" "rack" "rack-test" "rails-dom-testing" "rails-html-sanitizer"]; @@ -38,10 +38,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0w717izq6k7wl2j6zn4516kg2iwg3zgdzja6b6gpk6y5nccr04hw"; + sha256 = "0d66w1d9rhvafd0dilqyr1ymsvr060l8hi0xvwij7cyvzzxrlrbc"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; actiontext = { dependencies = ["actionpack" "activerecord" "activestorage" "activesupport" "globalid" "nokogiri"]; @@ -49,10 +49,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bcpjhhbq6gl4h7hq2fianfz8vpdxf53gsj1ng04bkh5bxxrmrc1"; + sha256 = "0bpyfh8g0mzgkb8bxvf245mwnx1awbr1y6dxcdckyhsjjgrfynfl"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; actionview = { dependencies = ["activesupport" "builder" "erubi" "rails-dom-testing" "rails-html-sanitizer"]; @@ -60,10 +60,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z0xvdal339w7jvk7a5py0c1q5xh588vqrilgxizkvzm3hwf48a2"; + sha256 = "1icfh9pgjpd29apzn07cnqa9nlpvjv7i4vrygack5gp7hp54l8m7"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; activejob = { dependencies = ["activesupport" "globalid"]; @@ -71,10 +71,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "18gsxi7vlg8y8k2fbhq44zd0mivjpnn4nrlfj037c7wvq5h8367v"; + sha256 = "1gawwb6550ra1xgbrki03aq4q5wafa3xfrpdr3cva4ghy3qqn53q"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; activemodel = { dependencies = ["activesupport"]; @@ -82,10 +82,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0cjbk1xl6jl2d6sczpxnr8da7zbmshmrghqhqdcwqqzl6chcy2si"; + sha256 = "072iv0d3vpbp0xijg4jj99sjil1rykmqfj9addxj76bm5mbzwcaj"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; activerecord = { dependencies = ["activemodel" "activesupport"]; @@ -93,10 +93,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04x0bz3051linhmi52cfg31nsm4sgg27m7wp9p0cxrxdwc7q0bjl"; + sha256 = "1l0rn43bhyzlfa4wwcfz016vb4lkzvl0jf5zibkjy4sppxxixzrq"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; activestorage = { dependencies = ["actionpack" "activejob" "activerecord" "activesupport" "marcel" "mini_mime"]; @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0mg236x3rkmdargkk9y6j9gqhkajzbk852gwnp1crp0difk7a4r8"; + sha256 = "036mv935r5mmh7fljz10lyr43c5y5bn8b6h7gdkv8spfgwzihw4j"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; activesupport = { dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; @@ -115,10 +115,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1c7k5i6531z5il4q1jnbrv7x7zcl3bgnxp5fzl71rzigk6zn53ym"; + sha256 = "1cjsf26656996hv48wgv2mkwxf0fy1qc68ikgzq7mzfq2mmvmayk"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; addressable = { dependencies = ["public_suffix"]; @@ -168,10 +168,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dk1dxz6rshll9hk33halpnfrab1gzr8dgrb4d1zdhw5n30k3zsa"; + sha256 = "0r3g92r9dnvbwklm8dx6w3ym8xhz90a2hs2sdarwhhydfyzxdcrj"; type = "gem"; }; - version = "4.1.7"; + version = "4.1.8"; }; atomos = { groups = ["default"]; @@ -260,10 +260,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v5j3szb30d0i5x9bx85bmqz028qcaxswifvhgh7qy1bby4j5mis"; + sha256 = "1vbq8gprb99anlxijc7hwamfvshd6w1k6kwwg5gs2c674nln1hqf"; type = "gem"; }; - version = "4.1.7"; + version = "4.1.8"; }; camping = { dependencies = ["mab" "rack"]; @@ -332,10 +332,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0r5khhp71q1hysg2b541pdlw1fjrjibgfsfl7fcy8zm9hil9rrkb"; + sha256 = "0rn46vga5c1ww2vkf4dbg0w5g4h0vwx9idvdz3284188q4ksfbmg"; type = "gem"; }; - version = "3.5.3"; + version = "3.6.0"; }; cocoapods = { dependencies = ["addressable" "claide" "cocoapods-core" "cocoapods-deintegrate" "cocoapods-downloader" "cocoapods-plugins" "cocoapods-search" "cocoapods-trunk" "cocoapods-try" "colored2" "escape" "fourflusher" "gh_inspector" "molinillo" "nap" "ruby-macho" "xcodeproj"]; @@ -964,10 +964,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1ai4cxnymjp7c2xqbfksks82aah0pbyjsl3r2cgc4iimrw2wg8qy"; + sha256 = "187clqhp9mv5mnqmjlfdp57svhsg1bggz84ak8v333j9skrnrgh9"; type = "gem"; }; - version = "2.7.7"; + version = "2.7.10"; }; faraday-net_http = { groups = ["default"]; @@ -1100,10 +1100,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1p9hyhfcdzp8ikidilwkiicz5zw2zpvmq7sa85bpf5sra82syvxg"; + sha256 = "0qr0dn4p3nrqnb8qjdlnsfhz80viv4fn86a450imabr76mr88fs3"; type = "gem"; }; - version = "4.1.7"; + version = "4.1.8"; }; gemoji = { groups = ["default"]; @@ -1131,10 +1131,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1gpjg0d4f0l0fyx96h4djq6jsbd20ai65vbwh2f19359bpmad1yh"; + sha256 = "1jl1ng4db6iaa6yddvp69c61r7483kwvcr57hj3qm9pddkgf0bp0"; type = "gem"; }; - version = "4.1.7"; + version = "4.1.8"; }; git = { dependencies = ["addressable" "rchardet"]; @@ -1185,10 +1185,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19pwbfjc8px03jsh26sbsszrmhil3zbvkpq8cjm5953s8zc8yygl"; + sha256 = "00r3357m7fdvhsy1xi93bvvih4jgwf8lbg8dwrz2mggi1v6nh6n4"; type = "gem"; }; - version = "4.1.7"; + version = "4.1.8"; }; globalid = { dependencies = ["activesupport"]; @@ -1207,10 +1207,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bgzjfzvb2fb04c5dfzyx3qsq0d8xz1hy24nidy6a7dbg88aj6hy"; + sha256 = "00lai12z92y6kidsrwnw0d386bwyzjrw0z07ifjxqn5zpyasgvkb"; type = "gem"; }; - version = "4.1.7"; + version = "4.1.8"; }; gpgme = { dependencies = ["mini_portile2"]; @@ -1868,15 +1868,15 @@ version = "2.2.1"; }; jekyll-webmention_io = { - dependencies = ["htmlbeautifier" "jekyll" "json" "openssl" "string_inflection" "uglifier" "webmention"]; + dependencies = ["activesupport" "htmlbeautifier" "jekyll" "json" "jsonpath" "openssl" "uglifier" "webmention"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "003lwcl00l13c5r1i1zk5q1p8m50nv83w6h3j2mij6hs2aaz1zwb"; + sha256 = "0kkxvr1gfbmfbhy13syq4pqwmfqwhnbfcwjiqrwahf99gfcj5izh"; type = "gem"; }; - version = "3.3.7"; + version = "4.0.0"; }; jemoji = { dependencies = ["gemoji" "html-pipeline" "jekyll"]; @@ -1919,6 +1919,17 @@ }; version = "2.6.3"; }; + jsonpath = { + dependencies = ["multi_json"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xxklfvmwz8z6l08704x65gnq6r8r1pb9qk125qjbndnb1zz6fsp"; + type = "gem"; + }; + version = "1.0.7"; + }; jwt = { groups = ["default"]; platforms = []; @@ -2174,10 +2185,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0z7f38iq37h376n9xbl4gajdrnwzq284c9v1py4imw3gri2d5cj6"; + sha256 = "02mj8mpd6ck5gpcnsimx5brzggw5h5mmmpq2djdypfq16wcw82qq"; type = "gem"; }; - version = "2.8.2"; + version = "2.8.4"; }; minima = { dependencies = ["jekyll" "jekyll-feed" "jekyll-seo-tag"]; @@ -2195,10 +2206,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1kg9wh7jlc9zsr3hkhpzkbn0ynf4np5ap9m2d8xdrb8shy0y6pmb"; + sha256 = "0jnpsbb2dbcs95p4is4431l2pw1l5pn7dfg3vkgb4ga464j0c5l6"; type = "gem"; }; - version = "5.18.1"; + version = "5.19.0"; }; molinillo = { groups = ["default"]; @@ -2215,10 +2226,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06n7556vxr3awh92xy1k5bli98bvq4pjm08mnl68ay4fzln7lcsg"; + sha256 = "1a5adcb7bwan09mqhj3wi9ib52hmdzmqg7q08pggn3adibyn5asr"; type = "gem"; }; - version = "1.7.1"; + version = "1.7.2"; }; multi_json = { groups = ["default"]; @@ -2297,10 +2308,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1k1qyjr9lkk5y3483k6wk6d9h1jx4v5hzby1mf0pj3b4kr2arxbm"; + sha256 = "0lf7wqg7czhaj51qsnmn28j7jmcxhkh3m28rl1cjrqsgjxhwj7r3"; type = "gem"; }; - version = "0.3.6"; + version = "0.3.7"; }; net-pop = { dependencies = ["net-protocol"]; @@ -2382,10 +2393,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1mr2ibfk874ncv0qbdkynay738w2mfinlkhnbd5lyk5yiw5q1p10"; + sha256 = "1jw8a20a9k05fpz3q24im19b97idss3179z76yn5scc5b8lk2rl7"; type = "gem"; }; - version = "1.15.2"; + version = "1.15.3"; }; octokit = { dependencies = ["faraday" "sawyer"]; @@ -2468,10 +2479,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hak6b4j0xvq2n12wfmd8666284nwig3fgwi5chcirpp5c0mgj2h"; + sha256 = "1707vylw6yix9q92bpnvn5dflnywx5bh69awyirvn4g39p2yjc2b"; type = "gem"; }; - version = "4.1.7"; + version = "4.1.8"; }; parallel = { groups = ["default"]; @@ -2499,10 +2510,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "146x3jhipg55q9ig7l0x8sryanz1zfhai2vszmih7wmf8zi043gl"; + sha256 = "07jn3rndwfrqlziknhrqlvn523xb5kirnpbcmb4h4hw5npf67nii"; type = "gem"; }; - version = "1.1.1"; + version = "1.1.2"; }; pastel = { dependencies = ["tty-color"]; @@ -2582,10 +2593,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1pxk8pl4gmdmvm4jjhi8apwc23cyqs7rgp5bi4q2gi93k927w3x8"; + sha256 = "1y7p5712grf8sd4kmk9i62qs9mak2fd8685i78qv95wdz3g2csaa"; type = "gem"; }; - version = "3.2.2"; + version = "4.0.2"; }; prettier_print = { groups = ["default"]; @@ -2699,21 +2710,21 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zip0qhk7pp6cvrir77p6v76wj68zaqik875qr5rapqz9am2pvsp"; + sha256 = "08glp6jhq5yh8i5jjxzqa3aqx819l6ci6m68bx1asmimla0x9ysx"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; rails-dom-testing = { - dependencies = ["activesupport" "nokogiri"]; + dependencies = ["activesupport" "minitest" "nokogiri"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lfq2a7kp2x64dzzi5p4cjcbiv62vxh9lyqk2f0rqq3fkzrw8h5i"; + sha256 = "17g05y7q7934z0ib4aph8h71c2qwjmlakkm7nb2ab45q0aqkfgjd"; type = "gem"; }; - version = "2.0.3"; + version = "2.1.1"; }; rails-html-sanitizer = { dependencies = ["loofah" "nokogiri"]; @@ -2732,10 +2743,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0kn3cx00jnb7bjnh1k2q0dxk0r7nl1a0krgyk5ykxw1wcac81wyw"; + sha256 = "0dcabk5bl5flmspnb9d2qcvclcaw0nd5yr9w6m5pzsmylg3y63pv"; type = "gem"; }; - version = "7.0.5"; + version = "7.0.6"; }; rainbow = { groups = ["default"]; @@ -2824,10 +2835,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1habsrf67d3m5p12wc2bydsa7bj87r7w1266x8in59znf5wz4drf"; + sha256 = "00yryimbkm1k85n99f81n7cripkmh14459c9pmb7prl9nbiikkqc"; type = "gem"; }; - version = "1.6.0"; + version = "1.7.0"; }; red-colors = { dependencies = ["matrix"]; @@ -2931,10 +2942,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08ximcyfjy94pm1rhcx04ny1vx2sk0x4y185gzn86yfsbzwkng53"; + sha256 = "05i8518ay14kjbma550mv0jm8a6di8yp5phzrd8rj44z9qnrlrp0"; type = "gem"; }; - version = "3.2.5"; + version = "3.2.6"; }; rmagick = { dependencies = ["pkg-config"]; @@ -2942,10 +2953,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vcfjv6miia6qfnig2yqs42cwnj6jphi2llys7dsh4xykgcs6298"; + sha256 = "080h8755lks9395a2s4ijavzcsgp62367damj0dxif92jdayllzs"; type = "gem"; }; - version = "5.2.0"; + version = "5.3.0"; }; rouge = { groups = ["default"]; @@ -3006,20 +3017,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1hfm17xakfvwya236graj6c2arr4sb9zasp35q5fykhyz8mhs0w2"; + sha256 = "1gq7gviwpck7fhp4y5ibljljvxgjklza18j62qf6zkm2icaa8lfy"; type = "gem"; }; - version = "3.12.5"; + version = "3.12.6"; }; rspec-support = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12y52zwwb3xr7h91dy9k3ndmyyhr3mjcayk0nnarnrzz8yr48kfx"; + sha256 = "1ky86j3ksi26ng9ybd7j0qsdf1lpr8mzrmn98yy9gzv801fvhsgr"; type = "gem"; }; - version = "3.12.0"; + version = "3.12.1"; }; rubocop = { dependencies = ["json" "language_server-protocol" "parallel" "parser" "rainbow" "regexp_parser" "rexml" "rubocop-ast" "ruby-progressbar" "unicode-display_width"]; @@ -3027,10 +3038,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b7pf8916k7ps9jdnkn0774n37jpdzp88mzcqdij3h9hvpn6vr81"; + sha256 = "17c94wl2abqzf4fj469mdxzap1sd3410x421nl6mh2w49jsgvpki"; type = "gem"; }; - version = "1.53.0"; + version = "1.55.0"; }; rubocop-ast = { dependencies = ["parser"]; @@ -3086,6 +3097,17 @@ }; version = "0.8.0"; }; + ruby-lsp = { + dependencies = ["language_server-protocol" "sorbet-runtime" "syntax_tree"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1iyxcr34p3hy7rjgrrlg6z9libiqy1als62rk3d37ixsbjdy6iyd"; + type = "gem"; + }; + version = "0.7.4"; + }; ruby-lxc = { groups = ["default"]; platforms = []; @@ -3247,10 +3269,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1brf6h0kg5ssl1sb99gv41y8lk814jqa3nzakb79ywlhyzbn1513"; + sha256 = "0zm5lfvhc1j7nq73s7i4g93kfbb3fg81jicf3sbfh2w5gm59nq7v"; type = "gem"; }; - version = "5.69.0"; + version = "5.70.0"; }; sequel_pg = { dependencies = ["pg" "sequel"]; @@ -3368,6 +3390,16 @@ }; version = "0.49.0"; }; + sorbet-runtime = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0n197kk9nqf955lsphns835sbkz7wcgbpppad482iqx95bhf8i6l"; + type = "gem"; + }; + version = "0.5.10932"; + }; sqlite3 = { dependencies = ["mini_portile2"]; groups = ["default"]; @@ -3379,16 +3411,6 @@ }; version = "1.6.3"; }; - string_inflection = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0v57afc7rdr58xd6mayf9giifqgav3hqjr54kagi7iki3hn6vjag"; - type = "gem"; - }; - version = "0.1.2"; - }; syntax_tree = { dependencies = ["prettier_print"]; groups = ["default"]; @@ -3635,10 +3657,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0a3bwxd9v3ghrxzjc4vxmf4xa18c6m4xqy5wb0yk5c6b9psc7052"; + sha256 = "1nyh873w4lvahcl8kzbjfca26656d5c6z3md4sbqg5y1gfz0157n"; type = "gem"; }; - version = "0.7.5"; + version = "0.7.6"; }; websocket-extensions = { groups = ["default"]; @@ -3696,10 +3718,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ck6bj7wa73dkdh13735jl06k6cfny98glxjkas82aivlmyzqqbk"; + sha256 = "0v14hl814knwi8pm2n09bpgcd107jafv4lnj9zmcsgfwbqxin3sq"; type = "gem"; }; - version = "2.6.8"; + version = "2.6.9"; }; zookeeper = { groups = ["default"]; From 815295854dfd59bcfe5db6573b1f49f074472909 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= Date: Sat, 29 Jul 2023 17:58:27 +0200 Subject: [PATCH 06/13] musescore: Set ALSA_PLUGIN_DIR. This allows sound to work with e.g. MuseScore via nix-shell on Ubuntu. --- pkgs/applications/audio/musescore/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/audio/musescore/default.nix b/pkgs/applications/audio/musescore/default.nix index fa166051db61..f6d797a4f83f 100644 --- a/pkgs/applications/audio/musescore/default.nix +++ b/pkgs/applications/audio/musescore/default.nix @@ -7,6 +7,7 @@ , pkg-config , ninja , alsa-lib +, alsa-plugins , freetype , libjack2 , lame @@ -85,6 +86,8 @@ in stdenv'.mkDerivation rec { qtWrapperArgs = [ # MuseScore JACK backend loads libjack at runtime. "--prefix ${lib.optionalString stdenv.isDarwin "DY"}LD_LIBRARY_PATH : ${lib.makeLibraryPath [ libjack2 ]}" + ] ++ lib.optionals (stdenv.isLinux) [ + "--set ALSA_PLUGIN_DIR ${alsa-plugins}/lib/alsa-lib" ] ++ lib.optionals (!stdenv.isDarwin) [ # There are some issues with using the wayland backend, see: # https://musescore.org/en/node/321936 From 84d9a1e808d9a0a10f7485b496b3cbf25430cdaf Mon Sep 17 00:00:00 2001 From: David Arnold Date: Sat, 29 Jul 2023 14:57:43 -0500 Subject: [PATCH 07/13] nixos/test-driver: log what to do if backdoor service doesn't come oneline --- nixos/lib/test-driver/test_driver/machine.py | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/lib/test-driver/test_driver/machine.py b/nixos/lib/test-driver/test_driver/machine.py index 789dee101f0c..da27e8759050 100644 --- a/nixos/lib/test-driver/test_driver/machine.py +++ b/nixos/lib/test-driver/test_driver/machine.py @@ -833,6 +833,7 @@ class Machine: # TODO: do we want to bail after a set number of attempts? while not shell_ready(timeout_secs=30): self.log("Guest root shell did not produce any data yet...") + self.log(" To debug, enter the VM and run 'systemctl status backdoor.service'.") while True: chunk = self.shell.recv(1024) From 789d1d4248258ae4818b718387a05397192df29e Mon Sep 17 00:00:00 2001 From: Mostly Void <7rat13@gmail.com> Date: Tue, 30 Aug 2022 21:18:31 +0530 Subject: [PATCH 08/13] stacer: init at 1.1.0 --- pkgs/tools/system/stacer/default.nix | 49 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 51 insertions(+) create mode 100644 pkgs/tools/system/stacer/default.nix diff --git a/pkgs/tools/system/stacer/default.nix b/pkgs/tools/system/stacer/default.nix new file mode 100644 index 000000000000..75068148bd74 --- /dev/null +++ b/pkgs/tools/system/stacer/default.nix @@ -0,0 +1,49 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, qtcharts +, qttools +, wrapQtAppsHook +}: + +stdenv.mkDerivation rec { + pname = "stacer"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "oguzhaninan"; + repo = pname; + rev = "v${version}"; + sha256 = "0qndzzkbq6abapvwq202kva8j619jdn9977sbqmmfs9zkjz4mbsd"; + }; + + postPatch = '' + substituteInPlace stacer/Managers/app_manager.cpp \ + --replace 'qApp->applicationDirPath() + "/translations"' \ + 'QStandardPaths::locate(QStandardPaths::AppDataLocation, "translations", QStandardPaths::LocateDirectory)' + ''; + + buildInputs = [ + qtcharts + qttools + ]; + + nativeBuildInputs = [ cmake wrapQtAppsHook ]; + + preConfigure = '' + lrelease stacer/stacer.pro + ''; + + postInstall = '' + install -Dm644 ../translations/*.qm -t $out/share/stacer/translations + ''; + + meta = with lib; { + description = "Linux System Optimizer and Monitoring"; + homepage = "https://github.com/oguzhaninan/stacer"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ dit7ya ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aab96ffb2ac2..d46430143256 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13011,6 +13011,8 @@ with pkgs; stabber = callPackage ../misc/stabber { }; + stacer = libsForQt5.callPackage ../tools/system/stacer { }; + starcharts = callPackage ../servers/misc/starcharts { }; staticjinja = with python3.pkgs; toPythonApplication staticjinja; From 6ae8e13396ead898761732ccff3ec5351d9fed2a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 30 Jul 2023 03:07:52 +0200 Subject: [PATCH 09/13] nixos/matrix-appservice-irc: update syscall filter Simplify the SystemcallFilter by employing an explicit allow list, and an explicit block list. Node since version 18 requires syscalls in the @pkey group. Excluding @privileged and @resources is a recommendation in systemd-analyze. --- nixos/modules/services/matrix/appservice-irc.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/matrix/appservice-irc.nix b/nixos/modules/services/matrix/appservice-irc.nix index 5526df785c35..8883d604b2ea 100644 --- a/nixos/modules/services/matrix/appservice-irc.nix +++ b/nixos/modules/services/matrix/appservice-irc.nix @@ -215,7 +215,10 @@ in { LockPersonality = true; RestrictRealtime = true; PrivateMounts = true; - SystemCallFilter = "~@aio @clock @cpu-emulation @debug @keyring @memlock @module @mount @obsolete @raw-io @setuid @swap"; + SystemCallFilter = [ + "@system-service @pkey" + "~@privileged @resources" + ]; SystemCallArchitectures = "native"; # AF_UNIX is required to connect to a postgres socket. RestrictAddressFamilies = "AF_UNIX AF_INET AF_INET6"; From 14a259a91ef1489fd534d479316135a75f2985ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Jul 2023 02:12:48 +0000 Subject: [PATCH 10/13] werf: 1.2.242 -> 1.2.248 --- pkgs/applications/networking/cluster/werf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/werf/default.nix b/pkgs/applications/networking/cluster/werf/default.nix index 63811d27b7eb..11165cbc8fb6 100644 --- a/pkgs/applications/networking/cluster/werf/default.nix +++ b/pkgs/applications/networking/cluster/werf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.242"; + version = "1.2.248"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - hash = "sha256-cYEhqoCkJtBRQuQDViA+x5Ow5bUB5Y2lZZf18cm5ig8="; + hash = "sha256-z8XuMByI6B49XCgsZWVjErzcmthCCnpE6LdIfHEpxyA="; }; - vendorHash = "sha256-tNTjPIVfviUZ4ONDyQI3M+DIzZvvPbBPdVu0Du+PIdg="; + vendorHash = "sha256-mt/2Pc1xF6seMZiSxQFQ6bfUxpQCgG3WkjZd0utWbiw="; proxyVendor = true; From 90c8630a9a361e712172eabf7a8c3c4786286831 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 29 Jul 2023 23:30:04 +0300 Subject: [PATCH 11/13] cpp-utilities: build as a shared library This is required to get some header-only definitions set up so that applications using them export symbols properly. --- pkgs/development/libraries/cpp-utilities/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/cpp-utilities/default.nix b/pkgs/development/libraries/cpp-utilities/default.nix index 45a87690e197..c3731c0e7a75 100644 --- a/pkgs/development/libraries/cpp-utilities/default.nix +++ b/pkgs/development/libraries/cpp-utilities/default.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { buildInputs = lib.optionals stdenv.isDarwin [ iconv # needed on Darwin, see https://github.com/Martchus/cpp-utilities/issues/4 ]; + + cmakeFlags = ["-DBUILD_SHARED_LIBS=ON"]; + # Otherwise, tests fail since the resulting shared object libc++utilities.so is only available in PWD of the make files preCheck = '' checkFlagsArray+=( From 8767f7a362169ee96715b6953c6a78623d682636 Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 29 Jul 2023 23:30:04 +0300 Subject: [PATCH 12/13] qtutilities: build as a shared library --- pkgs/development/libraries/qtutilities/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/qtutilities/default.nix b/pkgs/development/libraries/qtutilities/default.nix index 9b866a26e698..93ecaa698f7a 100644 --- a/pkgs/development/libraries/qtutilities/default.nix +++ b/pkgs/development/libraries/qtutilities/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation rec { buildInputs = [ qtbase cpp-utilities ]; nativeBuildInputs = [ cmake qttools ]; + cmakeFlags = ["-DBUILD_SHARED_LIBS=ON"]; + dontWrapQtApps = true; meta = with lib; { From a8e308bff1b34c00808eb1e8b0a194c5ade2cd0d Mon Sep 17 00:00:00 2001 From: K900 Date: Sat, 29 Jul 2023 23:30:04 +0300 Subject: [PATCH 13/13] syncthingtray: build as a shared library, small cleanup This makes the plasmoid actually work. --- pkgs/applications/misc/syncthingtray/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/syncthingtray/default.nix b/pkgs/applications/misc/syncthingtray/default.nix index 96e77baf3025..65c80cc81f1c 100644 --- a/pkgs/applications/misc/syncthingtray/default.nix +++ b/pkgs/applications/misc/syncthingtray/default.nix @@ -70,7 +70,8 @@ mkDerivation rec { cmakeFlags = [ "-DAUTOSTART_EXEC_PATH=${autostartExecPath}" # See https://github.com/Martchus/syncthingtray/issues/42 - "-DQT_PLUGIN_DIR:STRING=${placeholder "out"}/lib/qt-5" + "-DQT_PLUGIN_DIR:STRING=${placeholder "out"}/${qtbase.qtPluginPrefix}" + "-DBUILD_SHARED_LIBS=ON" ] ++ lib.optionals (!plasmoidSupport) ["-DNO_PLASMOID=ON"] ++ lib.optionals (!kioPluginSupport) ["-DNO_FILE_ITEM_ACTION_PLUGIN=ON"] ++ lib.optionals systemdSupport ["-DSYSTEMD_SUPPORT=ON"]