Clone of https://github.com/NixOS/nixpkgs.git (to stress-test knotserver)

Merge master into haskell-updates

authored by github-actions[bot] and committed by GitHub 05ce1c8c 5e9a1bf8

+2490 -1071
+1 -1
doc/hooks/python.section.md
··· 1 1 # Python {#setup-hook-python} 2 2 3 - Adds the `lib/${python.libPrefix}/site-packages` subdirectory of each build input to the `PYTHONPATH` environment variable. 3 + Adds the `python.sitePackages` subdirectory (i.e. `lib/pythonX.Y/site-packages`) of each build input to the `PYTHONPATH` environment variable.
+30 -26
doc/languages-frameworks/haskell.section.md
··· 1229 1229 in 1230 1230 1231 1231 { 1232 - haskell = lib.recursiveUpdate prev.haskell { 1233 - compiler.${ghcName} = prev.haskell.compiler.${ghcName}.override { 1234 - # Unfortunately, the GHC setting is named differently for historical reasons 1235 - enableProfiledLibs = enableProfiling; 1232 + haskell = prev.haskell // { 1233 + compiler = prev.haskell.compiler // { 1234 + ${ghcName} = prev.haskell.compiler.${ghcName}.override { 1235 + # Unfortunately, the GHC setting is named differently for historical reasons 1236 + enableProfiledLibs = enableProfiling; 1237 + }; 1236 1238 }; 1237 1239 }; 1238 1240 }) ··· 1244 1246 in 1245 1247 1246 1248 { 1247 - haskell = lib.recursiveUpdate prev.haskell { 1248 - packages.${ghcName} = prev.haskell.packages.${ghcName}.override { 1249 - overrides = hfinal: hprev: { 1250 - mkDerivation = args: hprev.mkDerivation (args // { 1251 - # Since we are forcing our ideas upon mkDerivation, this change will 1252 - # affect every package in the package set. 1253 - enableLibraryProfiling = enableProfiling; 1249 + haskell = prev.haskell // { 1250 + packages = prev.haskell.packages // { 1251 + ${ghcName} = prev.haskell.packages.${ghcName}.override { 1252 + overrides = hfinal: hprev: { 1253 + mkDerivation = args: hprev.mkDerivation (args // { 1254 + # Since we are forcing our ideas upon mkDerivation, this change will 1255 + # affect every package in the package set. 1256 + enableLibraryProfiling = enableProfiling; 1254 1257 1255 - # To actually use profiling on an executable, executable profiling 1256 - # needs to be enabled for the executable you want to profile. You 1257 - # can either do this globally or… 1258 - enableExecutableProfiling = enableProfiling; 1259 - }); 1258 + # To actually use profiling on an executable, executable profiling 1259 + # needs to be enabled for the executable you want to profile. You 1260 + # can either do this globally or… 1261 + enableExecutableProfiling = enableProfiling; 1262 + }); 1260 1263 1261 - # …only for the package that contains an executable you want to profile. 1262 - # That saves on unnecessary rebuilds for packages that you only depend 1263 - # on for their library, but also contain executables (e.g. pandoc). 1264 - my-executable = haskellLib.enableExecutableProfiling hprev.my-executable; 1264 + # …only for the package that contains an executable you want to profile. 1265 + # That saves on unnecessary rebuilds for packages that you only depend 1266 + # on for their library, but also contain executables (e.g. pandoc). 1267 + my-executable = haskellLib.enableExecutableProfiling hprev.my-executable; 1265 1268 1266 - # If you are disabling profiling to save on build time, but want to 1267 - # retain the ability to substitute from the binary cache. Drop the 1268 - # override for mkDerivation above and instead have an override like 1269 - # this for the specific packages you are building locally and want 1270 - # to make cheaper to build. 1271 - my-library = haskellLib.disableLibraryProfiling hprev.my-library; 1269 + # If you are disabling profiling to save on build time, but want to 1270 + # retain the ability to substitute from the binary cache. Drop the 1271 + # override for mkDerivation above and instead have an override like 1272 + # this for the specific packages you are building locally and want 1273 + # to make cheaper to build. 1274 + my-library = haskellLib.disableLibraryProfiling hprev.my-library; 1275 + }; 1272 1276 }; 1273 1277 }; 1274 1278 };
+6
maintainers/maintainer-list.nix
··· 10107 10107 githubId = 264372; 10108 10108 name = "Jan van den Berg"; 10109 10109 }; 10110 + koppor = { 10111 + email = "kopp.dev@gmail.com"; 10112 + github = "koppor"; 10113 + githubId = 1366654; 10114 + name = "Oliver Kopp"; 10115 + }; 10110 10116 koral = { 10111 10117 email = "koral@mailoo.org"; 10112 10118 github = "k0ral";
+2
nixos/doc/manual/release-notes/rl-2405.section.md
··· 50 50 51 51 - [GNS3](https://www.gns3.com/), a network software emulator. Available as [services.gns3-server](#opt-services.gns3-server.enable). 52 52 53 + - [pretalx](https://github.com/pretalx/pretalx), a conference planning tool. Available as [services.pretalx](#opt-services.pretalx.enable). 54 + 53 55 - [rspamd-trainer](https://gitlab.com/onlime/rspamd-trainer), script triggered by a helper which reads mails from a specific mail inbox and feeds them into rspamd for spam/ham training. 54 56 55 57 - [ollama](https://ollama.ai), server for running large language models locally.
+1
nixos/modules/module-list.nix
··· 1343 1343 ./services/web-apps/plantuml-server.nix 1344 1344 ./services/web-apps/plausible.nix 1345 1345 ./services/web-apps/powerdns-admin.nix 1346 + ./services/web-apps/pretalx.nix 1346 1347 ./services/web-apps/prosody-filer.nix 1347 1348 ./services/web-apps/restya-board.nix 1348 1349 ./services/web-apps/rimgo.nix
-1
nixos/modules/services/hardware/acpid.nix
··· 135 135 wantedBy = [ "multi-user.target" ]; 136 136 137 137 serviceConfig = { 138 - PrivateNetwork = true; 139 138 ExecStart = escapeShellArgs 140 139 ([ "${pkgs.acpid}/bin/acpid" 141 140 "--foreground"
-1
nixos/modules/services/monitoring/prometheus/exporters.nix
··· 60 60 "node" 61 61 "nut" 62 62 "openldap" 63 - "openvpn" 64 63 "pgbouncer" 65 64 "php-fpm" 66 65 "pihole"
-39
nixos/modules/services/monitoring/prometheus/exporters/openvpn.nix
··· 1 - { config, pkgs, lib, ... }: 2 - 3 - with lib; 4 - 5 - let 6 - cfg = config.services.prometheus.exporters.openvpn; 7 - in { 8 - port = 9176; 9 - extraOpts = { 10 - statusPaths = mkOption { 11 - type = types.listOf types.str; 12 - description = lib.mdDoc '' 13 - Paths to OpenVPN status files. Please configure the OpenVPN option 14 - `status` accordingly. 15 - ''; 16 - }; 17 - telemetryPath = mkOption { 18 - type = types.str; 19 - default = "/metrics"; 20 - description = lib.mdDoc '' 21 - Path under which to expose metrics. 22 - ''; 23 - }; 24 - }; 25 - 26 - serviceOpts = { 27 - serviceConfig = { 28 - PrivateDevices = true; 29 - ProtectKernelModules = true; 30 - NoNewPrivileges = true; 31 - ExecStart = '' 32 - ${pkgs.prometheus-openvpn-exporter}/bin/openvpn_exporter \ 33 - -openvpn.status_paths "${concatStringsSep "," cfg.statusPaths}" \ 34 - -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ 35 - -web.telemetry-path ${cfg.telemetryPath} 36 - ''; 37 - }; 38 - }; 39 - }
+1
nixos/modules/services/monitoring/prometheus/exporters/snmp.nix
··· 3 3 with lib; 4 4 5 5 let 6 + logPrefix = "services.prometheus.exporters.snmp"; 6 7 cfg = config.services.prometheus.exporters.snmp; 7 8 8 9 # This ensures that we can deal with string paths, path types and
+142 -136
nixos/modules/services/networking/seafile.nix
··· 32 32 dataDir = "${seafRoot}/data"; 33 33 seahubDir = "${seafRoot}/seahub"; 34 34 35 - in { 35 + in 36 + { 36 37 37 38 ###### Interface 38 39 ··· 147 148 description = "Seafile components"; 148 149 }; 149 150 150 - systemd.services = let 151 - securityOptions = { 152 - ProtectHome = true; 153 - PrivateUsers = true; 154 - PrivateDevices = true; 155 - ProtectClock = true; 156 - ProtectHostname = true; 157 - ProtectProc = "invisible"; 158 - ProtectKernelModules = true; 159 - ProtectKernelTunables = true; 160 - ProtectKernelLogs = true; 161 - ProtectControlGroups = true; 162 - RestrictNamespaces = true; 163 - LockPersonality = true; 164 - RestrictRealtime = true; 165 - RestrictSUIDSGID = true; 166 - MemoryDenyWriteExecute = true; 167 - SystemCallArchitectures = "native"; 168 - RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" ]; 169 - }; 170 - in { 171 - seaf-server = { 172 - description = "Seafile server"; 173 - partOf = [ "seafile.target" ]; 174 - after = [ "network.target" ]; 175 - wantedBy = [ "seafile.target" ]; 176 - restartTriggers = [ ccnetConf seafileConf ]; 177 - path = [ pkgs.sqlite ]; 178 - serviceConfig = securityOptions // { 179 - User = "seafile"; 180 - Group = "seafile"; 181 - DynamicUser = true; 182 - StateDirectory = "seafile"; 183 - RuntimeDirectory = "seafile"; 184 - LogsDirectory = "seafile"; 185 - ConfigurationDirectory = "seafile"; 186 - ExecStart = '' 187 - ${cfg.seafilePackage}/bin/seaf-server \ 188 - --foreground \ 189 - -F /etc/seafile \ 190 - -c ${ccnetDir} \ 191 - -d ${dataDir} \ 192 - -l /var/log/seafile/server.log \ 193 - -P /run/seafile/server.pid \ 194 - -p /run/seafile 195 - ''; 151 + systemd.services = 152 + let 153 + securityOptions = { 154 + ProtectHome = true; 155 + PrivateUsers = true; 156 + PrivateDevices = true; 157 + ProtectClock = true; 158 + ProtectHostname = true; 159 + ProtectProc = "invisible"; 160 + ProtectKernelModules = true; 161 + ProtectKernelTunables = true; 162 + ProtectKernelLogs = true; 163 + ProtectControlGroups = true; 164 + RestrictNamespaces = true; 165 + LockPersonality = true; 166 + RestrictRealtime = true; 167 + RestrictSUIDSGID = true; 168 + MemoryDenyWriteExecute = true; 169 + SystemCallArchitectures = "native"; 170 + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" ]; 196 171 }; 197 - preStart = '' 198 - if [ ! -f "${seafRoot}/server-setup" ]; then 199 - mkdir -p ${dataDir}/library-template 200 - mkdir -p ${ccnetDir}/{GroupMgr,misc,OrgMgr,PeerMgr} 201 - sqlite3 ${ccnetDir}/GroupMgr/groupmgr.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/groupmgr.sql" 202 - sqlite3 ${ccnetDir}/misc/config.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/config.sql" 203 - sqlite3 ${ccnetDir}/OrgMgr/orgmgr.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/org.sql" 204 - sqlite3 ${ccnetDir}/PeerMgr/usermgr.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/user.sql" 205 - sqlite3 ${dataDir}/seafile.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/seafile.sql" 206 - echo "${cfg.seafilePackage.version}-sqlite" > "${seafRoot}"/server-setup 207 - fi 208 - # checking for upgrades and handling them 209 - # WARNING: needs to be extended to actually handle major version migrations 210 - installedMajor=$(cat "${seafRoot}/server-setup" | cut -d"-" -f1 | cut -d"." -f1) 211 - installedMinor=$(cat "${seafRoot}/server-setup" | cut -d"-" -f1 | cut -d"." -f2) 212 - pkgMajor=$(echo "${cfg.seafilePackage.version}" | cut -d"." -f1) 213 - pkgMinor=$(echo "${cfg.seafilePackage.version}" | cut -d"." -f2) 214 - 215 - if [[ $installedMajor == $pkgMajor && $installedMinor == $pkgMinor ]]; then 216 - : 217 - elif [[ $installedMajor == 8 && $installedMinor == 0 && $pkgMajor == 9 && $pkgMinor == 0 ]]; then 218 - # Upgrade from 8.0 to 9.0 219 - sqlite3 ${dataDir}/seafile.db ".read ${pkgs.seahub}/scripts/upgrade/sql/9.0.0/sqlite3/seafile.sql" 220 - echo "${cfg.seafilePackage.version}-sqlite" > "${seafRoot}"/server-setup 221 - else 222 - echo "Unsupported upgrade" >&2 223 - exit 1 224 - fi 225 - ''; 226 - }; 172 + in 173 + { 174 + seaf-server = { 175 + description = "Seafile server"; 176 + partOf = [ "seafile.target" ]; 177 + after = [ "network.target" ]; 178 + wantedBy = [ "seafile.target" ]; 179 + restartTriggers = [ ccnetConf seafileConf ]; 180 + path = [ pkgs.sqlite ]; 181 + serviceConfig = securityOptions // { 182 + User = "seafile"; 183 + Group = "seafile"; 184 + DynamicUser = true; 185 + StateDirectory = "seafile"; 186 + RuntimeDirectory = "seafile"; 187 + LogsDirectory = "seafile"; 188 + ConfigurationDirectory = "seafile"; 189 + ExecStart = '' 190 + ${cfg.seafilePackage}/bin/seaf-server \ 191 + --foreground \ 192 + -F /etc/seafile \ 193 + -c ${ccnetDir} \ 194 + -d ${dataDir} \ 195 + -l /var/log/seafile/server.log \ 196 + -P /run/seafile/server.pid \ 197 + -p /run/seafile 198 + ''; 199 + }; 200 + preStart = '' 201 + if [ ! -f "${seafRoot}/server-setup" ]; then 202 + mkdir -p ${dataDir}/library-template 203 + mkdir -p ${ccnetDir}/{GroupMgr,misc,OrgMgr,PeerMgr} 204 + sqlite3 ${ccnetDir}/GroupMgr/groupmgr.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/groupmgr.sql" 205 + sqlite3 ${ccnetDir}/misc/config.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/config.sql" 206 + sqlite3 ${ccnetDir}/OrgMgr/orgmgr.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/org.sql" 207 + sqlite3 ${ccnetDir}/PeerMgr/usermgr.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/user.sql" 208 + sqlite3 ${dataDir}/seafile.db ".read ${cfg.seafilePackage}/share/seafile/sql/sqlite/seafile.sql" 209 + echo "${cfg.seafilePackage.version}-sqlite" > "${seafRoot}"/server-setup 210 + fi 211 + # checking for upgrades and handling them 212 + installedMajor=$(cat "${seafRoot}/server-setup" | cut -d"-" -f1 | cut -d"." -f1) 213 + installedMinor=$(cat "${seafRoot}/server-setup" | cut -d"-" -f1 | cut -d"." -f2) 214 + pkgMajor=$(echo "${cfg.seafilePackage.version}" | cut -d"." -f1) 215 + pkgMinor=$(echo "${cfg.seafilePackage.version}" | cut -d"." -f2) 227 216 228 - seahub = { 229 - description = "Seafile Server Web Frontend"; 230 - wantedBy = [ "seafile.target" ]; 231 - partOf = [ "seafile.target" ]; 232 - after = [ "network.target" "seaf-server.service" ]; 233 - requires = [ "seaf-server.service" ]; 234 - restartTriggers = [ seahubSettings ]; 235 - environment = { 236 - PYTHONPATH = "${pkgs.seahub.pythonPath}:${pkgs.seahub}/thirdpart:${pkgs.seahub}"; 237 - DJANGO_SETTINGS_MODULE = "seahub.settings"; 238 - CCNET_CONF_DIR = ccnetDir; 239 - SEAFILE_CONF_DIR = dataDir; 240 - SEAFILE_CENTRAL_CONF_DIR = "/etc/seafile"; 241 - SEAFILE_RPC_PIPE_PATH = "/run/seafile"; 242 - SEAHUB_LOG_DIR = "/var/log/seafile"; 217 + if [[ $installedMajor == $pkgMajor && $installedMinor == $pkgMinor ]]; then 218 + : 219 + elif [[ $installedMajor == 8 && $installedMinor == 0 && $pkgMajor == 9 && $pkgMinor == 0 ]]; then 220 + # Upgrade from 8.0 to 9.0 221 + sqlite3 ${dataDir}/seafile.db ".read ${pkgs.seahub}/scripts/upgrade/sql/9.0.0/sqlite3/seafile.sql" 222 + echo "${cfg.seafilePackage.version}-sqlite" > "${seafRoot}"/server-setup 223 + elif [[ $installedMajor == 9 && $installedMinor == 0 && $pkgMajor == 10 && $pkgMinor == 0 ]]; then 224 + # Upgrade from 9.0 to 10.0 225 + sqlite3 ${dataDir}/seafile.db ".read ${pkgs.seahub}/scripts/upgrade/sql/10.0.0/sqlite3/seafile.sql" 226 + echo "${cfg.seafilePackage.version}-sqlite" > "${seafRoot}"/server-setup 227 + else 228 + echo "Unsupported upgrade" >&2 229 + exit 1 230 + fi 231 + ''; 243 232 }; 244 - serviceConfig = securityOptions // { 245 - User = "seafile"; 246 - Group = "seafile"; 247 - DynamicUser = true; 248 - RuntimeDirectory = "seahub"; 249 - StateDirectory = "seafile"; 250 - LogsDirectory = "seafile"; 251 - ConfigurationDirectory = "seafile"; 252 - ExecStart = '' 253 - ${pkgs.seahub.python.pkgs.gunicorn}/bin/gunicorn seahub.wsgi:application \ 254 - --name seahub \ 255 - --workers ${toString cfg.workers} \ 256 - --log-level=info \ 257 - --preload \ 258 - --timeout=1200 \ 259 - --limit-request-line=8190 \ 260 - --bind unix:/run/seahub/gunicorn.sock 233 + 234 + seahub = { 235 + description = "Seafile Server Web Frontend"; 236 + wantedBy = [ "seafile.target" ]; 237 + partOf = [ "seafile.target" ]; 238 + after = [ "network.target" "seaf-server.service" ]; 239 + requires = [ "seaf-server.service" ]; 240 + restartTriggers = [ seahubSettings ]; 241 + environment = { 242 + PYTHONPATH = "${pkgs.seahub.pythonPath}:${pkgs.seahub}/thirdpart:${pkgs.seahub}"; 243 + DJANGO_SETTINGS_MODULE = "seahub.settings"; 244 + CCNET_CONF_DIR = ccnetDir; 245 + SEAFILE_CONF_DIR = dataDir; 246 + SEAFILE_CENTRAL_CONF_DIR = "/etc/seafile"; 247 + SEAFILE_RPC_PIPE_PATH = "/run/seafile"; 248 + SEAHUB_LOG_DIR = "/var/log/seafile"; 249 + }; 250 + serviceConfig = securityOptions // { 251 + User = "seafile"; 252 + Group = "seafile"; 253 + DynamicUser = true; 254 + RuntimeDirectory = "seahub"; 255 + StateDirectory = "seafile"; 256 + LogsDirectory = "seafile"; 257 + ConfigurationDirectory = "seafile"; 258 + ExecStart = '' 259 + ${pkgs.seahub.python.pkgs.gunicorn}/bin/gunicorn seahub.wsgi:application \ 260 + --name seahub \ 261 + --workers ${toString cfg.workers} \ 262 + --log-level=info \ 263 + --preload \ 264 + --timeout=1200 \ 265 + --limit-request-line=8190 \ 266 + --bind unix:/run/seahub/gunicorn.sock 267 + ''; 268 + }; 269 + preStart = '' 270 + mkdir -p ${seahubDir}/media 271 + # Link all media except avatars 272 + for m in `find ${pkgs.seahub}/media/ -maxdepth 1 -not -name "avatars"`; do 273 + ln -sf $m ${seahubDir}/media/ 274 + done 275 + if [ ! -e "${seafRoot}/.seahubSecret" ]; then 276 + ${pkgs.seahub.python}/bin/python ${pkgs.seahub}/tools/secret_key_generator.py > ${seafRoot}/.seahubSecret 277 + chmod 400 ${seafRoot}/.seahubSecret 278 + fi 279 + if [ ! -f "${seafRoot}/seahub-setup" ]; then 280 + # avatars directory should be writable 281 + install -D -t ${seahubDir}/media/avatars/ ${pkgs.seahub}/media/avatars/default.png 282 + install -D -t ${seahubDir}/media/avatars/groups ${pkgs.seahub}/media/avatars/groups/default.png 283 + # init database 284 + ${pkgs.seahub}/manage.py migrate 285 + # create admin account 286 + ${pkgs.expect}/bin/expect -c 'spawn ${pkgs.seahub}/manage.py createsuperuser --email=${cfg.adminEmail}; expect "Password: "; send "${cfg.initialAdminPassword}\r"; expect "Password (again): "; send "${cfg.initialAdminPassword}\r"; expect "Superuser created successfully."' 287 + echo "${pkgs.seahub.version}-sqlite" > "${seafRoot}/seahub-setup" 288 + fi 289 + if [ $(cat "${seafRoot}/seahub-setup" | cut -d"-" -f1) != "${pkgs.seahub.version}" ]; then 290 + # update database 291 + ${pkgs.seahub}/manage.py migrate 292 + echo "${pkgs.seahub.version}-sqlite" > "${seafRoot}/seahub-setup" 293 + fi 261 294 ''; 262 295 }; 263 - preStart = '' 264 - mkdir -p ${seahubDir}/media 265 - # Link all media except avatars 266 - for m in `find ${pkgs.seahub}/media/ -maxdepth 1 -not -name "avatars"`; do 267 - ln -sf $m ${seahubDir}/media/ 268 - done 269 - if [ ! -e "${seafRoot}/.seahubSecret" ]; then 270 - ${pkgs.seahub.python}/bin/python ${pkgs.seahub}/tools/secret_key_generator.py > ${seafRoot}/.seahubSecret 271 - chmod 400 ${seafRoot}/.seahubSecret 272 - fi 273 - if [ ! -f "${seafRoot}/seahub-setup" ]; then 274 - # avatars directory should be writable 275 - install -D -t ${seahubDir}/media/avatars/ ${pkgs.seahub}/media/avatars/default.png 276 - install -D -t ${seahubDir}/media/avatars/groups ${pkgs.seahub}/media/avatars/groups/default.png 277 - # init database 278 - ${pkgs.seahub}/manage.py migrate 279 - # create admin account 280 - ${pkgs.expect}/bin/expect -c 'spawn ${pkgs.seahub}/manage.py createsuperuser --email=${cfg.adminEmail}; expect "Password: "; send "${cfg.initialAdminPassword}\r"; expect "Password (again): "; send "${cfg.initialAdminPassword}\r"; expect "Superuser created successfully."' 281 - echo "${pkgs.seahub.version}-sqlite" > "${seafRoot}/seahub-setup" 282 - fi 283 - if [ $(cat "${seafRoot}/seahub-setup" | cut -d"-" -f1) != "${pkgs.seahub.version}" ]; then 284 - # update database 285 - ${pkgs.seahub}/manage.py migrate 286 - echo "${pkgs.seahub.version}-sqlite" > "${seafRoot}/seahub-setup" 287 - fi 288 - ''; 289 296 }; 290 - }; 291 297 }; 292 298 }
+3
nixos/modules/services/web-apps/photoprism.nix
··· 18 18 in 19 19 pkgs.writeShellScript "manage" '' 20 20 ${setupEnv} 21 + eval "$(${config.systemd.package}/bin/systemctl show -pUID,MainPID photoprism.service | ${pkgs.gnused}/bin/sed "s/UID/ServiceUID/")" 22 + exec ${pkgs.util-linux}/bin/nsenter \ 23 + -t $MainPID -m -S $ServiceUID -G $ServiceUID --wdns=${cfg.storagePath} \ 21 24 exec ${cfg.package}/bin/photoprism "$@" 22 25 ''; 23 26 in
+415
nixos/modules/services/web-apps/pretalx.nix
··· 1 + { config 2 + , lib 3 + , pkgs 4 + , utils 5 + , ... 6 + }: 7 + 8 + let 9 + cfg = config.services.pretalx; 10 + format = pkgs.formats.ini { }; 11 + 12 + configFile = format.generate "pretalx.cfg" cfg.settings; 13 + 14 + extras = cfg.package.optional-dependencies.redis 15 + ++ lib.optionals (cfg.settings.database.backend == "mysql") cfg.package.optional-dependencies.mysql 16 + ++ lib.optionals (cfg.settings.database.backend == "postgresql") cfg.package.optional-dependencies.postgres; 17 + 18 + pythonEnv = cfg.package.python.buildEnv.override { 19 + extraLibs = [ (cfg.package.python.pkgs.toPythonModule cfg.package) ] 20 + ++ (with cfg.package.python.pkgs; [ gunicorn ] 21 + ++ lib.optional cfg.celery.enable celery) ++ extras; 22 + }; 23 + in 24 + 25 + { 26 + meta = with lib; { 27 + maintainers = teams.c3d2.members; 28 + }; 29 + 30 + options.services.pretalx = { 31 + enable = lib.mkEnableOption (lib.mdDoc "pretalx"); 32 + 33 + package = lib.mkPackageOptionMD pkgs "pretalx" {}; 34 + 35 + group = lib.mkOption { 36 + type = lib.types.str; 37 + default = "pretalx"; 38 + description = "Group under which pretalx should run."; 39 + }; 40 + 41 + user = lib.mkOption { 42 + type = lib.types.str; 43 + default = "pretalx"; 44 + description = "User under which pretalx should run."; 45 + }; 46 + 47 + gunicorn.extraArgs = lib.mkOption { 48 + type = with lib.types; listOf str; 49 + default = [ 50 + "--name=pretalx" 51 + ]; 52 + example = [ 53 + "--name=pretalx" 54 + "--workers=4" 55 + "--max-requests=1200" 56 + "--max-requests-jitter=50" 57 + "--log-level=info" 58 + ]; 59 + description = lib.mdDoc '' 60 + Extra arguments to pass to gunicorn. 61 + See <https://docs.pretalx.org/administrator/installation.html#step-6-starting-pretalx-as-a-service> for details. 62 + ''; 63 + apply = lib.escapeShellArgs; 64 + }; 65 + 66 + celery = { 67 + enable = lib.mkOption { 68 + type = lib.types.bool; 69 + default = true; 70 + example = false; 71 + description = lib.mdDoc '' 72 + Whether to set up celery as an asynchronous task runner. 73 + ''; 74 + }; 75 + 76 + extraArgs = lib.mkOption { 77 + type = with lib.types; listOf str; 78 + default = [ ]; 79 + description = lib.mdDoc '' 80 + Extra arguments to pass to celery. 81 + 82 + See <https://docs.celeryq.dev/en/stable/reference/cli.html#celery-worker> for more info. 83 + ''; 84 + apply = utils.escapeSystemdExecArgs; 85 + }; 86 + }; 87 + 88 + nginx = { 89 + enable = lib.mkOption { 90 + type = lib.types.bool; 91 + default = true; 92 + example = false; 93 + description = lib.mdDoc '' 94 + Whether to set up an nginx virtual host. 95 + ''; 96 + }; 97 + 98 + domain = lib.mkOption { 99 + type = lib.types.str; 100 + example = "talks.example.com"; 101 + description = lib.mdDoc '' 102 + The domain name under which to set up the virtual host. 103 + ''; 104 + }; 105 + }; 106 + 107 + database.createLocally = lib.mkOption { 108 + type = lib.types.bool; 109 + default = true; 110 + example = false; 111 + description = lib.mdDoc '' 112 + Whether to automatically set up the database on the local DBMS instance. 113 + 114 + Currently only supported for PostgreSQL. Not required for sqlite. 115 + ''; 116 + }; 117 + 118 + settings = lib.mkOption { 119 + type = lib.types.submodule { 120 + freeformType = format.type; 121 + options = { 122 + database = { 123 + backend = lib.mkOption { 124 + type = lib.types.enum [ 125 + "postgresql" 126 + ]; 127 + default = "postgresql"; 128 + description = lib.mdDoc '' 129 + Database backend to use. 130 + 131 + Currently only PostgreSQL gets tested, and as such we don't support any other DBMS. 132 + ''; 133 + readOnly = true; # only postgres supported right now 134 + }; 135 + 136 + host = lib.mkOption { 137 + type = with lib.types; nullOr types.path; 138 + default = if cfg.settings.database.backend == "postgresql" then "/run/postgresql" 139 + else if cfg.settings.database.backend == "mysql" then "/run/mysqld/mysqld.sock" 140 + else null; 141 + defaultText = lib.literalExpression '' 142 + if config.services.pretalx.settings..database.backend == "postgresql" then "/run/postgresql" 143 + else if config.services.pretalx.settings.database.backend == "mysql" then "/run/mysqld/mysqld.sock" 144 + else null 145 + ''; 146 + description = lib.mdDoc '' 147 + Database host or socket path. 148 + ''; 149 + }; 150 + 151 + name = lib.mkOption { 152 + type = lib.types.str; 153 + default = "pretalx"; 154 + description = lib.mdDoc '' 155 + Database name. 156 + ''; 157 + }; 158 + 159 + user = lib.mkOption { 160 + type = lib.types.str; 161 + default = "pretalx"; 162 + description = lib.mdDoc '' 163 + Database username. 164 + ''; 165 + }; 166 + }; 167 + 168 + filesystem = { 169 + data = lib.mkOption { 170 + type = lib.types.path; 171 + default = "/var/lib/pretalx"; 172 + description = lib.mdDoc '' 173 + Base path for all other storage paths. 174 + ''; 175 + }; 176 + logs = lib.mkOption { 177 + type = lib.types.path; 178 + default = "/var/log/pretalx"; 179 + description = lib.mdDoc '' 180 + Path to the log directory, that pretalx logs message to. 181 + ''; 182 + }; 183 + static = lib.mkOption { 184 + type = lib.types.path; 185 + default = "${cfg.package.static}/"; 186 + defaultText = lib.literalExpression "\${config.services.pretalx.package}.static}/"; 187 + readOnly = true; 188 + description = lib.mdDoc '' 189 + Path to the directory that contains static files. 190 + ''; 191 + }; 192 + }; 193 + 194 + celery = { 195 + backend = lib.mkOption { 196 + type = with lib.types; nullOr str; 197 + default = lib.optionalString cfg.celery.enable "redis+socket://${config.services.redis.servers.pretalx.unixSocket}?virtual_host=1"; 198 + defaultText = lib.literalExpression '' 199 + optionalString config.services.pretalx.celery.enable "redis+socket://''${config.services.redis.servers.pretalx.unixSocket}?virtual_host=1" 200 + ''; 201 + description = lib.mdDoc '' 202 + URI to the celery backend used for the asynchronous job queue. 203 + ''; 204 + }; 205 + 206 + broker = lib.mkOption { 207 + type = with lib.types; nullOr str; 208 + default = lib.optionalString cfg.celery.enable "redis+socket://${config.services.redis.servers.pretalx.unixSocket}?virtual_host=2"; 209 + defaultText = lib.literalExpression '' 210 + optionalString config.services.pretalx.celery.enable "redis+socket://''${config.services.redis.servers.pretalx.unixSocket}?virtual_host=2" 211 + ''; 212 + description = lib.mdDoc '' 213 + URI to the celery broker used for the asynchronous job queue. 214 + ''; 215 + }; 216 + }; 217 + 218 + redis = { 219 + location = lib.mkOption { 220 + type = with lib.types; nullOr str; 221 + default = "unix://${config.services.redis.servers.pretalx.unixSocket}?db=0"; 222 + defaultText = lib.literalExpression '' 223 + "unix://''${config.services.redis.servers.pretalx.unixSocket}?db=0" 224 + ''; 225 + description = lib.mdDoc '' 226 + URI to the redis server, used to speed up locking, caching and session storage. 227 + ''; 228 + }; 229 + 230 + session = lib.mkOption { 231 + type = lib.types.bool; 232 + default = true; 233 + example = false; 234 + description = lib.mdDoc '' 235 + Whether to use redis as the session storage. 236 + ''; 237 + }; 238 + }; 239 + 240 + site = { 241 + url = lib.mkOption { 242 + type = lib.types.str; 243 + default = "https://${cfg.nginx.domain}"; 244 + defaultText = lib.literalExpression "https://\${config.services.pretalx.nginx.domain}"; 245 + example = "https://talks.example.com"; 246 + description = lib.mdDoc '' 247 + The base URI below which your pretalx instance will be reachable. 248 + ''; 249 + }; 250 + }; 251 + }; 252 + }; 253 + default = { }; 254 + description = lib.mdDoc '' 255 + pretalx configuration as a Nix attribute set. All settings can also be passed 256 + from the environment. 257 + 258 + See <https://docs.pretalx.org/administrator/configure.html> for possible options. 259 + ''; 260 + }; 261 + }; 262 + 263 + config = lib.mkIf cfg.enable { 264 + # https://docs.pretalx.org/administrator/installation.html 265 + 266 + environment.systemPackages = [ 267 + (pkgs.writeScriptBin "pretalx-manage" '' 268 + cd ${cfg.settings.filesystem.data} 269 + sudo=exec 270 + if [[ "$USER" != ${cfg.user} ]]; then 271 + sudo='exec /run/wrappers/bin/sudo -u ${cfg.user} --preserve-env=PRETALX_CONFIG_FILE' 272 + fi 273 + export PRETALX_CONFIG_FILE=${configFile} 274 + $sudo ${lib.getExe' pythonEnv "pretalx-manage"} "$@" 275 + '') 276 + ]; 277 + 278 + services = { 279 + nginx = lib.mkIf cfg.nginx.enable { 280 + enable = true; 281 + recommendedGzipSettings = lib.mkDefault true; 282 + recommendedOptimisation = lib.mkDefault true; 283 + recommendedProxySettings = lib.mkDefault true; 284 + recommendedTlsSettings = lib.mkDefault true; 285 + upstreams.pretalx.servers."unix:/run/pretalx/pretalx.sock" = { }; 286 + virtualHosts.${cfg.nginx.domain} = { 287 + # https://docs.pretalx.org/administrator/installation.html#step-7-ssl 288 + extraConfig = '' 289 + more_set_headers Referrer-Policy same-origin; 290 + more_set_headers X-Content-Type-Options nosniff; 291 + ''; 292 + locations = { 293 + "/".proxyPass = "http://pretalx"; 294 + "/media/" = { 295 + alias = "${cfg.settings.filesystem.data}/data/media/"; 296 + extraConfig = '' 297 + access_log off; 298 + more_set_headers Content-Disposition 'attachment; filename="$1"'; 299 + expires 7d; 300 + ''; 301 + }; 302 + "/static/" = { 303 + alias = cfg.settings.filesystem.static; 304 + extraConfig = '' 305 + access_log off; 306 + more_set_headers Cache-Control "public"; 307 + expires 365d; 308 + ''; 309 + }; 310 + }; 311 + }; 312 + }; 313 + 314 + postgresql = lib.mkIf (cfg.database.createLocally && cfg.settings.database.backend == "postgresql") { 315 + enable = true; 316 + ensureUsers = [ { 317 + name = cfg.settings.database.user; 318 + ensureDBOwnership = true; 319 + } ]; 320 + ensureDatabases = [ cfg.settings.database.name ]; 321 + }; 322 + 323 + redis.servers.pretalx.enable = true; 324 + }; 325 + 326 + systemd.services = let 327 + commonUnitConfig = { 328 + environment.PRETALX_CONFIG_FILE = configFile; 329 + serviceConfig = { 330 + User = "pretalx"; 331 + Group = "pretalx"; 332 + StateDirectory = [ "pretalx" "pretalx/media" ]; 333 + LogsDirectory = "pretalx"; 334 + WorkingDirectory = cfg.settings.filesystem.data; 335 + SupplementaryGroups = [ "redis-pretalx" ]; 336 + }; 337 + }; 338 + in { 339 + pretalx-web = lib.recursiveUpdate commonUnitConfig { 340 + description = "pretalx web service"; 341 + after = [ 342 + "network.target" 343 + "redis-pretalx.service" 344 + ] ++ lib.optionals (cfg.settings.database.backend == "postgresql") [ 345 + "postgresql.service" 346 + ] ++ lib.optionals (cfg.settings.database.backend == "mysql") [ 347 + "mysql.service" 348 + ]; 349 + wantedBy = [ "multi-user.target" ]; 350 + preStart = '' 351 + versionFile="${cfg.settings.filesystem.data}/.version" 352 + version=$(cat "$versionFile" 2>/dev/null || echo 0) 353 + 354 + if [[ $version != ${cfg.package.version} ]]; then 355 + ${lib.getExe' pythonEnv "pretalx-manage"} migrate 356 + 357 + echo "${cfg.package.version}" > "$versionFile" 358 + fi 359 + ''; 360 + serviceConfig = { 361 + ExecStart = "${lib.getExe' pythonEnv "gunicorn"} --bind unix:/run/pretalx/pretalx.sock ${cfg.gunicorn.extraArgs} pretalx.wsgi"; 362 + RuntimeDirectory = "pretalx"; 363 + }; 364 + }; 365 + 366 + pretalx-periodic = lib.recursiveUpdate commonUnitConfig { 367 + description = "pretalx periodic task runner"; 368 + # every 15 minutes 369 + startAt = [ "*:3,18,33,48" ]; 370 + serviceConfig = { 371 + Type = "oneshot"; 372 + ExecStart = "${lib.getExe' pythonEnv "pretalx-manage"} runperiodic"; 373 + }; 374 + }; 375 + 376 + pretalx-clear-sessions = lib.recursiveUpdate commonUnitConfig { 377 + description = "pretalx session pruning"; 378 + startAt = [ "monthly" ]; 379 + serviceConfig = { 380 + Type = "oneshot"; 381 + ExecStart = "${lib.getExe' pythonEnv "pretalx-manage"} clearsessions"; 382 + }; 383 + }; 384 + 385 + pretalx-worker = lib.mkIf cfg.celery.enable (lib.recursiveUpdate commonUnitConfig { 386 + description = "pretalx asynchronous job runner"; 387 + after = [ 388 + "network.target" 389 + "redis-pretalx.service" 390 + ] ++ lib.optionals (cfg.settings.database.backend == "postgresql") [ 391 + "postgresql.service" 392 + ] ++ lib.optionals (cfg.settings.database.backend == "mysql") [ 393 + "mysql.service" 394 + ]; 395 + wantedBy = [ "multi-user.target" ]; 396 + serviceConfig.ExecStart = "${lib.getExe' pythonEnv "celery"} -A pretalx.celery_app worker ${cfg.celery.extraArgs}"; 397 + }); 398 + }; 399 + 400 + systemd.sockets.pretalx-web.socketConfig = { 401 + ListenStream = "/run/pretalx/pretalx.sock"; 402 + SocketUser = "nginx"; 403 + }; 404 + 405 + users = { 406 + groups."${cfg.group}" = {}; 407 + users."${cfg.user}" = { 408 + isSystemUser = true; 409 + createHome = true; 410 + home = cfg.settings.filesystem.data; 411 + inherit (cfg) group; 412 + }; 413 + }; 414 + }; 415 + }
+1 -1
nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py
··· 18 18 # These values will be replaced with actual values during the package build 19 19 EFI_SYS_MOUNT_POINT = "@efiSysMountPoint@" 20 20 TIMEOUT = "@timeout@" 21 - EDITOR = bool("@editor@") 21 + EDITOR = "@editor@" == "1" 22 22 CONSOLE_MODE = "@consoleMode@" 23 23 BOOTSPEC_TOOLS = "@bootspecTools@" 24 24 DISTRO_NAME = "@distroName@"
+1 -3
nixos/modules/system/boot/loader/systemd-boot/systemd-boot.nix
··· 22 22 23 23 timeout = optionalString (config.boot.loader.timeout != null) config.boot.loader.timeout; 24 24 25 - editor = if cfg.editor then "True" else "False"; 26 - 27 25 configurationLimit = if cfg.configurationLimit == null then 0 else cfg.configurationLimit; 28 26 29 - inherit (cfg) consoleMode graceful; 27 + inherit (cfg) consoleMode graceful editor; 30 28 31 29 inherit (efi) efiSysMountPoint canTouchEfiVariables; 32 30
+1
nixos/tests/all-tests.nix
··· 713 713 power-profiles-daemon = handleTest ./power-profiles-daemon.nix {}; 714 714 pppd = handleTest ./pppd.nix {}; 715 715 predictable-interface-names = handleTest ./predictable-interface-names.nix {}; 716 + pretalx = runTest ./web-apps/pretalx.nix; 716 717 printing-socket = handleTest ./printing.nix { socket = true; }; 717 718 printing-service = handleTest ./printing.nix { socket = false; }; 718 719 privoxy = handleTest ./privoxy.nix {};
-25
nixos/tests/prometheus-exporters.nix
··· 942 942 ''; 943 943 }; 944 944 945 - openvpn = { 946 - exporterConfig = { 947 - enable = true; 948 - group = "openvpn"; 949 - statusPaths = [ "/run/openvpn-test" ]; 950 - }; 951 - metricProvider = { 952 - users.groups.openvpn = { }; 953 - services.openvpn.servers.test = { 954 - config = '' 955 - dev tun 956 - status /run/openvpn-test 957 - status-version 3 958 - ''; 959 - up = "chmod g+r /run/openvpn-test"; 960 - }; 961 - systemd.services."openvpn-test".serviceConfig.Group = "openvpn"; 962 - }; 963 - exporterTest = '' 964 - wait_for_unit("openvpn-test.service") 965 - wait_for_unit("prometheus-openvpn-exporter.service") 966 - succeed("curl -sSf http://localhost:9176/metrics | grep 'openvpn_up{.*} 1'") 967 - ''; 968 - }; 969 - 970 945 pgbouncer = { 971 946 exporterConfig = { 972 947 enable = true;
+31
nixos/tests/web-apps/pretalx.nix
··· 1 + { lib, ... }: 2 + 3 + { 4 + name = "pretalx"; 5 + meta.maintainers = lib.teams.c3d2.members; 6 + 7 + nodes = { 8 + pretalx = { 9 + networking.extraHosts = '' 10 + 127.0.0.1 talks.local 11 + ''; 12 + 13 + services.pretalx = { 14 + enable = true; 15 + nginx.domain = "talks.local"; 16 + settings = { 17 + site.url = "http://talks.local"; 18 + }; 19 + }; 20 + }; 21 + }; 22 + 23 + testScript = '' 24 + start_all() 25 + 26 + pretalx.wait_for_unit("pretalx-web.service") 27 + pretalx.wait_for_unit("pretalx-worker.service") 28 + 29 + pretalx.wait_until_succeeds("curl -q --fail http://talks.local/orga/") 30 + ''; 31 + }
+2 -2
pkgs/applications/audio/ledfx/default.nix
··· 5 5 6 6 python3.pkgs.buildPythonPackage rec { 7 7 pname = "ledfx"; 8 - version = "2.0.89"; 8 + version = "2.0.90"; 9 9 pyproject= true; 10 10 11 11 src = fetchPypi { 12 12 inherit pname version; 13 - hash = "sha256-PBOj6u0TukT6wRKMQML4+XNQQZvsGyRzXBk9YsISst4="; 13 + hash = "sha256-ZlZtC0bi9ZUf/1D9hUxxhdix6F8l7Lg5IUOOg+JHGYU="; 14 14 }; 15 15 16 16 pythonRelaxDeps = true;
+2 -2
pkgs/applications/audio/mympd/default.nix
··· 16 16 17 17 stdenv.mkDerivation (finalAttrs: { 18 18 pname = "mympd"; 19 - version = "13.0.6"; 19 + version = "14.0.0"; 20 20 21 21 src = fetchFromGitHub { 22 22 owner = "jcorporation"; 23 23 repo = "myMPD"; 24 24 rev = "v${finalAttrs.version}"; 25 - sha256 = "sha256-7yqpm2qMDHWVM5m5FueYlkEFY+VIW8Cx+aRa1iY2vZ4="; 25 + sha256 = "sha256-srwLnoQSPex7/PtgF6RWpJM39fpOqN3wze5ABSRTIRA="; 26 26 }; 27 27 28 28 nativeBuildInputs = [
+1
pkgs/applications/audio/netease-music-tui/default.nix
··· 29 29 description = "netease cloud music terminal client by rust"; 30 30 maintainers = with maintainers; [ vonfry ]; 31 31 license = licenses.mit; 32 + mainProgram = "ncmt"; 32 33 }; 33 34 }
+5
pkgs/applications/audio/polyphone/default.nix
··· 29 29 ''; 30 30 31 31 installPhase = '' 32 + runHook preInstall 32 33 install -d $out/bin 33 34 install -m755 bin/polyphone $out/bin/ 35 + 36 + install -Dm444 ./contrib/com.polyphone_soundfonts.polyphone.desktop -t $out/share/applications/ 37 + install -Dm444 ./contrib/polyphone.svg -t $out/share/icons/hicolor/scalable/apps/ 38 + runHook postInstall 34 39 ''; 35 40 36 41 qmakeFlags = [
+5 -4
pkgs/applications/editors/vscode/extensions/default.nix
··· 985 985 mktplcRef = { 986 986 name = "vscode-eslint"; 987 987 publisher = "dbaeumer"; 988 - version = "2.4.2"; 989 - sha256 = "sha256-eIjaiVQ7PNJUtOiZlM+lw6VmW07FbMWPtY7UoedWtbw="; 988 + version = "2.4.4"; 989 + sha256 = "sha256-NJGsMme/+4bvED/93SGojYTH03EZbtKe5LyvocywILA="; 990 990 }; 991 991 meta = { 992 992 changelog = "https://marketplace.visualstudio.com/items/dbaeumer.vscode-eslint/changelog"; ··· 3235 3235 mktplcRef = { 3236 3236 name = "crates"; 3237 3237 publisher = "serayuzgur"; 3238 - version = "0.6.5"; 3239 - sha256 = "sha256-HgqM4PKGk3R5MLY4cVjKxv79p5KlOkVDeDbv7/6FmpM="; 3238 + version = "0.6.6"; 3239 + sha256 = "sha256-HXoH1IgMLniq0kxHs2snym4rerScu9qCqUaqwEC+O/E="; 3240 3240 }; 3241 3241 meta = { 3242 3242 license = lib.licenses.mit; 3243 + maintainers = [ lib.maintainers.wackbyte ]; 3243 3244 }; 3244 3245 }; 3245 3246
+3 -3
pkgs/applications/emulators/yuzu/compat-list.nix
··· 1 1 { stdenv, fetchFromGitHub, unstableGitUpdater }: 2 2 stdenv.mkDerivation { 3 3 pname = "yuzu-compatibility-list"; 4 - version = "unstable-2024-01-27"; 4 + version = "unstable-2024-01-30"; 5 5 6 6 src = fetchFromGitHub { 7 7 owner = "flathub"; 8 8 repo = "org.yuzu_emu.yuzu"; 9 - rev = "c01bdbbfda3e2558930fcced63b6d02b646f881b"; 10 - hash = "sha256-TDmzBxeJq4gJvU88hJaXN7U3PYOqI1OrkenlH1GJo8g="; 9 + rev = "82194fa23ec35545ade47cc3dc2035b2b07badcb"; 10 + hash = "sha256-LsQZml8I43fZDFACtVZpc76/62Pv11Z6bm8w/9hTHdI="; 11 11 }; 12 12 13 13 buildCommand = ''
+2 -2
pkgs/applications/gis/qgis/unwrapped.nix
··· 77 77 urllib3 78 78 ]; 79 79 in mkDerivation rec { 80 - version = "3.34.2"; 80 + version = "3.34.3"; 81 81 pname = "qgis-unwrapped"; 82 82 83 83 src = fetchFromGitHub { 84 84 owner = "qgis"; 85 85 repo = "QGIS"; 86 86 rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; 87 - hash = "sha256-RKxIJpp0lmRqyMYJuX2U4/GJh0FTnklFOcUft6LsuHc="; 87 + hash = "sha256-uf4qUalY6LxPykgUt/atHBTu+A6ITrcnfez/jwVMLvA="; 88 88 }; 89 89 90 90 passthru = {
+2 -2
pkgs/applications/misc/diffuse/default.nix
··· 14 14 15 15 python3.pkgs.buildPythonApplication rec { 16 16 pname = "diffuse"; 17 - version = "0.8.2"; 17 + version = "0.9.0"; 18 18 19 19 src = fetchFromGitHub { 20 20 owner = "MightyCreak"; 21 21 repo = "diffuse"; 22 22 rev = "v${version}"; 23 - sha256 = "aGg5uh9KitVP2bBUizgGIZWvzTxfJGid0WUGVNyHdlk="; 23 + sha256 = "6GdUtdVhhIQL1cD9/e7Byv37PVKXmzVWhJC6GROK7OA="; 24 24 }; 25 25 26 26 format = "other";
+75 -18
pkgs/applications/misc/gramps/default.nix
··· 1 - { lib, fetchFromGitHub, gtk3, pythonPackages, intltool, gexiv2, 2 - pango, gobject-introspection, wrapGAppsHook, gettext, 3 - # Optional packages: 4 - enableOSM ? true, osm-gps-map, glib-networking, 5 - enableGraphviz ? true, graphviz, 6 - enableGhostscript ? true, ghostscript 7 - }: 1 + { lib 2 + , fetchpatch 3 + , fetchFromGitHub 4 + , gtk3 5 + , pythonPackages 6 + , glibcLocales 7 + , intltool 8 + , gexiv2 9 + , pango 10 + , gobject-introspection 11 + , wrapGAppsHook 12 + , gettext 13 + , # Optional packages: 14 + enableOSM ? true 15 + , osm-gps-map 16 + , glib-networking 17 + , enableGraphviz ? true 18 + , graphviz 19 + , enableGhostscript ? true 20 + , ghostscript 21 + }: 8 22 9 23 let 10 24 inherit (pythonPackages) python buildPythonApplication; 11 - in buildPythonApplication rec { 12 - version = "5.1.4"; 25 + in 26 + buildPythonApplication rec { 27 + version = "5.1.6"; 13 28 pname = "gramps"; 29 + pyproject = true; 14 30 15 - nativeBuildInputs = [ wrapGAppsHook intltool gettext gobject-introspection ]; 31 + nativeBuildInputs = [ 32 + wrapGAppsHook 33 + intltool 34 + gettext 35 + gobject-introspection 36 + pythonPackages.setuptools 37 + ]; 38 + 39 + nativeCheckInputs = [ 40 + glibcLocales 41 + pythonPackages.jsonschema 42 + pythonPackages.mock 43 + pythonPackages.lxml 44 + ]; 45 + 16 46 buildInputs = [ gtk3 pango gexiv2 ] 17 47 # Map support 18 48 ++ lib.optionals enableOSM [ osm-gps-map glib-networking ] ··· 26 56 owner = "gramps-project"; 27 57 repo = "gramps"; 28 58 rev = "v${version}"; 29 - sha256 = "00358nzyw686ypqv45imc5k9frcqnhla0hpx9ynna3iy6iz5006x"; 59 + hash = "sha256-BerkDXdFYfZ3rV5AeMo/uk53IN2U5z4GFs757Ar26v0="; 30 60 }; 31 61 32 - pythonPath = with pythonPackages; [ bsddb3 pyicu pygobject3 pycairo ]; 62 + pythonPath = with pythonPackages; [ 63 + bsddb3 64 + pyicu 65 + pygobject3 66 + pycairo 67 + ]; 68 + 69 + patches = [ 70 + # fix for running tests with a temporary home - remove next release 71 + # https://gramps-project.org/bugs/view.php?id=12577 72 + (fetchpatch { 73 + url = "https://github.com/gramps-project/gramps/commit/1e95d8a6b5193d655d8caec1e6ab13628ad123db.patch"; 74 + hash = "sha256-2riWB13Yl+tk9+Tuo0YDLoxY2Rc0xrJKfb+ZU7Puzxk="; 75 + }) 76 + ]; 33 77 34 78 # Same installPhase as in buildPythonApplication but without --old-and-unmanageble 35 79 # install flag. 36 80 installPhase = '' 37 81 runHook preInstall 38 82 39 - mkdir -p "$out/lib/${python.libPrefix}/site-packages" 83 + mkdir -p "$out/${python.sitePackages}" 40 84 41 - export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" 85 + export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" 42 86 43 87 ${python}/bin/${python.executable} setup.py install \ 44 - --install-lib=$out/lib/${python.libPrefix}/site-packages \ 88 + --install-lib=$out/${python.sitePackages} \ 45 89 --prefix="$out" 46 90 47 - eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth 91 + eapth="$out/${python.sitePackages}/easy-install.pth" 48 92 if [ -e "$eapth" ]; then 49 93 # move colliding easy_install.pth to specifically named one 50 94 mv "$eapth" $(dirname "$eapth")/${pname}-${version}.pth 51 95 fi 52 96 53 - rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* 97 + rm -f "$out/${python.sitePackages}"/site.py* 54 98 55 99 runHook postInstall 100 + ''; 101 + 102 + preCheck = '' 103 + export HOME=$TMPDIR 56 104 ''; 57 105 58 106 # https://github.com/NixOS/nixpkgs/issues/149812 ··· 62 110 meta = with lib; { 63 111 description = "Genealogy software"; 64 112 homepage = "https://gramps-project.org"; 65 - license = licenses.gpl2; 113 + maintainers = with maintainers; [ jk pinpox ]; 114 + changelog = "https://github.com/gramps-project/gramps/blob/v${version}/ChangeLog"; 115 + longDescription = '' 116 + Every person has their own story but they are also part of a collective 117 + family history. Gramps gives you the ability to record the many details of 118 + an individual's life as well as the complex relationships between various 119 + people, places and events. All of your research is kept organized, 120 + searchable and as precise as you need it to be. 121 + ''; 122 + license = licenses.gpl2Plus; 66 123 }; 67 124 }
+1 -1
pkgs/applications/misc/loxodo/default.nix
··· 22 22 [Desktop Entry] 23 23 Type=Application 24 24 Exec=$out/bin/loxodo 25 - Icon=$out/lib/${python3.libPrefix}/site-packages/resources/loxodo-icon.png 25 + Icon=$out/${python3.sitePackages}/resources/loxodo-icon.png 26 26 Name=Loxodo 27 27 GenericName=Password Vault 28 28 Categories=Application;Other;
+4
pkgs/applications/misc/prusa-slicer/default.nix
··· 9 9 , cereal 10 10 , cgal 11 11 , curl 12 + , darwin 12 13 , dbus 13 14 , eigen 14 15 , expat ··· 111 112 catch2 112 113 ] ++ lib.optionals withSystemd [ 113 114 systemd 115 + ] ++ lib.optionals stdenv.isDarwin [ 116 + darwin.apple_sdk_11_0.frameworks.CoreWLAN 114 117 ]; 115 118 116 119 separateDebugInfo = true; ··· 190 193 homepage = "https://github.com/prusa3d/PrusaSlicer"; 191 194 license = licenses.agpl3; 192 195 maintainers = with maintainers; [ moredread tweber tmarkus ]; 196 + platforms = platforms.unix; 193 197 } // lib.optionalAttrs (stdenv.isDarwin) { 194 198 mainProgram = "PrusaSlicer"; 195 199 };
+2 -2
pkgs/applications/misc/wmenu/default.nix
··· 15 15 16 16 stdenv.mkDerivation rec { 17 17 pname = "wmenu"; 18 - version = "0.1.4"; 18 + version = "0.1.6"; 19 19 20 20 strictDeps = true; 21 21 ··· 23 23 owner = "~adnano"; 24 24 repo = "wmenu"; 25 25 rev = version; 26 - hash = "sha256-aB23wi8kLBKAvQv2UPsfqVMCjakdsM6AzH8LgGv3HPs="; 26 + hash = "sha256-Xsnf7T39up6E5kzV37sM9j3PpA2eqxItbGt+tOfjsjE="; 27 27 }; 28 28 29 29 nativeBuildInputs = [ pkg-config meson ninja ];
+3
pkgs/applications/networking/browsers/firefox/common.nix
··· 292 292 # Runs autoconf through ./mach configure in configurePhase 293 293 configureScript="$(realpath ./mach) configure" 294 294 295 + # Set reproducible build date; https://bugzilla.mozilla.org/show_bug.cgi?id=885777#c21 296 + export MOZ_BUILD_DATE=$(head -n1 sourcestamp.txt) 297 + 295 298 # Set predictable directories for build and state 296 299 export MOZ_OBJDIR=$(pwd)/mozobj 297 300 export MOZBUILD_STATE_PATH=$(pwd)/mozbuild
+6 -6
pkgs/applications/networking/browsers/microsoft-edge/default.nix
··· 1 1 { 2 2 stable = import ./browser.nix { 3 3 channel = "stable"; 4 - version = "120.0.2210.144"; 4 + version = "121.0.2277.83"; 5 5 revision = "1"; 6 - hash = "sha256-O/7LdopcMfSYx8cg9BNDU6KxbPfnF9rYXD7Q6jugBLU="; 6 + hash = "sha256-WuDu44elNlkYZEtol+TZNpcRAkAq8HHATYCc9Or/bvU="; 7 7 }; 8 8 beta = import ./browser.nix { 9 9 channel = "beta"; 10 - version = "121.0.2277.71"; 10 + version = "121.0.2277.83"; 11 11 revision = "1"; 12 - hash = "sha256-PsfUZJ5ftHxSFGaXjzFMEff7Czfq88yL31mqNkFilNM="; 12 + hash = "sha256-eW8Bpcjw1aY5lMqsGCJ3hORVLhzW8Fmaio+kpSOzPeU="; 13 13 }; 14 14 dev = import ./browser.nix { 15 15 channel = "dev"; 16 - version = "122.0.2348.0"; 16 + version = "122.0.2353.0"; 17 17 revision = "1"; 18 - hash = "sha256-Vsnrc43d70fLDncMeQeYhZJhnYex2LsIV1U2KPlkP9U="; 18 + hash = "sha256-llLaq13SU4ZpqhOYK0hy6ZD6amAqijStk8TIHX3gydQ="; 19 19 }; 20 20 }
+3 -3
pkgs/applications/networking/cluster/kubecm/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "kubecm"; 5 - version = "0.27.1"; 5 + version = "0.28.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "sunny0826"; 9 9 repo = "kubecm"; 10 10 rev = "v${version}"; 11 - hash = "sha256-Fg+jlnYkdv9Vfj94lxfmhoc6pyM0EAqwIBepFXYoO5M="; 11 + hash = "sha256-v2frNvJUvDjPhV1RCR3DHk04kYEqP6hMXeA4j3cWlss="; 12 12 }; 13 13 14 - vendorHash = "sha256-wj/IHNN8r6pwkKk0ZmpRjxr5nE2c+iypjCsZb+i5vwo="; 14 + vendorHash = "sha256-uM9/rqu5WOXK6bqxhtmje+Zd9dtdv3qwt+Xr0SJHjPs="; 15 15 ldflags = [ "-s" "-w" "-X github.com/sunny0826/kubecm/version.Version=${version}"]; 16 16 17 17 doCheck = false;
+3 -3
pkgs/applications/networking/cluster/terraform/default.nix
··· 167 167 mkTerraform = attrs: pluggable (generic attrs); 168 168 169 169 terraform_1 = mkTerraform { 170 - version = "1.7.1"; 171 - hash = "sha256-e+YXOqXgiUXtm6P8PulZowRK0OLA8ekmS+MZRQP/srg="; 172 - vendorHash = "sha256-77W0x6DENB+U3yB4LI3PwJU9bTuH7Eqz2a9FNoERuJg="; 170 + version = "1.7.2"; 171 + hash = "sha256-jTzZWmYeKF87Er2i7XHquM8oQyF4q/qoBf4DdMqv7L8="; 172 + vendorHash = "sha256-DI4YTjdFFvfby8ExEY3KoK4J9YKK5LPpMbelzFMDVVs="; 173 173 patches = [ ./provider-path-0_15.patch ]; 174 174 passthru = { 175 175 inherit plugins;
+1 -1
pkgs/applications/networking/cluster/tilt/assets.nix
··· 14 14 15 15 yarnOfflineCache = fetchYarnDeps { 16 16 yarnLock = "${src}/web/yarn.lock"; 17 - hash = "sha256-UTxglGn3eIgahZg4kxolg2f2MTReCL4r/GyWNg4105E="; 17 + hash = "sha256-0JpoAQKRmU7P1bzYNR/vqtPjOOSw8wSlNjXl2f6uBrw="; 18 18 }; 19 19 20 20 configurePhase = ''
+2 -2
pkgs/applications/networking/cluster/tilt/default.nix
··· 5 5 /* Do not use "dev" as a version. If you do, Tilt will consider itself 6 6 running in development environment and try to serve assets from the 7 7 source tree, which is not there once build completes. */ 8 - version = "0.33.6"; 8 + version = "0.33.10"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "tilt-dev"; 12 12 repo = "tilt"; 13 13 rev = "v${version}"; 14 - hash = "sha256-WtE8ExUKFRtdYeg0+My/DB+L/qT+J1EaKHKChNjC5oI="; 14 + hash = "sha256-LPb2tC3xIGhjiLYkTU+NBIUoqiicO2ORM6Nt1eTnwQs="; 15 15 }; 16 16 }; 17 17
+3 -3
pkgs/applications/networking/deck/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "deck"; 5 - version = "1.32.0"; 5 + version = "1.32.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "Kong"; 9 9 repo = "deck"; 10 10 rev = "v${version}"; 11 - hash = "sha256-h0dZXIrQm8RlfNnIHU4P0iFelWmkXVqkBmyyrA3/EgY="; 11 + hash = "sha256-7lE/Wnrlv3L6V1ex+357q6XXpdx0810m1rKkqITowXY="; 12 12 }; 13 13 14 14 nativeBuildInputs = [ installShellFiles ]; ··· 21 21 ]; 22 22 23 23 proxyVendor = true; # darwin/linux hash mismatch 24 - vendorHash = "sha256-0KEQ03lls8ZEbhMEcKiZ1jFIbBtXnlCE/mkYHrZdWv8="; 24 + vendorHash = "sha256-D260T3E0aufOAqlN918SChv3aNDCFHfe2e0It1pcPiU="; 25 25 26 26 postInstall = '' 27 27 installShellCompletion --cmd deck \
+3 -3
pkgs/applications/networking/instant-messengers/beeper/default.nix
··· 11 11 }: 12 12 let 13 13 pname = "beeper"; 14 - version = "3.92.23"; 14 + version = "3.93.36"; 15 15 name = "${pname}-${version}"; 16 16 src = fetchurl { 17 - url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.92.23-build-240111az2vz7kii-x86_64.AppImage"; 18 - hash = "sha256-M+3mJ+X/yr6yONOpdnCRECbswYlSuhlqqbg2d6Px/7s="; 17 + url = "https://download.todesktop.com/2003241lzgn20jd/beeper-3.93.36-build-2401269p8vcb695-x86_64.AppImage"; 18 + hash = "sha256-3pOOAI4/BWdbWfPweRx5I2KRi9VOgJ5vcQ89FTJhPak="; 19 19 }; 20 20 appimage = appimageTools.wrapType2 { 21 21 inherit version pname src;
+2 -2
pkgs/applications/networking/instant-messengers/rambox/default.nix
··· 2 2 3 3 let 4 4 pname = "rambox"; 5 - version = "2.2.3"; 5 + version = "2.3.0"; 6 6 7 7 src = fetchurl { 8 8 url = "https://github.com/ramboxapp/download/releases/download/v${version}/Rambox-${version}-linux-x64.AppImage"; 9 - sha256 = "sha256-V1Sxfgn3fcqW7t7oa1pfnrPYAqHdCLrWUbplE/I789A="; 9 + sha256 = "sha256-PmTiXQp+AkTwCKisH1tR6B1+cHPx25P8FAAlLvKEb3w="; 10 10 }; 11 11 12 12 desktopItem = (makeDesktopItem {
+2 -2
pkgs/applications/networking/mkchromecast/default.nix
··· 70 70 ]; 71 71 72 72 postInstall = '' 73 - substituteInPlace $out/lib/${python3Packages.python.libPrefix}/site-packages/mkchromecast/video.py \ 73 + substituteInPlace $out/${python3Packages.python.sitePackages}/mkchromecast/video.py \ 74 74 --replace '/usr/share/mkchromecast/nodejs/' '${placeholder "out"}/share/mkchromecast/nodejs/' 75 75 '' + lib.optionalString stdenv.isDarwin '' 76 76 install -Dm 755 -t $out/bin bin/audiodevice 77 - substituteInPlace $out/lib/${python3Packages.python.libPrefix}/site-packages/mkchromecast/audio_devices.py \ 77 + substituteInPlace $out/${python3Packages.python.sitePackages}/mkchromecast/audio_devices.py \ 78 78 --replace './bin/audiodevice' '${placeholder "out"}/bin/audiodevice' 79 79 ''; 80 80
+1 -1
pkgs/applications/networking/p2p/deluge/default.nix
··· 77 77 install -Dm444 -t $out/share/applications deluge/ui/data/share/applications/deluge.desktop 78 78 '' else '' 79 79 rm -r $out/bin/deluge-gtk 80 - rm -r $out/lib/${python3Packages.python.libPrefix}/site-packages/deluge/ui/gtk3 80 + rm -r $out/${python3Packages.python.sitePackages}/deluge/ui/gtk3 81 81 rm -r $out/share/{icons,man/man1/deluge-gtk*,pixmaps} 82 82 ''); 83 83
+4 -11
pkgs/applications/networking/seahub/default.nix
··· 6 6 , nixosTests 7 7 }: 8 8 let 9 - # Seahub 8.x.x does not support django-webpack-loader >=1.x.x 10 9 python = python3.override { 11 10 packageOverrides = self: super: { 12 - django-webpack-loader = super.django-webpack-loader.overridePythonAttrs (old: rec { 13 - version = "0.7.0"; 14 - src = old.src.override { 15 - inherit version; 16 - hash = "sha256-ejyIIBqlRIH5OZRlYVy+e5rs6AgUlqbQKHt8uOIy9Ec="; 17 - }; 18 - }); 11 + django = super.django_3; 19 12 }; 20 13 }; 21 14 in 22 15 python.pkgs.buildPythonApplication rec { 23 16 pname = "seahub"; 24 - version = "9.0.10"; 17 + version = "10.0.1"; 25 18 pyproject = false; 26 19 27 20 src = fetchFromGitHub { 28 21 owner = "haiwen"; 29 22 repo = "seahub"; 30 - rev = "5971bf25fe67d94ec4d9f53b785c15a098113620"; # using a fixed revision because upstream may re-tag releases :/ 31 - sha256 = "sha256-7Exvm3EShb/1EqwA4wzWB9zCdv0P/ISmjKSoqtOMnqk="; 23 + rev = "e8c02236c0eaca6dde009872745f089da4b77e6e"; # using a fixed revision because upstream may re-tag releases :/ 24 + sha256 = "sha256-7JXWKEFqCsC+ZByhvyP8AmDpajT3hpgyYDNUqc3wXyg="; 32 25 }; 33 26 34 27 patches = [
+1
pkgs/applications/office/libreoffice/darwin/default.nix
··· 75 75 homepage = "https://libreoffice.org/"; 76 76 license = licenses.lgpl3; 77 77 maintainers = with maintainers; [ tricktron ]; 78 + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; 78 79 platforms = [ "x86_64-darwin" "aarch64-darwin" ]; 79 80 }; 80 81 }
+1 -1
pkgs/applications/office/paperwork/paperwork-gtk.nix
··· 64 64 # fixes [WARNING] [openpaperwork_core.resources.setuptools] Failed to find 65 65 # resource file paperwork_gtk.icon.out/paperwork_128.png, tried at path 66 66 # /nix/store/3n5lz6y8k9yks76f0nar3smc8djan3xr-paperwork-2.0.2/lib/python3.8/site-packages/paperwork_gtk/icon/out/paperwork_128.png. 67 - site=$out/lib/${python3Packages.python.libPrefix}/site-packages/paperwork_gtk 67 + site=$out/${python3Packages.python.sitePackages}/paperwork_gtk 68 68 for i in $site/data/paperwork_*.png; do 69 69 ln -s $i $site/icon/out; 70 70 done
+2 -2
pkgs/applications/office/qownnotes/default.nix
··· 19 19 let 20 20 pname = "qownnotes"; 21 21 appname = "QOwnNotes"; 22 - version = "24.1.4"; 22 + version = "24.1.5"; 23 23 in 24 24 stdenv.mkDerivation { 25 25 inherit pname version; 26 26 27 27 src = fetchurl { 28 28 url = "https://github.com/pbek/QOwnNotes/releases/download/v${version}/qownnotes-${version}.tar.xz"; 29 - hash = "sha256-RWAg89rbmoOSzOu9YjAkDluyPiYjT6f8gmri5AAHyww="; 29 + hash = "sha256-iw3MdsS1i7B8RXZk2GXwiOReSUC1IX5z0MTEk9B4nMM="; 30 30 }; 31 31 32 32 nativeBuildInputs = [
+2
pkgs/applications/radio/gnuradio/3.8.nix
··· 244 244 rm gr-fec/python/fec/qa_polar_encoder.py 245 245 rm gr-fec/python/fec/qa_polar_encoder_systematic.py 246 246 rm gr-filter/python/filter/qa_freq_xlating_fft_filter.py 247 + # Failed with libstdc++ from GCC 13 248 + rm gr-filter/python/filter/qa_filterbank.py 247 249 ''; 248 250 patches = [ 249 251 # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227
+6
pkgs/applications/radio/gnuradio/3.9.nix
··· 1 1 { lib, stdenv 2 + , fetchpatch 2 3 , fetchFromGitHub 3 4 , cmake 4 5 # Remove gcc and python references ··· 277 278 patches = [ 278 279 # Not accepted upstream, see https://github.com/gnuradio/gnuradio/pull/5227 279 280 ./modtool-newmod-permissions.3_9.patch 281 + # Fix compilation with GCC 13 282 + (fetchpatch { 283 + url = "https://github.com/gnuradio/gnuradio/commit/fe1b3592776c26e349e9985d47d3178568dfe6ec.patch"; 284 + hash = "sha256-bu6fJuUo/i4kM+cZqSw8moB0ymoSVooLfwUIW+WDpWI="; 285 + }) 280 286 ]; 281 287 passthru = shared.passthru // { 282 288 # Deps that are potentially overridden and are used inside GR plugins - the same version must
+2 -2
pkgs/applications/science/biology/obitools/obitools3.nix
··· 17 17 ''; 18 18 19 19 preBuild = '' 20 - substituteInPlace src/CMakeLists.txt --replace \$'{PYTHONLIB}' "$out/lib/${python3.libPrefix}/site-packages"; 21 - export NIX_CFLAGS_COMPILE="-L $out/lib/${python3.libPrefix}/site-packages $NIX_CFLAGS_COMPILE" 20 + substituteInPlace src/CMakeLists.txt --replace \$'{PYTHONLIB}' "$out/${python3.sitePackages}"; 21 + export NIX_CFLAGS_COMPILE="-L $out/${python3.sitePackages} $NIX_CFLAGS_COMPILE" 22 22 ''; 23 23 24 24 dontConfigure = true;
+2 -10
pkgs/applications/science/misc/root/default.nix
··· 2 2 , lib 3 3 , callPackage 4 4 , fetchurl 5 - , fetchpatch 6 5 , makeWrapper 7 6 , cmake 8 7 , coreutils ··· 58 57 59 58 stdenv.mkDerivation rec { 60 59 pname = "root"; 61 - version = "6.30.02"; 60 + version = "6.30.04"; 62 61 63 62 passthru = { 64 63 tests = import ./tests { inherit callPackage; }; ··· 66 65 67 66 src = fetchurl { 68 67 url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; 69 - hash = "sha256-eWWkVtGtHuDV/kdpv1qP7Cka9oTtk9sPMICpw2JDUYM="; 68 + hash = "sha256-K0GAtpjznMZdkQhNgzqIRRWzJbxfZzyOOavoGLAl2Mw="; 70 69 }; 71 70 72 71 nativeBuildInputs = [ makeWrapper cmake pkg-config git ]; ··· 110 109 111 110 patches = [ 112 111 ./sw_vers.patch 113 - 114 - # Fix for builtin_llvm=OFF 115 - # https://github.com/root-project/root/pull/14238 116 - (fetchpatch { 117 - url = "https://github.com/root-project/root/commit/1477d3adebf27a19f3a8b85f21c27a0a5649c7ff.diff"; 118 - hash = "sha256-g+FqXBTWXA7t7F/rMarnmOK2014oCNnNJbHhjH+Tvjw="; 119 - }) 120 112 ]; 121 113 122 114 preConfigure = ''
+9 -9
pkgs/applications/version-management/gitlab/data.json
··· 1 1 { 2 - "version": "16.7.4", 3 - "repo_hash": "sha256-rUEr9G/5T4yWnNY69I+IpjsVOSmfdL0j0u6et4jkIt8=", 4 - "yarn_hash": "1qxz2p969qg7kzyvhwxws5zwdw986gdq9gxllzi58c5c56jz49zf", 2 + "version": "16.8.1", 3 + "repo_hash": "sha256-95YdEAUYoFDFX4COI6NnI6tDB+NLnihlJdUDM8NixXA=", 4 + "yarn_hash": "1yhl4l2dln9ck4nbjjrlyjx17nxk4h12gb5hqjh4dq3rz3az3jvx", 5 5 "owner": "gitlab-org", 6 6 "repo": "gitlab", 7 - "rev": "v16.7.4-ee", 7 + "rev": "v16.8.1-ee", 8 8 "passthru": { 9 - "GITALY_SERVER_VERSION": "16.7.4", 10 - "GITLAB_PAGES_VERSION": "16.7.4", 11 - "GITLAB_SHELL_VERSION": "14.32.0", 12 - "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.5.0", 13 - "GITLAB_WORKHORSE_VERSION": "16.7.4" 9 + "GITALY_SERVER_VERSION": "16.8.1", 10 + "GITLAB_PAGES_VERSION": "16.8.1", 11 + "GITLAB_SHELL_VERSION": "14.33.0", 12 + "GITLAB_ELASTICSEARCH_INDEXER_VERSION": "4.6.0", 13 + "GITLAB_WORKHORSE_VERSION": "16.8.1" 14 14 } 15 15 }
+42 -6
pkgs/applications/version-management/gitlab/default.nix
··· 1 1 { stdenv, lib, fetchurl, fetchpatch, fetchFromGitLab, bundlerEnv 2 2 , ruby_3_1, tzdata, git, nettools, nixosTests, nodejs, openssl 3 + , defaultGemConfig, buildRubyGem 3 4 , gitlabEnterprise ? false, callPackage, yarn 4 5 , prefetch-yarn-deps, replace, file, cacert, fetchYarnDeps, makeWrapper, pkg-config 6 + , cargo, rustc, rustPlatform 5 7 }: 6 8 7 9 let ··· 19 21 name = "gitlab-env-${version}"; 20 22 ruby = ruby_3_1; 21 23 gemdir = ./rubyEnv; 22 - gemset = 23 - let x = import (gemdir + "/gemset.nix") src; 24 - in x // { 25 - gpgme = x.gpgme // { 24 + gemset = import (gemdir + "/gemset.nix") src; 25 + gemConfig = defaultGemConfig // { 26 + gpgme = attrs: { 26 27 nativeBuildInputs = [ pkg-config ]; 27 28 }; 28 29 # the openssl needs the openssl include files 29 - openssl = x.openssl // { 30 + openssl = attrs: { 30 31 buildInputs = [ openssl ]; 31 32 }; 32 - ruby-magic = x.ruby-magic // { 33 + ruby-magic = attrs: { 33 34 buildInputs = [ file ]; 34 35 buildFlags = [ "--enable-system-libraries" ]; 36 + }; 37 + gitlab-glfm-markdown = attrs: { 38 + cargoDeps = rustPlatform.fetchCargoTarball { 39 + src = stdenv.mkDerivation { 40 + inherit (buildRubyGem { inherit (attrs) gemName version source; }) 41 + name 42 + src 43 + unpackPhase 44 + nativeBuildInputs 45 + ; 46 + dontBuilt = true; 47 + installPhase = '' 48 + cp -R ext/glfm_markdown $out 49 + cp Cargo.lock $out 50 + ''; 51 + }; 52 + hash = "sha256-I5w/roDgnRe5eyXo0wiRcoWPpXEtpL3kOl9eDg99t/w="; 53 + }; 54 + 55 + dontBuild = false; 56 + 57 + nativeBuildInputs = [ 58 + cargo 59 + rustc 60 + rustPlatform.cargoSetupHook 61 + rustPlatform.bindgenHook 62 + ]; 63 + 64 + preInstall = '' 65 + export CARGO_HOME="$PWD/../.cargo/" 66 + ''; 67 + 68 + postInstall = '' 69 + mv -v $GEM_HOME/gems/${attrs.gemName}-${attrs.version}/lib/{glfm_markdown/glfm_markdown.so,} 70 + ''; 35 71 }; 36 72 }; 37 73 groups = [
+3 -3
pkgs/applications/version-management/gitlab/gitaly/default.nix
··· 6 6 }: 7 7 8 8 let 9 - version = "16.7.4"; 9 + version = "16.8.1"; 10 10 package_version = "v${lib.versions.major version}"; 11 11 gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}"; 12 12 ··· 18 18 owner = "gitlab-org"; 19 19 repo = "gitaly"; 20 20 rev = "v${version}"; 21 - hash = "sha256-4wdMwLsJiQzaZ8PhQz7gYj+dzA+92NFPm0twMdr65qA="; 21 + hash = "sha256-yR8O9F6THymKKHbnfh67NhEcNNBz7XHja/fpeTmVoe0="; 22 22 }; 23 23 24 - vendorHash = "sha256-btWHZMy1aBSsUVs30IqrdBCO79XQvTMXxkxYURF2Nqs="; 24 + vendorHash = "sha256-AkL/BbCrqgXyvfiMxzMIXeZwh5aFL2a2+myk/4YXMNc="; 25 25 26 26 ldflags = [ "-X ${gitaly_package}/internal/version.version=${version}" "-X ${gitaly_package}/internal/version.moduleVersion=${version}" ]; 27 27
+3 -3
pkgs/applications/version-management/gitlab/gitlab-elasticsearch-indexer/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "gitlab-elasticsearch-indexer"; 5 - version = "4.5.0"; 5 + version = "4.6.0"; 6 6 7 7 # nixpkgs-update: no auto update 8 8 src = fetchFromGitLab { 9 9 owner = "gitlab-org"; 10 10 repo = "gitlab-elasticsearch-indexer"; 11 11 rev = "v${version}"; 12 - sha256 = "sha256-6Y2ARnFjbz6nFhWGRhzgAY8s0aX24oLMY1016oRD9oo="; 12 + sha256 = "sha256-HlT3Uj/DWbyK4xGq7SjKjZ90sww6oMiMDo05mtv6rTA="; 13 13 }; 14 14 15 - vendorHash = "sha256-jpjfQl2z5yPnlGEYW6KKBfd4quchT+bU/RU6vwaB4gQ="; 15 + vendorHash = "sha256-YUH/agSy/shHmHRXlfDtgumbka6BjX5NTxgvlNJS4hQ="; 16 16 17 17 buildInputs = [ icu ]; 18 18 nativeBuildInputs = [ pkg-config ];
+3 -3
pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "gitlab-pages"; 5 - version = "16.7.4"; 5 + version = "16.8.1"; 6 6 7 7 # nixpkgs-update: no auto update 8 8 src = fetchFromGitLab { 9 9 owner = "gitlab-org"; 10 10 repo = "gitlab-pages"; 11 11 rev = "v${version}"; 12 - hash = "sha256-6OPpfn+nylTUp7rNI8NqipbHmLmaV0ezE1qrQqHcuqw="; 12 + hash = "sha256-Wj15GHm+5Xd5wq4C3dH+i94jh7pecHM6KCDugLm5YAA="; 13 13 }; 14 14 15 - vendorHash = "sha256-NMky8v0YmN2pSeKJ7G0+DWAZvUx2JlwFbqPHvciYroM="; 15 + vendorHash = "sha256-9yogTSdEij/YwWGm3gz7jMn2AZcI+o7aEnjBvJ8E3vA="; 16 16 subPackages = [ "." ]; 17 17 18 18 meta = with lib; {
+3 -3
pkgs/applications/version-management/gitlab/gitlab-shell/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "gitlab-shell"; 5 - version = "14.32.0"; 5 + version = "14.33.0"; 6 6 7 7 # nixpkgs-update: no auto update 8 8 src = fetchFromGitLab { 9 9 owner = "gitlab-org"; 10 10 repo = "gitlab-shell"; 11 11 rev = "v${version}"; 12 - sha256 = "sha256-fZttdcIdPeiy2ncDyseR1BnR6GBoSRsFkn7Mxc+mTA8="; 12 + sha256 = "sha256-0C3ODs2NElJQ+A6x9lZxSParTZc3q4YqWsw7DxwhODo="; 13 13 }; 14 14 15 15 buildInputs = [ ruby libkrb5 ]; 16 16 17 17 patches = [ ./remove-hardcoded-locations.patch ]; 18 18 19 - vendorHash = "sha256-tdYBEV/dKnIJ+OWTF3/5bIbWVdE/ulMrMD/LMzj1QZE="; 19 + vendorHash = "sha256-sTAd/AbPx5WzBCzTDLvo/bDZcmz/xVhIhz9nFGBEYx4="; 20 20 21 21 postInstall = '' 22 22 cp -r "$NIX_BUILD_TOP/source"/bin/* $out/bin
+2 -2
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
··· 5 5 buildGoModule rec { 6 6 pname = "gitlab-workhorse"; 7 7 8 - version = "16.7.4"; 8 + version = "16.8.1"; 9 9 10 10 # nixpkgs-update: no auto update 11 11 src = fetchFromGitLab { ··· 17 17 18 18 sourceRoot = "${src.name}/workhorse"; 19 19 20 - vendorHash = "sha256-1oeToeqGXSj5CdL5dgWsnN/VpwALlus93P0Ed7G8TIw="; 20 + vendorHash = "sha256-OcdfanSlH1ZUmKlhzMOD3oNySx1o92Is7EDf1Z3953A="; 21 21 buildInputs = [ git ]; 22 22 ldflags = [ "-X main.Version=${version}" ]; 23 23 doCheck = false;
+26 -25
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile
··· 28 28 29 29 gem 'activerecord-gitlab', path: 'gems/activerecord-gitlab' # rubocop:todo Gemfile/MissingFeatureCategory 30 30 31 - gem 'bootsnap', '~> 1.17.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory 31 + gem 'bootsnap', '~> 1.17.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory 32 32 33 33 gem 'openssl', '~> 3.0' # rubocop:todo Gemfile/MissingFeatureCategory 34 34 gem 'ipaddr', '~> 1.2.5' # rubocop:todo Gemfile/MissingFeatureCategory ··· 133 133 gem 'net-ldap', '~> 0.17.1' # rubocop:todo Gemfile/MissingFeatureCategory 134 134 135 135 # API 136 - gem 'grape', '~> 1.7.1', feature_category: :api 136 + gem 'grape', '~> 2.0.0', feature_category: :api 137 137 gem 'grape-entity', '~> 0.10.0', feature_category: :api 138 - gem 'grape-swagger', '~> 1.6.1', group: [:development, :test], feature_category: :api 138 + gem 'grape-swagger', '~> 2.0.1', group: [:development, :test], feature_category: :api 139 139 gem 'grape-swagger-entity', '~> 0.5.1', group: [:development, :test], feature_category: :api 140 - gem 'grape-path-helpers', '~> 1.7.1', feature_category: :api 140 + gem 'grape-path-helpers', '~> 2.0.0', feature_category: :api 141 141 gem 'rack-cors', '~> 2.0.1', require: 'rack/cors' # rubocop:todo Gemfile/MissingFeatureCategory 142 142 143 143 # GraphQL API ··· 203 203 gem 'elasticsearch-model', '~> 7.2' # rubocop:todo Gemfile/MissingFeatureCategory 204 204 gem 'elasticsearch-rails', '~> 7.2', require: 'elasticsearch/rails/instrumentation' # rubocop:todo Gemfile/MissingFeatureCategory 205 205 gem 'elasticsearch-api', '7.13.3' # rubocop:todo Gemfile/MissingFeatureCategory 206 - gem 'aws-sdk-core', '~> 3.190.0' # rubocop:todo Gemfile/MissingFeatureCategory 206 + gem 'aws-sdk-core', '~> 3.190.2' # rubocop:todo Gemfile/MissingFeatureCategory 207 207 gem 'aws-sdk-cloudformation', '~> 1' # rubocop:todo Gemfile/MissingFeatureCategory 208 - gem 'aws-sdk-s3', '~> 1.141.0' # rubocop:todo Gemfile/MissingFeatureCategory 208 + gem 'aws-sdk-s3', '~> 1.142.0' # rubocop:todo Gemfile/MissingFeatureCategory 209 209 gem 'faraday_middleware-aws-sigv4', '~>0.3.0' # rubocop:todo Gemfile/MissingFeatureCategory 210 210 gem 'typhoeus', '~> 1.4.0' # Used with Elasticsearch to support http keep-alive connections # rubocop:todo Gemfile/MissingFeatureCategory 211 211 212 212 # Markdown and HTML processing 213 - gem 'html-pipeline', '~> 2.14.3' # rubocop:todo Gemfile/MissingFeatureCategory 214 - gem 'deckar01-task_list', '2.3.3' # rubocop:todo Gemfile/MissingFeatureCategory 213 + gem 'html-pipeline', '~> 2.14.3', feature_category: :team_planning 214 + gem 'deckar01-task_list', '2.3.3', feature_category: :team_planning 215 215 gem 'gitlab-markup', '~> 1.9.0', require: 'github/markup' # rubocop:todo Gemfile/MissingFeatureCategory 216 - gem 'commonmarker', '~> 0.23.10' # rubocop:todo Gemfile/MissingFeatureCategory 216 + gem 'commonmarker', '~> 0.23.10', feature_category: :team_planning 217 217 gem 'kramdown', '~> 2.3.1' # rubocop:todo Gemfile/MissingFeatureCategory 218 218 gem 'RedCloth', '~> 4.3.3' # rubocop:todo Gemfile/MissingFeatureCategory 219 219 gem 'org-ruby', '~> 0.9.12' # rubocop:todo Gemfile/MissingFeatureCategory ··· 225 225 gem 'asciidoctor-kroki', '~> 0.8.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory 226 226 gem 'rouge', '~> 4.2.0' # rubocop:todo Gemfile/MissingFeatureCategory 227 227 gem 'truncato', '~> 0.7.12' # rubocop:todo Gemfile/MissingFeatureCategory 228 - gem 'nokogiri', '~> 1.15', '>= 1.15.5' # rubocop:todo Gemfile/MissingFeatureCategory 228 + gem 'nokogiri', '~> 1.16' # rubocop:todo Gemfile/MissingFeatureCategory 229 + gem 'gitlab-glfm-markdown', '~> 0.0.11', feature_category: :team_planning 229 230 230 231 # Calendar rendering 231 232 gem 'icalendar' # rubocop:todo Gemfile/MissingFeatureCategory ··· 240 241 gem 'rack-timeout', '~> 0.6.3', require: 'rack/timeout/base' # rubocop:todo Gemfile/MissingFeatureCategory 241 242 242 243 group :puma do 243 - gem 'puma', '~> 6.4', require: false # rubocop:todo Gemfile/MissingFeatureCategory 244 + gem 'puma', '= 6.4.0', require: false, feature_category: :shared 244 245 gem 'sd_notify', '~> 0.1.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory 245 246 end 246 247 ··· 251 252 gem 'acts-as-taggable-on', '~> 10.0' # rubocop:todo Gemfile/MissingFeatureCategory 252 253 253 254 # Background jobs 254 - gem 'sidekiq', '~> 6.5.10' # rubocop:todo Gemfile/MissingFeatureCategory 255 + gem 'sidekiq', '~> 7.1.6' # rubocop:todo Gemfile/MissingFeatureCategory 255 256 gem 'sidekiq-cron', '~> 1.12.0', feature_category: :shared 256 257 gem 'gitlab-sidekiq-fetcher', path: 'vendor/gems/sidekiq-reliable-fetch', require: 'sidekiq-reliable-fetch' # rubocop:todo Gemfile/MissingFeatureCategory 257 258 ··· 268 269 gem 'ruby-progressbar', '~> 1.10' # rubocop:todo Gemfile/MissingFeatureCategory 269 270 270 271 # Linear-time regex library for untrusted regular expressions 271 - gem 're2', '2.5.0' # rubocop:todo Gemfile/MissingFeatureCategory 272 + gem 're2', '2.6.0' # rubocop:todo Gemfile/MissingFeatureCategory 272 273 273 274 # Misc 274 275 ··· 288 289 gem 'connection_pool', '~> 2.4' # rubocop:todo Gemfile/MissingFeatureCategory 289 290 290 291 # Redis session store 291 - gem 'redis-actionpack', '~> 5.3.0' # rubocop:todo Gemfile/MissingFeatureCategory 292 + gem 'redis-actionpack', '~> 5.4.0' # rubocop:todo Gemfile/MissingFeatureCategory 292 293 293 294 # Discord integration 294 295 gem 'discordrb-webhooks', '~> 3.4', require: false, feature_category: :integrations ··· 366 367 367 368 gem 'premailer-rails', '~> 1.10.3' # rubocop:todo Gemfile/MissingFeatureCategory 368 369 369 - gem 'gitlab-labkit', '~> 0.34.0' # rubocop:todo Gemfile/MissingFeatureCategory 370 + gem 'gitlab-labkit', '~> 0.35.0' # rubocop:todo Gemfile/MissingFeatureCategory 370 371 gem 'thrift', '>= 0.16.0' # rubocop:todo Gemfile/MissingFeatureCategory 371 372 372 373 # I18n ··· 387 388 388 389 # Metrics 389 390 gem 'webrick', '~> 1.8.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory 390 - gem 'prometheus-client-mmap', '~> 1.0', '>= 1.0.2', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory 391 + gem 'prometheus-client-mmap', '~> 1.1', require: 'prometheus/client' # rubocop:todo Gemfile/MissingFeatureCategory 391 392 392 393 gem 'warning', '~> 1.3.0' # rubocop:todo Gemfile/MissingFeatureCategory 393 394 ··· 406 407 407 408 gem 'listen', '~> 3.7' # rubocop:todo Gemfile/MissingFeatureCategory 408 409 409 - gem 'ruby-lsp', "~> 0.13.1", require: false, feature_category: :tooling 410 + gem 'ruby-lsp', "~> 0.13.2", require: false, feature_category: :tooling 410 411 411 412 gem 'ruby-lsp-rails', "~> 0.2.8", feature_category: :tooling 412 413 ··· 416 417 group :development, :test do 417 418 gem 'deprecation_toolkit', '~> 1.5.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory 418 419 gem 'bullet', '~> 7.1.2' # rubocop:todo Gemfile/MissingFeatureCategory 419 - gem 'parser', '~> 3.2', '>= 3.2.2.4' # rubocop:todo Gemfile/MissingFeatureCategory 420 + gem 'parser', '~> 3.3', '>= 3.3.0.2' # rubocop:todo Gemfile/MissingFeatureCategory 420 421 gem 'pry-byebug' # rubocop:todo Gemfile/MissingFeatureCategory 421 422 gem 'pry-rails', '~> 0.3.9' # rubocop:todo Gemfile/MissingFeatureCategory 422 423 gem 'pry-shell', '~> 0.6.4' # rubocop:todo Gemfile/MissingFeatureCategory ··· 424 425 gem 'awesome_print', require: false # rubocop:todo Gemfile/MissingFeatureCategory 425 426 426 427 gem 'database_cleaner-active_record', '~> 2.1.0', feature_category: :database 427 - gem 'factory_bot_rails', '~> 6.2.0' # rubocop:todo Gemfile/MissingFeatureCategory 428 + gem 'factory_bot_rails', '~> 6.4.3' # rubocop:todo Gemfile/MissingFeatureCategory 428 429 gem 'rspec-rails', '~> 6.1.0', feature_category: :shared 429 430 430 431 # Prevent occasions where minitest is not bundled in packaged versions of ruby (see #3826) ··· 435 436 436 437 gem 'gitlab-styles', '~> 11.0.0', require: false # rubocop:todo Gemfile/MissingFeatureCategory 437 438 438 - gem 'haml_lint', '~> 0.52', require: false # rubocop:todo Gemfile/MissingFeatureCategory 439 + gem 'haml_lint', '~> 0.53', require: false # rubocop:todo Gemfile/MissingFeatureCategory 439 440 gem 'bundler-audit', '~> 0.9.1', require: false # rubocop:todo Gemfile/MissingFeatureCategory 440 441 441 442 # Benchmarking & profiling ··· 457 458 458 459 gem 'sigdump', '~> 0.2.4', require: 'sigdump/setup' # rubocop:todo Gemfile/MissingFeatureCategory 459 460 460 - gem 'pact', '~> 1.63' # rubocop:todo Gemfile/MissingFeatureCategory 461 + gem 'pact', '~> 1.64' # rubocop:todo Gemfile/MissingFeatureCategory 461 462 462 463 # For now we only use vite in development / test, and not for production builds 463 464 # See: https://gitlab.com/gitlab-org/frontend/rfcs/-/issues/106 ··· 472 473 end 473 474 474 475 group :development, :test, :coverage do 475 - gem 'simplecov', '~> 0.21', require: false, feature_category: :tooling 476 + gem 'simplecov', '~> 0.22', require: false, feature_category: :tooling 476 477 gem 'simplecov-lcov', '~> 0.8.0', require: false, feature_category: :tooling 477 478 gem 'simplecov-cobertura', '~> 2.1.0', require: false, feature_category: :tooling 478 479 gem 'undercover', '~> 0.4.4', require: false, feature_category: :tooling ··· 511 512 gem 'test-prof', '~> 1.3.1' # rubocop:todo Gemfile/MissingFeatureCategory 512 513 gem 'rspec_junit_formatter' # rubocop:todo Gemfile/MissingFeatureCategory 513 514 gem 'guard-rspec' # rubocop:todo Gemfile/MissingFeatureCategory 514 - gem 'axe-core-rspec' # rubocop:todo Gemfile/MissingFeatureCategory 515 + gem 'axe-core-rspec', '~> 4.8.0', feature_category: :tooling 515 516 516 517 # Moved in `test` because https://gitlab.com/gitlab-org/gitlab/-/issues/217527 517 518 gem 'derailed_benchmarks', require: false # rubocop:todo Gemfile/MissingFeatureCategory 518 519 519 - gem 'gitlab_quality-test_tooling', '~> 1.9.0', require: false, feature_category: :tooling 520 + gem 'gitlab_quality-test_tooling', '~> 1.11.0', require: false, feature_category: :tooling 520 521 end 521 522 522 523 gem 'octokit', '~> 6.0' # rubocop:todo Gemfile/MissingFeatureCategory ··· 558 559 559 560 gem 'grpc', '~> 1.58.0' # rubocop:todo Gemfile/MissingFeatureCategory 560 561 561 - gem 'google-protobuf', '~> 3.25', '>= 3.25.1' # rubocop:todo Gemfile/MissingFeatureCategory 562 + gem 'google-protobuf', '~> 3.25', '>= 3.25.2' # rubocop:todo Gemfile/MissingFeatureCategory 562 563 563 564 gem 'toml-rb', '~> 2.2.0' # rubocop:todo Gemfile/MissingFeatureCategory 564 565
+93 -85
pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock
··· 33 33 remote: gems/gitlab-housekeeper 34 34 specs: 35 35 gitlab-housekeeper (0.1.0) 36 + activesupport 36 37 httparty 37 38 rubocop 38 39 ··· 44 45 concurrent-ruby (~> 1.2) 45 46 httparty (~> 0.21.0) 46 47 ipaddress (~> 0.8.3) 47 - nokogiri (~> 1.15.4) 48 48 railties (~> 7) 49 49 50 50 PATH ··· 66 66 remote: gems/gitlab-safe_request_store 67 67 specs: 68 68 gitlab-safe_request_store (0.1.0) 69 + rack (~> 2.2.8) 69 70 request_store 70 71 71 72 PATH ··· 79 80 remote: gems/gitlab-secret_detection 80 81 specs: 81 82 gitlab-secret_detection (0.1.0) 83 + parallel (~> 1.22) 82 84 re2 (~> 2.4) 83 85 toml-rb (~> 2.2) 84 86 ··· 89 91 actionview (>= 6.1.7.2) 90 92 activesupport (>= 6.1.7.2) 91 93 addressable (~> 2.8) 92 - nokogiri (~> 1.15.2) 93 94 rake (~> 13.0) 94 95 95 96 PATH ··· 179 180 PATH 180 181 remote: vendor/gems/sidekiq-reliable-fetch 181 182 specs: 182 - gitlab-sidekiq-fetcher (0.10.0) 183 + gitlab-sidekiq-fetcher (0.11.0) 183 184 json (>= 2.5) 184 - sidekiq (~> 6.1) 185 + sidekiq (~> 7.0) 185 186 186 187 GEM 187 188 remote: https://rubygems.org/ ··· 296 297 awesome_print (1.9.2) 297 298 awrence (1.2.1) 298 299 aws-eventstream (1.3.0) 299 - aws-partitions (1.761.0) 300 + aws-partitions (1.877.0) 300 301 aws-sdk-cloudformation (1.41.0) 301 302 aws-sdk-core (~> 3, >= 3.99.0) 302 303 aws-sigv4 (~> 1.1) 303 - aws-sdk-core (3.190.0) 304 + aws-sdk-core (3.190.2) 304 305 aws-eventstream (~> 1, >= 1.3.0) 305 306 aws-partitions (~> 1, >= 1.651.0) 306 307 aws-sigv4 (~> 1.8) 307 308 jmespath (~> 1, >= 1.6.1) 308 - aws-sdk-kms (1.64.0) 309 - aws-sdk-core (~> 3, >= 3.165.0) 309 + aws-sdk-kms (1.76.0) 310 + aws-sdk-core (~> 3, >= 3.188.0) 310 311 aws-sigv4 (~> 1.1) 311 - aws-sdk-s3 (1.141.0) 312 + aws-sdk-s3 (1.142.0) 312 313 aws-sdk-core (~> 3, >= 3.189.0) 313 314 aws-sdk-kms (~> 1) 314 315 aws-sigv4 (~> 1.8) 315 316 aws-sigv4 (1.8.0) 316 317 aws-eventstream (~> 1, >= 1.0.2) 317 - axe-core-api (4.6.0) 318 + axe-core-api (4.8.0) 318 319 dumb_delegator 319 320 virtus 320 - axe-core-rspec (4.6.0) 321 + axe-core-rspec (4.8.0) 321 322 axe-core-api 322 323 dumb_delegator 323 324 virtus ··· 352 353 bindata (2.4.11) 353 354 binding_of_caller (1.0.0) 354 355 debug_inspector (>= 0.0.1) 355 - bootsnap (1.17.0) 356 + bootsnap (1.17.1) 356 357 msgpack (~> 1.2) 357 358 browser (5.3.1) 358 359 builder (3.2.4) ··· 500 501 jwt (>= 2.5) 501 502 dotenv (2.7.6) 502 503 dry-cli (1.0.0) 503 - dry-core (1.0.0) 504 + dry-core (1.0.1) 504 505 concurrent-ruby (~> 1.0) 505 506 zeitwerk (~> 2.6) 506 507 dry-inflector (1.0.0) ··· 552 553 expression_parser (0.9.0) 553 554 extended-markdown-filter (0.7.0) 554 555 html-pipeline (~> 2.9) 555 - factory_bot (6.2.0) 556 + factory_bot (6.4.5) 556 557 activesupport (>= 5.0.0) 557 - factory_bot_rails (6.2.0) 558 - factory_bot (~> 6.2.0) 558 + factory_bot_rails (6.4.3) 559 + factory_bot (~> 6.4) 559 560 railties (>= 5.0.0) 560 561 faraday (1.10.0) 561 562 faraday-em_http (~> 1.0) ··· 596 597 rake 597 598 ffi-yajl (2.6.0) 598 599 libyajl2 (>= 1.2) 599 - filelock (1.1.1) 600 600 find_a_port (1.0.1) 601 601 flipper (0.26.2) 602 602 concurrent-ruby (< 2) ··· 693 693 fog-core (= 2.1.0) 694 694 fog-json (~> 1.2.0) 695 695 mime-types 696 - gitlab-labkit (0.34.0) 696 + gitlab-glfm-markdown (0.0.11) 697 + rb_sys (~> 0.9.86) 698 + gitlab-labkit (0.35.0) 697 699 actionpack (>= 5.0.0, < 8.0.0) 698 700 activesupport (>= 5.0.0, < 8.0.0) 699 701 grpc (>= 1.37) 700 702 jaeger-client (~> 1.1.0) 701 703 opentracing (~> 0.4) 702 - pg_query (~> 4.2.3) 704 + pg_query (>= 4.2.3, < 6.0) 703 705 redis (> 3.0.0, < 6.0.0) 704 706 gitlab-license (2.3.0) 705 707 gitlab-mail_room (0.0.24) ··· 727 729 omniauth (>= 1.3, < 3) 728 730 pyu-ruby-sasl (>= 0.0.3.3, < 0.1) 729 731 rubyntlm (~> 0.5) 730 - gitlab_quality-test_tooling (1.9.0) 732 + gitlab_quality-test_tooling (1.11.0) 731 733 activesupport (>= 6.1, < 7.2) 732 734 amatch (~> 0.4.1) 733 735 gitlab (~> 4.19) ··· 798 800 google-cloud-core (~> 1.6) 799 801 googleauth (>= 0.16.2, < 2.a) 800 802 mini_mime (~> 1.0) 801 - google-protobuf (3.25.1) 803 + google-protobuf (3.25.2) 802 804 googleapis-common-protos (1.4.0) 803 805 google-protobuf (~> 3.14) 804 806 googleapis-common-protos-types (~> 1.2) ··· 814 816 signet (>= 0.16, < 2.a) 815 817 gpgme (2.0.23) 816 818 mini_portile2 (~> 2.7) 817 - grape (1.7.1) 818 - activesupport 819 + grape (2.0.0) 820 + activesupport (>= 5) 819 821 builder 820 822 dry-types (>= 1.1) 821 823 mustermann-grape (~> 1.0.0) 822 - rack (>= 1.3.0, < 3) 824 + rack (>= 1.3.0) 823 825 rack-accept 824 826 grape-entity (0.10.0) 825 827 activesupport (>= 3.0.0) 826 828 multi_json (>= 1.3.2) 827 - grape-path-helpers (1.7.1) 829 + grape-path-helpers (2.0.1) 828 830 activesupport 829 - grape (~> 1.3) 831 + grape (~> 2.0) 830 832 rake (> 12) 831 833 ruby2_keywords (~> 0.0.2) 832 - grape-swagger (1.6.1) 833 - grape (~> 1.3) 834 + grape-swagger (2.0.1) 835 + grape (>= 1.7, < 3.0) 836 + rack-test (~> 2) 834 837 grape-swagger-entity (0.5.1) 835 838 grape-entity (>= 0.6.0) 836 839 grape-swagger (>= 1.2.0) ··· 879 882 haml (5.2.2) 880 883 temple (>= 0.8.0) 881 884 tilt 882 - haml_lint (0.52.0) 883 - haml (>= 4.0) 885 + haml_lint (0.53.0) 886 + haml (>= 5.0) 884 887 parallel (~> 1.10) 885 888 rainbow 886 889 rubocop (>= 1.0) ··· 1104 1107 net-protocol 1105 1108 net-ssh (7.2.0) 1106 1109 netrc (0.11.0) 1107 - nio4r (2.5.8) 1110 + nio4r (2.7.0) 1108 1111 no_proxy_fix (0.1.2) 1109 - nokogiri (1.15.5) 1112 + nokogiri (1.16.0) 1110 1113 mini_portile2 (~> 2.8.2) 1111 1114 racc (~> 1.4) 1112 1115 notiffany (0.1.3) ··· 1206 1209 rubypants (~> 0.2) 1207 1210 orm_adapter (0.5.0) 1208 1211 os (1.1.4) 1209 - pact (1.63.0) 1212 + pact (1.64.0) 1210 1213 pact-mock_service (~> 3.0, >= 3.3.1) 1211 1214 pact-support (~> 1.16, >= 1.16.9) 1212 1215 rack-test (>= 0.6.3, < 3.0.0) 1213 1216 rspec (~> 3.0) 1214 - term-ansicolor (~> 1.0) 1217 + term-ansicolor (~> 1.7) 1215 1218 thor (>= 0.20, < 2.0) 1216 - webrick (~> 1.3) 1217 - pact-mock_service (3.10.0) 1218 - filelock (~> 1.1) 1219 + webrick (~> 1.8) 1220 + pact-mock_service (3.11.2) 1219 1221 find_a_port (~> 1.0.1) 1220 1222 json 1221 1223 pact-support (~> 1.16, >= 1.16.4) 1222 1224 rack (~> 2.0) 1223 1225 rspec (>= 2.14) 1224 - term-ansicolor (~> 1.0) 1225 1226 thor (>= 0.19, < 2.0) 1226 - webrick (~> 1.3) 1227 - pact-support (1.18.1) 1227 + webrick (~> 1.8) 1228 + pact-support (1.20.0) 1228 1229 awesome_print (~> 1.9) 1229 - diff-lcs (~> 1.4) 1230 + diff-lcs (~> 1.5) 1230 1231 expgen (~> 0.1) 1231 1232 rainbow (~> 3.1.1) 1232 1233 parallel (1.22.1) 1233 - parser (3.2.2.4) 1234 + parser (3.3.0.2) 1234 1235 ast (~> 2.4.1) 1235 1236 racc 1236 1237 parslet (1.8.2) ··· 1253 1254 prime (0.1.2) 1254 1255 forwardable 1255 1256 singleton 1256 - prism (0.18.0) 1257 + prism (0.19.0) 1257 1258 proc_to_ast (0.1.0) 1258 1259 coderay 1259 1260 parser 1260 1261 unparser 1261 - prometheus-client-mmap (1.0.2) 1262 - rb_sys (~> 0.9) 1262 + prometheus-client-mmap (1.1.0) 1263 + rb_sys (~> 0.9.86) 1263 1264 protocol (2.0.0) 1264 1265 ruby_parser (~> 3.0) 1265 1266 pry (0.14.2) ··· 1297 1298 rack 1298 1299 rack-proxy (0.7.7) 1299 1300 rack 1301 + rack-session (1.0.2) 1302 + rack (< 3) 1300 1303 rack-test (2.1.0) 1301 1304 rack (>= 1.3) 1302 1305 rack-timeout (0.6.3) ··· 1321 1324 rails-dom-testing (2.0.3) 1322 1325 activesupport (>= 4.2.0) 1323 1326 nokogiri (>= 1.6) 1324 - rails-html-sanitizer (1.5.0) 1325 - loofah (~> 2.19, >= 2.19.1) 1327 + rails-html-sanitizer (1.6.0) 1328 + loofah (~> 2.21) 1329 + nokogiri (~> 1.14) 1326 1330 rails-i18n (7.0.3) 1327 1331 i18n (>= 0.7, < 2) 1328 1332 railties (>= 6.0.0, < 8) ··· 1338 1342 rb-fsevent (0.11.2) 1339 1343 rb-inotify (0.10.1) 1340 1344 ffi (~> 1.0) 1341 - rb_sys (0.9.83) 1345 + rb_sys (0.9.86) 1342 1346 rbtrace (0.4.14) 1343 1347 ffi (>= 1.0.6) 1344 1348 msgpack (>= 0.4.3) 1345 1349 optimist (>= 3.0.0) 1346 1350 rbtree (0.4.6) 1347 1351 rchardet (1.8.0) 1348 - re2 (2.5.0) 1352 + re2 (2.6.0) 1349 1353 mini_portile2 (~> 2.8.5) 1350 1354 recaptcha (5.12.3) 1351 1355 json 1352 1356 recursive-open-struct (1.1.3) 1353 1357 redcarpet (3.6.0) 1354 1358 redis (4.8.0) 1355 - redis-actionpack (5.3.0) 1359 + redis-actionpack (5.4.0) 1356 1360 actionpack (>= 5, < 8) 1357 - redis-rack (>= 2.1.0, < 3) 1361 + redis-rack (>= 2.1.0, < 4) 1358 1362 redis-store (>= 1.1.0, < 2) 1363 + redis-client (0.19.0) 1364 + connection_pool 1359 1365 redis-namespace (1.10.0) 1360 1366 redis (>= 4) 1361 - redis-rack (2.1.4) 1362 - rack (>= 2.0.8, < 3) 1367 + redis-rack (3.0.0) 1368 + rack-session (>= 0.2.0) 1363 1369 redis-store (>= 1.2, < 2) 1364 - redis-store (1.9.1) 1365 - redis (>= 4, < 5) 1370 + redis-store (1.10.0) 1371 + redis (>= 4, < 6) 1366 1372 regexp_parser (2.6.0) 1367 1373 regexp_property_values (1.0.0) 1368 1374 representable (3.2.0) ··· 1469 1475 ruby-fogbugz (0.3.0) 1470 1476 crack (~> 0.4) 1471 1477 multipart-post (~> 2.0) 1472 - ruby-lsp (0.13.1) 1478 + ruby-lsp (0.13.2) 1473 1479 language_server-protocol (~> 3.17.0) 1474 - prism (>= 0.18.0, < 0.19) 1480 + prism (>= 0.19.0, < 0.20) 1475 1481 sorbet-runtime (>= 0.5.5685) 1476 1482 ruby-lsp-rails (0.2.8) 1477 1483 actionpack (>= 6.0) ··· 1542 1548 shellany (0.0.1) 1543 1549 shoulda-matchers (5.1.0) 1544 1550 activesupport (>= 5.2.0) 1545 - sidekiq (6.5.12) 1546 - connection_pool (>= 2.2.5, < 3) 1547 - rack (~> 2.0) 1548 - redis (>= 4.5.0, < 5) 1551 + sidekiq (7.1.6) 1552 + concurrent-ruby (< 2) 1553 + connection_pool (>= 2.3.0) 1554 + rack (>= 2.2.4) 1555 + redis-client (>= 0.14.0) 1549 1556 sidekiq-cron (1.12.0) 1550 1557 fugit (~> 1.8) 1551 1558 globalid (>= 1.0.1) ··· 1713 1720 unparser (0.6.7) 1714 1721 diff-lcs (~> 1.3) 1715 1722 parser (>= 3.2.0) 1716 - uri (0.12.2) 1723 + uri (0.13.0) 1717 1724 uri_template (0.7.0) 1718 1725 valid_email (0.1.3) 1719 1726 activemodel ··· 1808 1815 autoprefixer-rails (= 10.2.5.1) 1809 1816 awesome_print 1810 1817 aws-sdk-cloudformation (~> 1) 1811 - aws-sdk-core (~> 3.190.0) 1812 - aws-sdk-s3 (~> 1.141.0) 1813 - axe-core-rspec 1818 + aws-sdk-core (~> 3.190.2) 1819 + aws-sdk-s3 (~> 1.142.0) 1820 + axe-core-rspec (~> 4.8.0) 1814 1821 babosa (~> 2.0) 1815 1822 base32 (~> 0.3.0) 1816 1823 batch-loader (~> 2.0.1) ··· 1818 1825 benchmark-ips (~> 2.11.0) 1819 1826 benchmark-memory (~> 0.1) 1820 1827 better_errors (~> 2.10.1) 1821 - bootsnap (~> 1.17.0) 1828 + bootsnap (~> 1.17.1) 1822 1829 browser (~> 5.3.1) 1823 1830 bullet (~> 7.1.2) 1824 1831 bundler-audit (~> 0.9.1) ··· 1861 1868 email_reply_trimmer (~> 0.1) 1862 1869 email_spec (~> 2.2.0) 1863 1870 error_tracking_open_api! 1864 - factory_bot_rails (~> 6.2.0) 1871 + factory_bot_rails (~> 6.4.3) 1865 1872 faraday (~> 1.0) 1866 1873 faraday_middleware-aws-sigv4 (~> 0.3.0) 1867 1874 fast_blank (~> 1.0.1) ··· 1884 1891 gitlab-dangerfiles (~> 4.6.0) 1885 1892 gitlab-experiment (~> 0.9.1) 1886 1893 gitlab-fog-azure-rm (~> 1.8.0) 1894 + gitlab-glfm-markdown (~> 0.0.11) 1887 1895 gitlab-housekeeper! 1888 1896 gitlab-http! 1889 - gitlab-labkit (~> 0.34.0) 1897 + gitlab-labkit (~> 0.35.0) 1890 1898 gitlab-license (~> 2.3) 1891 1899 gitlab-mail_room (~> 0.0.24) 1892 1900 gitlab-markup (~> 1.9.0) ··· 1902 1910 gitlab-utils! 1903 1911 gitlab_chronic_duration (~> 0.12) 1904 1912 gitlab_omniauth-ldap (~> 2.2.0) 1905 - gitlab_quality-test_tooling (~> 1.9.0) 1913 + gitlab_quality-test_tooling (~> 1.11.0) 1906 1914 gon (~> 6.4.0) 1907 1915 google-apis-androidpublisher_v3 (~> 0.34.0) 1908 1916 google-apis-cloudbilling_v1 (~> 0.21.0) ··· 1916 1924 google-apis-sqladmin_v1beta4 (~> 0.41.0) 1917 1925 google-apis-storage_v1 (~> 0.29) 1918 1926 google-cloud-storage (~> 1.45.0) 1919 - google-protobuf (~> 3.25, >= 3.25.1) 1927 + google-protobuf (~> 3.25, >= 3.25.2) 1920 1928 gpgme (~> 2.0.23) 1921 - grape (~> 1.7.1) 1929 + grape (~> 2.0.0) 1922 1930 grape-entity (~> 0.10.0) 1923 - grape-path-helpers (~> 1.7.1) 1924 - grape-swagger (~> 1.6.1) 1931 + grape-path-helpers (~> 2.0.0) 1932 + grape-swagger (~> 2.0.1) 1925 1933 grape-swagger-entity (~> 0.5.1) 1926 1934 grape_logging (~> 1.8) 1927 1935 graphiql-rails (~> 1.8.0) ··· 1932 1940 grpc (~> 1.58.0) 1933 1941 gssapi (~> 1.3.1) 1934 1942 guard-rspec 1935 - haml_lint (~> 0.52) 1943 + haml_lint (~> 0.53) 1936 1944 hamlit (~> 2.15.0) 1937 1945 hashie (~> 5.0.0) 1938 1946 health_check (~> 3.0) ··· 1979 1987 net-ldap (~> 0.17.1) 1980 1988 net-ntp 1981 1989 net-protocol (~> 0.1.3) 1982 - nokogiri (~> 1.15, >= 1.15.5) 1990 + nokogiri (~> 1.16) 1983 1991 oauth2 (~> 2.0) 1984 1992 octokit (~> 6.0) 1985 1993 ohai (~> 18.1) ··· 2007 2015 openssl (~> 3.0) 2008 2016 org-ruby (~> 0.9.12) 2009 2017 os (~> 1.1) 2010 - pact (~> 1.63) 2018 + pact (~> 1.64) 2011 2019 parallel (~> 1.19) 2012 - parser (~> 3.2, >= 3.2.2.4) 2020 + parser (~> 3.3, >= 3.3.0.2) 2013 2021 parslet (~> 1.8) 2014 2022 peek (~> 1.1) 2015 2023 pg (~> 1.5.4) 2016 2024 pg_query (~> 4.2.3) 2017 2025 png_quantizator (~> 0.2.1) 2018 2026 premailer-rails (~> 1.10.3) 2019 - prometheus-client-mmap (~> 1.0, >= 1.0.2) 2027 + prometheus-client-mmap (~> 1.1) 2020 2028 pry-byebug 2021 2029 pry-rails (~> 0.3.9) 2022 2030 pry-shell (~> 0.6.4) 2023 - puma (~> 6.4) 2031 + puma (= 6.4.0) 2024 2032 rack (~> 2.2.8) 2025 2033 rack-attack (~> 6.7.0) 2026 2034 rack-cors (~> 2.0.1) ··· 2032 2040 rails-i18n (~> 7.0) 2033 2041 rainbow (~> 3.0) 2034 2042 rbtrace (~> 0.4) 2035 - re2 (= 2.5.0) 2043 + re2 (= 2.6.0) 2036 2044 recaptcha (~> 5.12) 2037 2045 redis (~> 4.8.0) 2038 - redis-actionpack (~> 5.3.0) 2046 + redis-actionpack (~> 5.4.0) 2039 2047 redis-namespace (~> 1.10.0) 2040 2048 request_store (~> 1.5.1) 2041 2049 responders (~> 3.0) ··· 2051 2059 rspec_profiling (~> 0.0.6) 2052 2060 rubocop 2053 2061 ruby-fogbugz (~> 0.3.0) 2054 - ruby-lsp (~> 0.13.1) 2062 + ruby-lsp (~> 0.13.2) 2055 2063 ruby-lsp-rails (~> 0.2.8) 2056 2064 ruby-lsp-rspec (~> 0.1.8) 2057 2065 ruby-magic (~> 0.6) ··· 2071 2079 sentry-ruby (~> 5.10.0) 2072 2080 sentry-sidekiq (~> 5.10.0) 2073 2081 shoulda-matchers (~> 5.1.0) 2074 - sidekiq (~> 6.5.10) 2082 + sidekiq (~> 7.1.6) 2075 2083 sidekiq-cron (~> 1.12.0) 2076 2084 sigdump (~> 0.2.4) 2077 2085 simple_po_parser (~> 1.1.6) 2078 - simplecov (~> 0.21) 2086 + simplecov (~> 0.22) 2079 2087 simplecov-cobertura (~> 2.1.0) 2080 2088 simplecov-lcov (~> 0.8.0) 2081 2089 slack-messenger (~> 2.3.4) ··· 2117 2125 yajl-ruby (~> 1.4.3) 2118 2126 2119 2127 BUNDLED WITH 2120 - 2.4.22 2128 + 2.5.4
+113 -90
pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix
··· 389 389 platforms = []; 390 390 source = { 391 391 remotes = ["https://rubygems.org"]; 392 - sha256 = "1whf6ppvdibfpsr660ajncig3hyc6q9dvnx645ajrjfz3r7487i9"; 392 + sha256 = "1zcwrlg4in3gzvsiynpzp9fzlr5grrhc2881xcgfs01ppmxysllm"; 393 393 type = "gem"; 394 394 }; 395 - version = "1.761.0"; 395 + version = "1.877.0"; 396 396 }; 397 397 aws-sdk-cloudformation = { 398 398 dependencies = ["aws-sdk-core" "aws-sigv4"]; ··· 411 411 platforms = []; 412 412 source = { 413 413 remotes = ["https://rubygems.org"]; 414 - sha256 = "19nglxz49nlzgsvnivb3bdm17vxjn1ng2br8659xv48nzjrmyid3"; 414 + sha256 = "0z9f8ypvpwj3sfqh3nlnhrq7ryhrv7isqzg370fba27zpy7bv5sx"; 415 415 type = "gem"; 416 416 }; 417 - version = "3.190.0"; 417 + version = "3.190.2"; 418 418 }; 419 419 aws-sdk-kms = { 420 420 dependencies = ["aws-sdk-core" "aws-sigv4"]; ··· 422 422 platforms = []; 423 423 source = { 424 424 remotes = ["https://rubygems.org"]; 425 - sha256 = "1bcm0c9f7xy5qj5f0z3gddqslhb2vzrj9smc39pgqyq4jmn5kpj0"; 425 + sha256 = "0jfgw9a9c8xyjhkmgpd9rpi95h9i0rhbqszn8iqkbfm9rc9m1xz7"; 426 426 type = "gem"; 427 427 }; 428 - version = "1.64.0"; 428 + version = "1.76.0"; 429 429 }; 430 430 aws-sdk-s3 = { 431 431 dependencies = ["aws-sdk-core" "aws-sdk-kms" "aws-sigv4"]; ··· 433 433 platforms = []; 434 434 source = { 435 435 remotes = ["https://rubygems.org"]; 436 - sha256 = "0bnhpmi0iiaj88rqc5lhhnp2gyrk4fs8xz51lj36wwzng94qinya"; 436 + sha256 = "1sfpipfdmixpc0madfx1yvpwpv52fdhxfx4bmvrjxzb6ra78ikbr"; 437 437 type = "gem"; 438 438 }; 439 - version = "1.141.0"; 439 + version = "1.142.0"; 440 440 }; 441 441 aws-sigv4 = { 442 442 dependencies = ["aws-eventstream"]; ··· 455 455 platforms = []; 456 456 source = { 457 457 remotes = ["https://rubygems.org"]; 458 - sha256 = "0qkcia7yg50j0ycmzqnl2dzzz9a35wlg5fk30g0qs41z6p1xw38v"; 458 + sha256 = "0bx67lskxslfd2mpim3kqrxa4sx4qhvnpjpr57j1ll2xppyl9kw8"; 459 459 type = "gem"; 460 460 }; 461 - version = "4.6.0"; 461 + version = "4.8.0"; 462 462 }; 463 463 axe-core-rspec = { 464 464 dependencies = ["axe-core-api" "dumb_delegator" "virtus"]; ··· 466 466 platforms = []; 467 467 source = { 468 468 remotes = ["https://rubygems.org"]; 469 - sha256 = "0zvlrnxcyam2574gzn44r0ibz4h0s9j3vrp5lixi731qvp4mphhi"; 469 + sha256 = "07niarqd2lrbgnw00biyigc48lbdv4vy68p57myliz7k82nizidj"; 470 470 type = "gem"; 471 471 }; 472 - version = "4.6.0"; 472 + version = "4.8.0"; 473 473 }; 474 474 axiom-types = { 475 475 dependencies = ["descendants_tracker" "ice_nine" "thread_safe"]; ··· 653 653 platforms = []; 654 654 source = { 655 655 remotes = ["https://rubygems.org"]; 656 - sha256 = "0iqkzby0fdgi786m873nm0ckmc847wy9a4ydinb29m7hd3fs83kb"; 656 + sha256 = "028qif22isxa5sg5gf1322d0qjhir5rr0jpkaiwcic4lspacdcnv"; 657 657 type = "gem"; 658 658 }; 659 - version = "1.17.0"; 659 + version = "1.17.1"; 660 660 }; 661 661 browser = { 662 662 groups = ["default"]; ··· 1391 1391 platforms = []; 1392 1392 source = { 1393 1393 remotes = ["https://rubygems.org"]; 1394 - sha256 = "01gks2hrp7nl3pzb487azvd25dlbrc40d5cpk4n0szwnf2c0k4ks"; 1394 + sha256 = "03a5qn74c4lk2rpy6wlhv66synjlyzc4wn086xzphkpmw12l4bzk"; 1395 1395 type = "gem"; 1396 1396 }; 1397 - version = "1.0.0"; 1397 + version = "1.0.1"; 1398 1398 }; 1399 1399 dry-inflector = { 1400 1400 groups = ["default" "development" "test"]; ··· 1674 1674 platforms = []; 1675 1675 source = { 1676 1676 remotes = ["https://rubygems.org"]; 1677 - sha256 = "04vxmjr200akcil9fqxc9ghbb9q0lyrh2q03xxncycd5vln910fi"; 1677 + sha256 = "1glq677vmd3xrdilcx6ar8sdaysm9ldrppg34yzw43jzr6dx47fp"; 1678 1678 type = "gem"; 1679 1679 }; 1680 - version = "6.2.0"; 1680 + version = "6.4.5"; 1681 1681 }; 1682 1682 factory_bot_rails = { 1683 1683 dependencies = ["factory_bot" "railties"]; ··· 1685 1685 platforms = []; 1686 1686 source = { 1687 1687 remotes = ["https://rubygems.org"]; 1688 - sha256 = "18fhcihkc074gk62iwqgbdgc3ymim4fm0b4p3ipffy5hcsb9d2r7"; 1688 + sha256 = "1j6w4rr2cb5wng9yrn2ya9k40q52m0pbz47kzw8xrwqg3jncwwza"; 1689 1689 type = "gem"; 1690 1690 }; 1691 - version = "6.2.0"; 1691 + version = "6.4.3"; 1692 1692 }; 1693 1693 faraday = { 1694 1694 dependencies = ["faraday-em_http" "faraday-em_synchrony" "faraday-excon" "faraday-httpclient" "faraday-multipart" "faraday-net_http" "faraday-net_http_persistent" "faraday-patron" "faraday-rack" "faraday-retry" "ruby2_keywords"]; ··· 1896 1896 type = "gem"; 1897 1897 }; 1898 1898 version = "2.6.0"; 1899 - }; 1900 - filelock = { 1901 - groups = ["default" "development" "test"]; 1902 - platforms = []; 1903 - source = { 1904 - remotes = ["https://rubygems.org"]; 1905 - sha256 = "085vrb6wf243iqqnrrccwhjd4chphfdsybkvjbapa2ipfj1ja1sj"; 1906 - type = "gem"; 1907 - }; 1908 - version = "1.1.1"; 1909 1899 }; 1910 1900 find_a_port = { 1911 1901 groups = ["default" "development" "test"]; ··· 2220 2210 }; 2221 2211 version = "1.8.0"; 2222 2212 }; 2213 + gitlab-glfm-markdown = { 2214 + dependencies = ["rb_sys"]; 2215 + groups = ["default"]; 2216 + platforms = []; 2217 + source = { 2218 + remotes = ["https://rubygems.org"]; 2219 + sha256 = "0z0h4bvfvlwyfx8ia03lr9dlpy38n75v2wxh424v6fhy4z08ycab"; 2220 + type = "gem"; 2221 + }; 2222 + version = "0.0.11"; 2223 + }; 2223 2224 gitlab-housekeeper = { 2224 - dependencies = ["httparty" "rubocop"]; 2225 + dependencies = ["activesupport" "httparty" "rubocop"]; 2225 2226 groups = ["development" "test"]; 2226 2227 platforms = []; 2227 2228 source = { ··· 2231 2232 version = "0.1.0"; 2232 2233 }; 2233 2234 gitlab-http = { 2234 - dependencies = ["activesupport" "concurrent-ruby" "httparty" "ipaddress" "nokogiri" "railties"]; 2235 + dependencies = ["activesupport" "concurrent-ruby" "httparty" "ipaddress" "railties"]; 2235 2236 groups = ["default"]; 2236 2237 platforms = []; 2237 2238 source = { ··· 2246 2247 platforms = []; 2247 2248 source = { 2248 2249 remotes = ["https://rubygems.org"]; 2249 - sha256 = "1k9yd8b1xbq3l6l1n4pb0mh2wklz0ninr7h2l5xx031r05150p6a"; 2250 + sha256 = "0ya6r3ij0fzz6p50h157bn224n7405nwak6lx80ppvil9sm0dzr6"; 2250 2251 type = "gem"; 2251 2252 }; 2252 - version = "0.34.0"; 2253 + version = "0.35.0"; 2253 2254 }; 2254 2255 gitlab-license = { 2255 2256 groups = ["default"]; ··· 2313 2314 version = "0.1.0"; 2314 2315 }; 2315 2316 gitlab-safe_request_store = { 2316 - dependencies = ["request_store"]; 2317 + dependencies = ["rack" "request_store"]; 2317 2318 groups = ["default"]; 2318 2319 platforms = []; 2319 2320 source = { ··· 2344 2345 version = "0.2.3"; 2345 2346 }; 2346 2347 gitlab-secret_detection = { 2347 - dependencies = ["re2" "toml-rb"]; 2348 + dependencies = ["parallel" "re2" "toml-rb"]; 2348 2349 groups = ["default"]; 2349 2350 platforms = []; 2350 2351 source = { ··· 2361 2362 path = "${src}/vendor/gems/sidekiq-reliable-fetch"; 2362 2363 type = "path"; 2363 2364 }; 2364 - version = "0.10.0"; 2365 + version = "0.11.0"; 2365 2366 }; 2366 2367 gitlab-styles = { 2367 2368 dependencies = ["rubocop" "rubocop-graphql" "rubocop-performance" "rubocop-rails" "rubocop-rspec"]; ··· 2375 2376 version = "11.0.0"; 2376 2377 }; 2377 2378 gitlab-utils = { 2378 - dependencies = ["actionview" "activesupport" "addressable" "nokogiri" "rake"]; 2379 + dependencies = ["actionview" "activesupport" "addressable" "rake"]; 2379 2380 groups = ["monorepo"]; 2380 2381 platforms = []; 2381 2382 source = { ··· 2412 2413 platforms = []; 2413 2414 source = { 2414 2415 remotes = ["https://rubygems.org"]; 2415 - sha256 = "18m35p6kizkaw829lwvh6mc7r8q94gmyhkq9qggx7r78h8iafiqd"; 2416 + sha256 = "0anhwfn9dnd8zkjwkq3qycjswfxqksfnwvl7dr6azz2zvjnxnii1"; 2416 2417 type = "gem"; 2417 2418 }; 2418 - version = "1.9.0"; 2419 + version = "1.11.0"; 2419 2420 }; 2420 2421 globalid = { 2421 2422 dependencies = ["activesupport"]; ··· 2663 2664 platforms = []; 2664 2665 source = { 2665 2666 remotes = ["https://rubygems.org"]; 2666 - sha256 = "18yiqq657lbqbrbdfbxfspdrkiynd0wf49l3cgdw939z36cy0h77"; 2667 + sha256 = "02sh4rp14wmpfv9r7xrap6xgcakg0lk6zjvq1gsi5y38swhn2blw"; 2667 2668 type = "gem"; 2668 2669 }; 2669 - version = "3.25.1"; 2670 + version = "3.25.2"; 2670 2671 }; 2671 2672 googleapis-common-protos = { 2672 2673 dependencies = ["google-protobuf" "googleapis-common-protos-types" "grpc"]; ··· 2718 2719 platforms = []; 2719 2720 source = { 2720 2721 remotes = ["https://rubygems.org"]; 2721 - sha256 = "1dnbb3gxwbmvhzvzb22prwaim9wmvilm0nm91ndw2ggf324rsrvb"; 2722 + sha256 = "0jj98w80ry1ir8lc3347130s0z8yd7gk727r9ynwwk782x6gkvrs"; 2722 2723 type = "gem"; 2723 2724 }; 2724 - version = "1.7.1"; 2725 + version = "2.0.0"; 2725 2726 }; 2726 2727 grape-entity = { 2727 2728 dependencies = ["activesupport" "multi_json"]; ··· 2740 2741 platforms = []; 2741 2742 source = { 2742 2743 remotes = ["https://rubygems.org"]; 2743 - sha256 = "1ql1acy68n9xkvjzda1vpscf20zqqwjm959b7cx3w1yl40d2f9rf"; 2744 + sha256 = "1mq2cwy0jvprq3wdilds1n865jdl58sqg00im4w6fybf5kjiclmd"; 2744 2745 type = "gem"; 2745 2746 }; 2746 - version = "1.7.1"; 2747 + version = "2.0.1"; 2747 2748 }; 2748 2749 grape-swagger = { 2749 - dependencies = ["grape"]; 2750 + dependencies = ["grape" "rack-test"]; 2750 2751 groups = ["development" "test"]; 2751 2752 platforms = []; 2752 2753 source = { 2753 2754 remotes = ["https://rubygems.org"]; 2754 - sha256 = "17y6smk7shplblgic4jvi5njhd0x91n1xrvds3l6cjsjfs2d7lhg"; 2755 + sha256 = "1467ni6f0yy4z3qldjs8x0h50n9ym6zyjbx5gqqzbq6zhvgbx40g"; 2755 2756 type = "gem"; 2756 2757 }; 2757 - version = "1.6.1"; 2758 + version = "2.0.1"; 2758 2759 }; 2759 2760 grape-swagger-entity = { 2760 2761 dependencies = ["grape-entity" "grape-swagger"]; ··· 2913 2914 platforms = []; 2914 2915 source = { 2915 2916 remotes = ["https://rubygems.org"]; 2916 - sha256 = "1shlh68vjqyj092ig2b571anbr5npg8kp66a7cq5h9a1387nnckn"; 2917 + sha256 = "060vz5dx0ag3ggpwhwfcadfim0g8aabl0b1dvnzagizymfsw2g92"; 2917 2918 type = "gem"; 2918 2919 }; 2919 - version = "0.52.0"; 2920 + version = "0.53.0"; 2920 2921 }; 2921 2922 hamlit = { 2922 2923 dependencies = ["temple" "thor" "tilt"]; ··· 4040 4041 platforms = []; 4041 4042 source = { 4042 4043 remotes = ["https://rubygems.org"]; 4043 - sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v"; 4044 + sha256 = "0xkjz56qc7hl7zy7i7bhiyw5pl85wwjsa4p70rj6s958xj2sd1lm"; 4044 4045 type = "gem"; 4045 4046 }; 4046 - version = "2.5.8"; 4047 + version = "2.7.0"; 4047 4048 }; 4048 4049 no_proxy_fix = { 4049 4050 groups = ["default" "development"]; ··· 4061 4062 platforms = []; 4062 4063 source = { 4063 4064 remotes = ["https://rubygems.org"]; 4064 - sha256 = "004ip9x9281fxhpipwi8di1sb1dnabscq9dy1p3cxgdwbniqqi12"; 4065 + sha256 = "1l8b0i24h4irivyhwy9xmkjbggw86cxkzkiqdqg0jpcp9qc8h4rl"; 4065 4066 type = "gem"; 4066 4067 }; 4067 - version = "1.15.5"; 4068 + version = "1.16.0"; 4068 4069 }; 4069 4070 notiffany = { 4070 4071 dependencies = ["nenv" "shellany"]; ··· 4466 4467 platforms = []; 4467 4468 source = { 4468 4469 remotes = ["https://rubygems.org"]; 4469 - sha256 = "0ldi3j95dh3c29w4bliykfdd08r95d4zvbdblk385w9b4knr2afc"; 4470 + sha256 = "1a3fbwzzzdsbzipv63mcq1q761mqc6w8k1vxkbrbf3aqi2489p8b"; 4470 4471 type = "gem"; 4471 4472 }; 4472 - version = "1.63.0"; 4473 + version = "1.64.0"; 4473 4474 }; 4474 4475 pact-mock_service = { 4475 - dependencies = ["filelock" "find_a_port" "json" "pact-support" "rack" "rspec" "term-ansicolor" "thor" "webrick"]; 4476 + dependencies = ["find_a_port" "json" "pact-support" "rack" "rspec" "thor" "webrick"]; 4476 4477 groups = ["default" "development" "test"]; 4477 4478 platforms = []; 4478 4479 source = { 4479 4480 remotes = ["https://rubygems.org"]; 4480 - sha256 = "09syv4y0g0pvjshxj8i0yg7mrvszgp503is1b78k86bgv6wc73l9"; 4481 + sha256 = "0lds3xpkrx91lm74pa3n5167c8mkmqyki9axj7bjj0m18r2ybna2"; 4481 4482 type = "gem"; 4482 4483 }; 4483 - version = "3.10.0"; 4484 + version = "3.11.2"; 4484 4485 }; 4485 4486 pact-support = { 4486 4487 dependencies = ["awesome_print" "diff-lcs" "expgen" "rainbow"]; ··· 4488 4489 platforms = []; 4489 4490 source = { 4490 4491 remotes = ["https://rubygems.org"]; 4491 - sha256 = "0xh4idg0m1mr0pkywj5f79nlr4g6n4waism86gj34h8wicf9c9aa"; 4492 + sha256 = "0waq8ywxhljm5sjk7m3q7f6s2pvcfshg3ncs9dl7kcsg2ail7hs1"; 4492 4493 type = "gem"; 4493 4494 }; 4494 - version = "1.18.1"; 4495 + version = "1.20.0"; 4495 4496 }; 4496 4497 parallel = { 4497 4498 groups = ["development" "test"]; ··· 4509 4510 platforms = []; 4510 4511 source = { 4511 4512 remotes = ["https://rubygems.org"]; 4512 - sha256 = "0r69dbh6h6j4d54isany2ir4ni4gf2ysvk3k44awi6amz18nggpd"; 4513 + sha256 = "181faqz59p2mbfab5q4l1r298pq0nxl0k85rjcb58g0lardmv321"; 4513 4514 type = "gem"; 4514 4515 }; 4515 - version = "3.2.2.4"; 4516 + version = "3.3.0.2"; 4516 4517 }; 4517 4518 parslet = { 4518 4519 groups = ["default" "development" "test"]; ··· 4625 4626 platforms = []; 4626 4627 source = { 4627 4628 remotes = ["https://rubygems.org"]; 4628 - sha256 = "172qxf1zyrhxzwbn4c7gz12zdyb1jkdqrqvb2c7863lmxp53rrxs"; 4629 + sha256 = "0qiv9irrca2la1awqgvzsg7a17z2nydqyq43w4fhapdkq2l7xwa7"; 4629 4630 type = "gem"; 4630 4631 }; 4631 - version = "0.18.0"; 4632 + version = "0.19.0"; 4632 4633 }; 4633 4634 proc_to_ast = { 4634 4635 dependencies = ["coderay" "parser" "unparser"]; ··· 4647 4648 platforms = []; 4648 4649 source = { 4649 4650 remotes = ["https://rubygems.org"]; 4650 - sha256 = "1xfy4g3bwgqb1hn948aw3zfwxvak3886gxdyf0cnajzjfp9z33pq"; 4651 + sha256 = "19mi424kwalrzdm7cvzjx2w0rw778mxqb75y9wn20nc277nxglvb"; 4651 4652 type = "gem"; 4652 4653 }; 4653 - version = "1.0.2"; 4654 + version = "1.1.0"; 4654 4655 }; 4655 4656 protocol = { 4656 4657 dependencies = ["ruby_parser"]; ··· 4834 4835 }; 4835 4836 version = "0.7.7"; 4836 4837 }; 4838 + rack-session = { 4839 + dependencies = ["rack"]; 4840 + groups = ["default"]; 4841 + platforms = []; 4842 + source = { 4843 + remotes = ["https://rubygems.org"]; 4844 + sha256 = "0xhxhlsz6shh8nm44jsmd9276zcnyzii364vhcvf0k8b8bjia8d0"; 4845 + type = "gem"; 4846 + }; 4847 + version = "1.0.2"; 4848 + }; 4837 4849 rack-test = { 4838 4850 dependencies = ["rack"]; 4839 4851 groups = ["default" "development" "test"]; ··· 4889 4901 version = "2.0.3"; 4890 4902 }; 4891 4903 rails-html-sanitizer = { 4892 - dependencies = ["loofah"]; 4893 - groups = ["default" "development" "test"]; 4904 + dependencies = ["loofah" "nokogiri"]; 4905 + groups = ["default" "development" "monorepo" "test"]; 4894 4906 platforms = []; 4895 4907 source = { 4896 4908 remotes = ["https://rubygems.org"]; 4897 - sha256 = "0ygav4xyq943qqyhjmi3mzirn180j565mc9h5j4css59x1sn0cmz"; 4909 + sha256 = "1pm4z853nyz1bhhqr7fzl44alnx4bjachcr6rh6qjj375sfz3sc6"; 4898 4910 type = "gem"; 4899 4911 }; 4900 - version = "1.5.0"; 4912 + version = "1.6.0"; 4901 4913 }; 4902 4914 rails-i18n = { 4903 4915 dependencies = ["i18n" "railties"]; ··· 4967 4979 platforms = []; 4968 4980 source = { 4969 4981 remotes = ["https://rubygems.org"]; 4970 - sha256 = "0pj5qq4phswviw9vybvz4ql5921ddxkkmn9iywm992x0kbvhvn0f"; 4982 + sha256 = "131sa2jvc7b1yld3nzc0xq7lvwvql7b8c09i0xv2brzjybammlv5"; 4971 4983 type = "gem"; 4972 4984 }; 4973 - version = "0.9.83"; 4985 + version = "0.9.86"; 4974 4986 }; 4975 4987 rbtrace = { 4976 4988 dependencies = ["ffi" "msgpack" "optimist"]; ··· 5009 5021 platforms = []; 5010 5022 source = { 5011 5023 remotes = ["https://rubygems.org"]; 5012 - sha256 = "0ih6igmfcb4b9a8hd46ggn85zfyclz9h828d0xafy2pq5qlz9fs2"; 5024 + sha256 = "0sj80r3gy4sb27mrgc6pwcf2lra669p8p81axdv2p5pfm6k3mqbq"; 5013 5025 type = "gem"; 5014 5026 }; 5015 - version = "2.5.0"; 5027 + version = "2.6.0"; 5016 5028 }; 5017 5029 recaptcha = { 5018 5030 dependencies = ["json"]; ··· 5071 5083 platforms = []; 5072 5084 source = { 5073 5085 remotes = ["https://rubygems.org"]; 5074 - sha256 = "0h4iq67p5jjkg9kny7ki6yzkivyakmhbp6ckkhl6mlnriw5avc9z"; 5086 + sha256 = "0h1mx8shrzpcj27k9kw77f4cq7i217vxfd1ksqb4g485md4zc37i"; 5075 5087 type = "gem"; 5076 5088 }; 5077 - version = "5.3.0"; 5089 + version = "5.4.0"; 5090 + }; 5091 + redis-client = { 5092 + dependencies = ["connection_pool"]; 5093 + groups = ["default"]; 5094 + platforms = []; 5095 + source = { 5096 + remotes = ["https://rubygems.org"]; 5097 + sha256 = "0k9jaqsdc2s2qm713pdv19dawk1b11vxnfclsps7ra2szwisznbf"; 5098 + type = "gem"; 5099 + }; 5100 + version = "0.19.0"; 5078 5101 }; 5079 5102 redis-namespace = { 5080 5103 dependencies = ["redis"]; ··· 5088 5111 version = "1.10.0"; 5089 5112 }; 5090 5113 redis-rack = { 5091 - dependencies = ["rack" "redis-store"]; 5114 + dependencies = ["rack-session" "redis-store"]; 5092 5115 groups = ["default"]; 5093 5116 platforms = []; 5094 5117 source = { 5095 5118 remotes = ["https://rubygems.org"]; 5096 - sha256 = "0k3pn706wnf7lb24l6hwsi00c8rx693hvgfnccw3qj1y635ywwh8"; 5119 + sha256 = "10438w0y1jbgr205zndvmz6md0mrqazh2j9fr88lvb8hms10pddb"; 5097 5120 type = "gem"; 5098 5121 }; 5099 - version = "2.1.4"; 5122 + version = "3.0.0"; 5100 5123 }; 5101 5124 redis-store = { 5102 5125 dependencies = ["redis"]; ··· 5104 5127 platforms = []; 5105 5128 source = { 5106 5129 remotes = ["https://rubygems.org"]; 5107 - sha256 = "0787fwmlvpx5k360dxlcs8r7vijgl2iyvh3zyvl7qyvgshw78k3v"; 5130 + sha256 = "17mhr1g3lmacrgjndbmrklngy32g55165n53111q70kykx7qjn7j"; 5108 5131 type = "gem"; 5109 5132 }; 5110 - version = "1.9.1"; 5133 + version = "1.10.0"; 5111 5134 }; 5112 5135 regexp_parser = { 5113 5136 groups = ["default" "development" "test"]; ··· 5502 5525 platforms = []; 5503 5526 source = { 5504 5527 remotes = ["https://rubygems.org"]; 5505 - sha256 = "1zsd9ax4xzk8y1hflzbmfq1l0fpflwqhrggd8x2f4j9ap6z464lg"; 5528 + sha256 = "1g1vdas991rv6lrjppjxjbfyzif4jxbncrcg9shgzrmibzilbnwr"; 5506 5529 type = "gem"; 5507 5530 }; 5508 - version = "0.13.1"; 5531 + version = "0.13.2"; 5509 5532 }; 5510 5533 ruby-lsp-rails = { 5511 5534 dependencies = ["actionpack" "activerecord" "railties" "ruby-lsp" "sorbet-runtime"]; ··· 5837 5860 version = "5.1.0"; 5838 5861 }; 5839 5862 sidekiq = { 5840 - dependencies = ["connection_pool" "rack" "redis"]; 5863 + dependencies = ["concurrent-ruby" "connection_pool" "rack" "redis-client"]; 5841 5864 groups = ["default"]; 5842 5865 platforms = []; 5843 5866 source = { 5844 5867 remotes = ["https://rubygems.org"]; 5845 - sha256 = "0zqr9is8y7mg5dfs1q8w5jl9spwvqkhbi9r6np8208n40hi3pydl"; 5868 + sha256 = "18j3g31ps6ga9nzza0z0d00qjrn810fhkhx2pqi3rvxwsmkdlnbq"; 5846 5869 type = "gem"; 5847 5870 }; 5848 - version = "6.5.12"; 5871 + version = "7.1.6"; 5849 5872 }; 5850 5873 sidekiq-cron = { 5851 5874 dependencies = ["fugit" "globalid" "sidekiq"]; ··· 6670 6693 platforms = []; 6671 6694 source = { 6672 6695 remotes = ["https://rubygems.org"]; 6673 - sha256 = "0fa49cdssxllj1j37a56kq27wsibx5lmqxkqdk1rz3452y0bsydy"; 6696 + sha256 = "094gk72ckazf495qc76gk09b5i318d5l9m7bicg2wxlrjcm3qm96"; 6674 6697 type = "gem"; 6675 6698 }; 6676 - version = "0.12.2"; 6699 + version = "0.13.0"; 6677 6700 }; 6678 6701 uri_template = { 6679 6702 groups = ["default"];
+1 -1
pkgs/applications/version-management/mercurial/default.nix
··· 62 62 cp contrib/hgk $out/bin 63 63 cat >> $out/etc/mercurial/hgrc << EOF 64 64 [extensions] 65 - hgk=$out/lib/${python.libPrefix}/site-packages/hgext/hgk.py 65 + hgk=$out/${python.sitePackages}/hgext/hgk.py 66 66 EOF 67 67 # setting HG so that hgk can be run itself as well (not only hg view) 68 68 WRAP_TK=" --set TK_LIBRARY ${tk}/lib/${tk.libPrefix}
+11
pkgs/applications/virtualization/docker/default.nix
··· 106 106 url = "https://github.com/moby/moby/pull/43136.patch"; 107 107 hash = "sha256-1WZfpVnnqFwLMYqaHLploOodls0gHF8OCp7MrM26iX8="; 108 108 }) 109 + ] ++ lib.optionals (lib.versions.major version == "24") [ 110 + # docker_24 has LimitNOFILE set to "infinity", which causes a wide variety of issues in containers. 111 + # Issues range from higher-than-usual ressource usage, to containers not starting at all. 112 + # This patch (part of the release candidates for docker_25) simply removes this unit option 113 + # making systemd use its default "1024:524288", which is sane. See commit message and/or the PR for 114 + # more details: https://github.com/moby/moby/pull/45534 115 + (fetchpatch { 116 + name = "LimitNOFILE-systemd-default.patch"; 117 + url = "https://github.com/moby/moby/pull/45534/commits/c8930105bc9fc3c1a8a90886c23535cc6c41e130.patch"; 118 + hash = "sha256-nyGLxFrJaD0TrDqsAwOD6Iph0aHcFH9sABj1Fy74sec="; 119 + }) 109 120 ]; 110 121 111 122 postPatch = ''
+2 -2
pkgs/build-support/testers/hasPkgConfigModules/tester.nix
··· 34 34 for moduleName in $moduleNames; do 35 35 echo "checking pkg-config module $moduleName in $buildInputs" 36 36 set +e 37 - version="$(pkg-config --modversion $moduleName)" 37 + version="$($PKG_CONFIG --modversion $moduleName)" 38 38 r=$? 39 39 set -e 40 40 if [[ $r = 0 ]]; then ··· 42 42 printf '%s\t%s\n' "$moduleName" "$version" >> "$out" 43 43 else 44 44 echo "These modules were available in the input propagation closure:" 45 - pkg-config --list-all 45 + $PKG_CONFIG --list-all 46 46 echo "❌ pkg-config module $moduleName was not found" 47 47 false 48 48 fi
+52
pkgs/by-name/al/alsa-lib-with-plugins/package.nix
··· 1 + { lib 2 + , pkgs 3 + , alsa-lib 4 + , plugins ? [ pkgs.alsa-plugins ] 5 + , lndir 6 + , symlinkJoin 7 + , runCommand 8 + }: 9 + let 10 + merged = symlinkJoin { name = "alsa-plugins-merged"; paths = plugins; }; 11 + in 12 + runCommand "${alsa-lib.pname}-${alsa-lib.version}" { 13 + meta = with lib; { 14 + description = "wrapper to ease access to ALSA plugins"; 15 + platforms = platforms.linux; 16 + maintainers = with maintainers; [ gm6k ]; 17 + }; 18 + outputs = alsa-lib.outputs; 19 + } ( 20 + ( 21 + lib.concatMapStringsSep "\n" ( 22 + output: '' 23 + mkdir ${builtins.placeholder output} 24 + ${lndir}/bin/lndir ${lib.attrByPath [output] null alsa-lib} \ 25 + ${builtins.placeholder output} 26 + '' 27 + ) alsa-lib.outputs 28 + ) + '' 29 + cp -r ${merged}/lib/alsa-lib $out/lib 30 + ( 31 + echo $out | wc -c 32 + echo ${alsa-lib} | wc -c 33 + ) | xargs echo | grep -q "^\(.*\) \1$" || ( 34 + echo cannot binary patch 35 + exit 1 36 + ) 37 + rm $out/lib/libasound.la 38 + rm $out/lib/libasound.so.?.?.? 39 + rm $dev/lib/pkgconfig/alsa.pc 40 + rm $dev/nix-support/propagated-build-inputs 41 + cp ${alsa-lib}/lib/libasound.la $out/lib 42 + cp ${alsa-lib}/lib/libasound.so.?.?.? $out/lib 43 + cp ${alsa-lib.dev}/lib/pkgconfig/alsa.pc $dev/lib/pkgconfig 44 + cp ${alsa-lib.dev}/nix-support/propagated-build-inputs $dev/nix-support 45 + sed -i \ 46 + $out/lib/libasound.la \ 47 + $out/lib/libasound.so.?.?.? \ 48 + $dev/lib/pkgconfig/alsa.pc \ 49 + $dev/nix-support/propagated-build-inputs \ 50 + -e "s@${alsa-lib}@$out@g" 51 + '' 52 + )
+3 -5
pkgs/by-name/an/anytype/package.nix
··· 2 2 3 3 let 4 4 pname = "anytype"; 5 - version = "0.37.3"; 5 + version = "0.38.0"; 6 6 name = "Anytype-${version}"; 7 - nameExecutable = pname; 8 7 src = fetchurl { 9 8 url = "https://github.com/anyproto/anytype-ts/releases/download/v${version}/${name}.AppImage"; 10 9 name = "Anytype-${version}.AppImage"; 11 - sha256 = "sha256-W3p67L07XOEtXYluI+TvggXBdaNRadypZc9MO6QTh4M="; 10 + hash = "sha256-tcAOj7omrhyyG8elnAvbj/FtYaYOBeBkclpPHhSoass="; 12 11 }; 13 12 appimageContents = appimageTools.extractType2 { inherit name src; }; 14 - in 15 - appimageTools.wrapType2 { 13 + in appimageTools.wrapType2 { 16 14 inherit name src; 17 15 18 16 extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs)
+18
pkgs/by-name/au/authentik/ldap.nix
··· 1 + { lib, buildGoModule, authentik }: 2 + 3 + buildGoModule { 4 + pname = "authentik-ldap-outpost"; 5 + inherit (authentik) version src; 6 + 7 + vendorHash = "sha256-74rSuZrO5c7mjhHh0iQlJEkOslsFrcDb1aRXXC4RsUM="; 8 + 9 + CGO_ENABLED = 0; 10 + 11 + subPackages = [ "cmd/ldap" ]; 12 + 13 + meta = authentik.meta // { 14 + description = "The authentik ldap outpost. Needed for the extendal ldap API."; 15 + homepage = "https://goauthentik.io/docs/providers/ldap/"; 16 + mainProgram = "ldap"; 17 + }; 18 + }
+5
pkgs/by-name/au/authentik/outposts.nix
··· 1 + { callPackage }: 2 + 3 + { 4 + ldap = callPackage ./ldap.nix { }; 5 + }
+254
pkgs/by-name/au/authentik/package.nix
··· 1 + { lib 2 + , stdenvNoCC 3 + , fetchFromGitHub 4 + , buildNpmPackage 5 + , buildGoModule 6 + , runCommand 7 + , openapi-generator-cli 8 + , nodejs 9 + , python3 10 + , codespell 11 + , makeWrapper }: 12 + 13 + let 14 + version = "2023.10.7"; 15 + 16 + src = fetchFromGitHub { 17 + owner = "goauthentik"; 18 + repo = "authentik"; 19 + rev = "version/${version}"; 20 + hash = "sha256-+1IdXRt28UZ2KTa0zsmjneNUOcutP99UUwqcYyVyqTI="; 21 + }; 22 + 23 + meta = with lib; { 24 + description = "The authentication glue you need"; 25 + changelog = "https://github.com/goauthentik/authentik/releases/tag/version%2F${version}"; 26 + homepage = "https://goauthentik.io/"; 27 + license = licenses.mit; 28 + platforms = platforms.linux; 29 + maintainers = with maintainers; [ jvanbruegge ]; 30 + }; 31 + 32 + website = buildNpmPackage { 33 + pname = "authentik-website"; 34 + inherit version src meta; 35 + npmDepsHash = "sha256-4dgFxEvMnp+35nSQNsEchtN1qoS5X2KzEbLPvMnyR+k="; 36 + 37 + NODE_ENV = "production"; 38 + NODE_OPTIONS = "--openssl-legacy-provider"; 39 + 40 + postPatch = '' 41 + cd website 42 + ''; 43 + 44 + installPhase = '' 45 + cp -r help $out 46 + ''; 47 + 48 + npmInstallFlags = [ "--include=dev" ]; 49 + npmBuildScript = "build-docs-only"; 50 + }; 51 + 52 + clientapi = stdenvNoCC.mkDerivation { 53 + pname = "authentik-client-api"; 54 + inherit version src meta; 55 + 56 + postPatch = '' 57 + rm Makefile 58 + 59 + substituteInPlace ./scripts/api-ts-config.yaml \ 60 + --replace-fail '/local' "$(pwd)/" 61 + ''; 62 + 63 + nativeBuildInputs = [ openapi-generator-cli ]; 64 + buildPhase = '' 65 + runHook preBuild 66 + openapi-generator-cli generate -i ./schema.yml \ 67 + -g typescript-fetch -o $out \ 68 + -c ./scripts/api-ts-config.yaml \ 69 + --additional-properties=npmVersion=${nodejs.pkgs.npm.version} \ 70 + --git-repo-id authentik --git-user-id goauthentik 71 + runHook postBuild 72 + ''; 73 + }; 74 + 75 + webui = buildNpmPackage { 76 + pname = "authentik-webui"; 77 + inherit version meta; 78 + 79 + src = runCommand "authentik-webui-source" {} '' 80 + mkdir -p $out/web/node_modules/@goauthentik/ 81 + cp -r ${src}/web $out/ 82 + ln -s ${src}/website $out/ 83 + ln -s ${clientapi} $out/web/node_modules/@goauthentik/api 84 + ''; 85 + npmDepsHash = "sha256-5aCKlArtoEijGqeYiY3zoV0Qo7/Xt5hSXbmy2uYZpok="; 86 + 87 + postPatch = '' 88 + cd web 89 + ''; 90 + 91 + installPhase = '' 92 + runHook preInstall 93 + mkdir $out 94 + cp -r dist $out/dist 95 + cp -r authentik $out/authentik 96 + runHook postInstall 97 + ''; 98 + 99 + NODE_ENV = "production"; 100 + NODE_OPTIONS = "--openssl-legacy-provider"; 101 + 102 + npmInstallFlags = [ "--include=dev" ]; 103 + }; 104 + 105 + python = python3.override { 106 + self = python; 107 + packageOverrides = final: prev: { 108 + authentik-django = prev.buildPythonPackage { 109 + pname = "authentik-django"; 110 + inherit version src meta; 111 + pyproject = true; 112 + 113 + postPatch = '' 114 + substituteInPlace authentik/root/settings.py \ 115 + --replace-fail 'Path(__file__).absolute().parent.parent.parent' "\"$out\"" 116 + substituteInPlace authentik/lib/default.yml \ 117 + --replace-fail '/blueprints' "$out/blueprints" 118 + substituteInPlace pyproject.toml \ 119 + --replace-fail 'dumb-init = "*"' "" \ 120 + --replace-fail 'djangorestframework-guardian' 'djangorestframework-guardian2' 121 + ''; 122 + 123 + nativeBuildInputs = [ prev.poetry-core ]; 124 + 125 + propagatedBuildInputs = with prev; [ 126 + argon2-cffi 127 + celery 128 + channels 129 + channels-redis 130 + colorama 131 + dacite 132 + daphne 133 + deepmerge 134 + defusedxml 135 + django 136 + django-filter 137 + django-guardian 138 + django-model-utils 139 + django-prometheus 140 + django-redis 141 + djangorestframework 142 + djangorestframework-guardian2 143 + docker 144 + drf-spectacular 145 + duo-client 146 + facebook-sdk 147 + flower 148 + geoip2 149 + gunicorn 150 + httptools 151 + kubernetes 152 + ldap3 153 + lxml 154 + opencontainers 155 + packaging 156 + paramiko 157 + psycopg 158 + pycryptodome 159 + pydantic 160 + pydantic-scim 161 + pyjwt 162 + pyyaml 163 + requests-oauthlib 164 + sentry-sdk 165 + structlog 166 + swagger-spec-validator 167 + twilio 168 + twisted 169 + ua-parser 170 + urllib3 171 + uvicorn 172 + uvloop 173 + watchdog 174 + webauthn 175 + websockets 176 + wsproto 177 + xmlsec 178 + zxcvbn 179 + jsonpatch 180 + ] ++ [ 181 + codespell 182 + ]; 183 + 184 + postInstall = '' 185 + mkdir -p $out/web $out/website 186 + cp -r lifecycle manage.py $out/${prev.python.sitePackages}/ 187 + cp -r blueprints $out/ 188 + cp -r ${webui}/dist ${webui}/authentik $out/web/ 189 + cp -r ${website} $out/website/help 190 + ln -s $out/${prev.python.sitePackages}/lifecycle $out/lifecycle 191 + ''; 192 + }; 193 + }; 194 + }; 195 + 196 + inherit (python.pkgs) authentik-django; 197 + 198 + proxy = buildGoModule { 199 + pname = "authentik-proxy"; 200 + inherit version src meta; 201 + 202 + postPatch = '' 203 + substituteInPlace internal/gounicorn/gounicorn.go \ 204 + --replace-fail './lifecycle' "${authentik-django}/lifecycle" 205 + substituteInPlace web/static.go \ 206 + --replace-fail './web' "${authentik-django}/web" 207 + substituteInPlace internal/web/static.go \ 208 + --replace-fail './web' "${authentik-django}/web" 209 + ''; 210 + 211 + CGO_ENABLED = 0; 212 + 213 + vendorHash = "sha256-74rSuZrO5c7mjhHh0iQlJEkOslsFrcDb1aRXXC4RsUM="; 214 + 215 + postInstall = '' 216 + mv $out/bin/server $out/bin/authentik 217 + ''; 218 + 219 + subPackages = [ "cmd/server" ]; 220 + }; 221 + 222 + in stdenvNoCC.mkDerivation { 223 + pname = "authentik"; 224 + inherit src version; 225 + 226 + postPatch = '' 227 + rm Makefile 228 + patchShebangs lifecycle/ak 229 + 230 + # This causes issues in systemd services 231 + substituteInPlace lifecycle/ak \ 232 + --replace-fail 'printf' '>&2 printf' \ 233 + --replace-fail '> /dev/stderr' "" 234 + ''; 235 + 236 + installPhase = '' 237 + runHook preInstall 238 + mkdir -p $out/bin 239 + cp -r lifecycle/ak $out/bin/ 240 + 241 + wrapProgram $out/bin/ak \ 242 + --prefix PATH : ${lib.makeBinPath [ (python.withPackages (ps: [ps.authentik-django])) proxy ]} \ 243 + --set TMPDIR /dev/shm \ 244 + --set PYTHONDONTWRITEBYTECODE 1 \ 245 + --set PYTHONUNBUFFERED 1 246 + runHook postInstall 247 + ''; 248 + 249 + nativeBuildInputs = [ makeWrapper ]; 250 + 251 + meta = meta // { 252 + mainProgram = "ak"; 253 + }; 254 + }
+5 -5
pkgs/by-name/co/codeium/package.nix
··· 13 13 }.${system} or throwSystem; 14 14 15 15 hash = { 16 - x86_64-linux = "sha256-6ki5sIzypyBhCFhUDXlD3mT13o9A4OQ4cFFfCWTFPaA="; 17 - aarch64-linux = "sha256-LoFDQDsQDRZZiyEpWmGTfEWE/kJDk4GNKA8AsoqxXmY="; 18 - x86_64-darwin = "sha256-o13H5phQ0aWCchizRpIWuy1nO/19qoRRZNq52QHbINY="; 19 - aarch64-darwin = "sha256-N7N1y3/C5Q4NT0fISjjUuU3a9IV1Ur5VEa/Z4wVoApU="; 16 + x86_64-linux = "sha256-vS3rHYxsRTWejp2SAQk7gI/C6ElOYOjPA5cHxy7ef3U="; 17 + aarch64-linux = "sha256-FxbJL5qzkVBPL6o52/gNJ8dC7Sgm/v5KFi8DL+SxiTc="; 18 + x86_64-darwin = "sha256-zPas9sZzl9FqcsoqMxIjvW75JhexW/cuWvku8fPUS1Q="; 19 + aarch64-darwin = "sha256-EZC9EEzilsm7H+oEr1Le5tNevWu1ldLB2UH0fS1RlLk="; 20 20 }.${system} or throwSystem; 21 21 22 22 bin = "$out/bin/codeium_language_server"; ··· 24 24 in 25 25 stdenv.mkDerivation (finalAttrs: { 26 26 pname = "codeium"; 27 - version = "1.6.26"; 27 + version = "1.6.28"; 28 28 src = fetchurl { 29 29 name = "${finalAttrs.pname}-${finalAttrs.version}.gz"; 30 30 url = "https://github.com/Exafunction/codeium/releases/download/language-server-v${finalAttrs.version}/language_server_${plat}.gz";
+2 -2
pkgs/by-name/fl/flarectl/package.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "flarectl"; 8 - version = "0.86.0"; 8 + version = "0.87.0"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "cloudflare"; 12 12 repo = "cloudflare-go"; 13 13 rev = "v${version}"; 14 - hash = "sha256-BGjay9DTlIU563bCSjprq5YwF47Xqj+ZulCda5t2t5I="; 14 + hash = "sha256-M3Qc9PAcYASOQyEjWdGrLKx9h6uQGPftMJnD0Uc2buc="; 15 15 }; 16 16 17 17 vendorHash = "sha256-Bn2SDvFWmmMYDpOe+KBuzyTZLpdDtYDPc8HixgEgX+M=";
+2 -2
pkgs/by-name/li/littlefs-fuse/package.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "littlefs-fuse"; 5 - version = "2.7.4"; 5 + version = "2.7.5"; 6 6 src = fetchFromGitHub { 7 7 owner = "littlefs-project"; 8 8 repo = pname; 9 9 rev = "v${version}"; 10 - hash = "sha256-S4yLe6xugr/cQOmf4vS09ebCqFuDPCXySJKACr0AUDU="; 10 + hash = "sha256-sSnk1iQV5aHcOPqVKbigWqojrZKlJK5CcrVlwilT2mE="; 11 11 }; 12 12 buildInputs = [ fuse ]; 13 13 installPhase = ''
+1 -1
pkgs/by-name/ni/nixfmt-rfc-style/date.txt
··· 1 - 2024-01-15 1 + 2024-01-31
+2 -2
pkgs/by-name/ni/nixfmt-rfc-style/generated-package.nix
··· 8 8 pname = "nixfmt"; 9 9 version = "0.5.0"; 10 10 src = fetchzip { 11 - url = "https://github.com/piegamesde/nixfmt/archive/1eff7a84ac82fbebb5f586244f1c80e1fcc4f494.tar.gz"; 12 - sha256 = "1pg876sr58h7v087kbjsnfr4pzvqpwzibl06w2468qs1sywmd283"; 11 + url = "https://github.com/piegamesde/nixfmt/archive/d6930fd0c62c4d7ec9e4a814adc3d2f590d96271.tar.gz"; 12 + sha256 = "1ijrdzdwricv4asmy296j7gzvhambv96nlxi3qrxb4lj1by6a34m"; 13 13 }; 14 14 isLibrary = true; 15 15 isExecutable = true;
+3 -4
pkgs/by-name/of/offpunk/package.nix
··· 9 9 , timg 10 10 , xdg-utils 11 11 , xsel 12 - , 13 12 }: 14 13 15 14 let ··· 31 30 xsel 32 31 ]; 33 32 in 34 - python3Packages.buildPythonPackage rec { 33 + python3Packages.buildPythonApplication rec { 35 34 pname = "offpunk"; 36 35 version = "2.1"; 37 - format = "pyproject"; 36 + pyproject = true; 38 37 39 38 disabled = python3Packages.pythonOlder "3.7"; 40 39 ··· 55 54 passthru.tests.version = testers.testVersion { package = offpunk; }; 56 55 57 56 meta = with lib; { 58 - description = "An Offline-First browser for the smolnet "; 57 + description = "A command-line and offline-first smolnet browser/feed reader"; 59 58 homepage = src.meta.homepage; 60 59 maintainers = with maintainers; [ DamienCassou ]; 61 60 platforms = platforms.linux;
+1 -1
pkgs/by-name/on/onedrivegui/package.nix
··· 74 74 makeWrapper ${python3Packages.python.interpreter} $out/bin/onedrivegui \ 75 75 --prefix PATH : ${lib.makeBinPath [ onedrive ]} \ 76 76 --prefix PYTHONPATH : ${python3Packages.makePythonPath (propagatedBuildInputs ++ [(placeholder "out")])} \ 77 - --add-flags $out/lib/${python3Packages.python.libPrefix}/site-packages/OneDriveGUI.py 77 + --add-flags $out/${python3Packages.python.sitePackages}/OneDriveGUI.py 78 78 ''; 79 79 80 80 meta = with lib; {
+29 -14
pkgs/by-name/pp/ppsspp/package.nix
··· 34 34 + lib.optionalString enableQt "-qt" 35 35 + lib.optionalString (!enableQt) "-sdl" 36 36 + lib.optionalString forceWayland "-wayland"; 37 - version = "1.16.6"; 37 + version = "1.17"; 38 38 39 39 src = fetchFromGitHub { 40 40 owner = "hrydgard"; 41 41 repo = "ppsspp"; 42 42 rev = "v${finalAttrs.version}"; 43 43 fetchSubmodules = true; 44 - hash = "sha256-FCdYvYKcV+0TpQUSWiooNlTXKYtqbfnAWwjk7M8iF1Q="; 44 + hash = "sha256-BJWcaxUUxNDiSX3YnhwXhgbp3iymcrR493BKrtivn3U="; 45 45 }; 46 46 47 47 postPatch = '' ··· 55 55 makeWrapper 56 56 pkg-config 57 57 python3 58 - ] ++ lib.optional enableQt wrapQtAppsHook; 58 + ] ++ lib.optionals enableQt [ wrapQtAppsHook ]; 59 59 60 60 buildInputs = [ 61 61 SDL2 ··· 67 67 ] ++ lib.optionals enableQt [ 68 68 qtbase 69 69 qtmultimedia 70 - ] ++ lib.optional enableVulkan vulkan-loader 70 + ] ++ lib.optionals enableVulkan [ vulkan-loader ] 71 71 ++ lib.optionals vulkanWayland [ wayland libffi ]; 72 72 73 73 cmakeFlags = [ 74 - "-DHEADLESS=${if enableQt then "OFF" else "ON"}" 75 - "-DOpenGL_GL_PREFERENCE=GLVND" 76 - "-DUSE_SYSTEM_FFMPEG=ON" 77 - "-DUSE_SYSTEM_LIBZIP=ON" 78 - "-DUSE_SYSTEM_SNAPPY=ON" 79 - "-DUSE_WAYLAND_WSI=${if vulkanWayland then "ON" else "OFF"}" 80 - "-DUSING_QT_UI=${if enableQt then "ON" else "OFF"}" 74 + (lib.cmakeBool "HEADLESS" (!enableQt)) 75 + (lib.cmakeBool "USE_SYSTEM_FFMPEG" true) 76 + (lib.cmakeBool "USE_SYSTEM_LIBZIP" true) 77 + (lib.cmakeBool "USE_SYSTEM_SNAPPY" true) 78 + (lib.cmakeBool "USE_WAYLAND_WSI" vulkanWayland) 79 + (lib.cmakeBool "USING_QT_UI" enableQt) 80 + (lib.cmakeFeature "OpenGL_GL_PREFERENCE" "GLVND") 81 81 ]; 82 82 83 83 desktopItems = [ ··· 98 98 runHook preInstall 99 99 100 100 mkdir -p $out/share/{applications,ppsspp,icons} 101 - '' + (if enableQt then '' 101 + '' 102 + + (if enableQt then '' 102 103 install -Dm555 PPSSPPQt $out/bin/ppsspp 103 104 wrapProgram $out/bin/ppsspp \ 104 105 '' else '' ··· 106 107 install -Dm555 PPSSPPSDL $out/share/ppsspp/ 107 108 makeWrapper $out/share/ppsspp/PPSSPPSDL $out/bin/ppsspp \ 108 109 --set SDL_VIDEODRIVER ${if forceWayland then "wayland" else "x11"} \ 109 - '') + lib.optionalString enableVulkan '' 110 + '') 111 + + lib.optionalString enableVulkan '' 110 112 --prefix LD_LIBRARY_PATH : ${vulkanPath} \ 111 - '' + "\n" + '' 113 + '' 114 + + '' 115 + 112 116 mv assets $out/share/ppsspp 113 117 mv ../icons/hicolor $out/share/icons 114 118 ··· 119 123 homepage = "https://www.ppsspp.org/"; 120 124 description = "A HLE Playstation Portable emulator, written in C++ (" 121 125 + (if enableQt then "Qt" else "SDL + headless") + ")"; 126 + longDescription = '' 127 + PPSSPP is a PSP emulator, which means that it can run games and other 128 + software that was originally made for the Sony PSP. 129 + 130 + The PSP had multiple types of software. The two most common are native PSP 131 + games on UMD discs and downloadable games (that were stored in the 132 + directory PSP/GAME on the "memory stick"). But there were also UMD Video 133 + discs, and PS1 games that could run in a proprietary emulator. PPSSPP does 134 + not run those. 135 + ''; 122 136 license = lib.licenses.gpl2Plus; 123 137 maintainers = [ lib.maintainers.AndersonTorres ]; 138 + mainProgram = "ppsspp"; 124 139 platforms = lib.platforms.linux; 125 140 }; 126 141 })
+201
pkgs/by-name/pr/pretalx/package.nix
··· 1 + { lib 2 + , buildNpmPackage 3 + , gettext 4 + , python3 5 + , fetchFromGitHub 6 + , nixosTests 7 + }: 8 + 9 + let 10 + python = python3.override { 11 + packageOverrides = final: prev: { 12 + django-bootstrap4 = prev.django-bootstrap4.overridePythonAttrs (oldAttrs: rec { 13 + version = "3.0.0"; 14 + src = oldAttrs.src.override { 15 + rev = "v${version}"; 16 + hash = "sha256-a8BopUwZjmvxOzBVqs4fTo0SY8sEEloGUw90daYWfz8="; 17 + }; 18 + 19 + propagatedBuildInputs = with final; [ 20 + beautifulsoup4 21 + django 22 + ]; 23 + 24 + # fails with some assertions 25 + doCheck = false; 26 + }); 27 + }; 28 + }; 29 + 30 + version = "2023.1.3"; 31 + 32 + src = fetchFromGitHub { 33 + owner = "pretalx"; 34 + repo = "pretalx"; 35 + rev = "v${version}"; 36 + hash = "sha256-YxmkjfftNrInIcSkK21wJXiEU6hbdDa1Od8p+HiLprs="; 37 + }; 38 + 39 + meta = with lib; { 40 + description = "Conference planning tool: CfP, scheduling, speaker management"; 41 + homepage = "https://github.com/pretalx/pretalx"; 42 + license = licenses.asl20; 43 + maintainers = teams.c3d2.members; 44 + platforms = platforms.linux; 45 + }; 46 + 47 + frontend = buildNpmPackage { 48 + pname = "pretalx-frontend"; 49 + inherit version src; 50 + 51 + sourceRoot = "${src.name}/src/pretalx/frontend/schedule-editor"; 52 + 53 + npmDepsHash = "sha256-4cnBHZ8WpHgp/bbsYYbdtrhuD6ffUAZq9ZjoLpWGfRg="; 54 + 55 + npmBuildScript = "build"; 56 + 57 + inherit meta; 58 + }; 59 + in 60 + python.pkgs.buildPythonApplication rec { 61 + pname = "pretalx"; 62 + inherit version src; 63 + pyproject = true; 64 + 65 + outputs = [ 66 + "out" 67 + "static" 68 + ]; 69 + 70 + postPatch = '' 71 + substituteInPlace src/pretalx/common/management/commands/rebuild.py \ 72 + --replace 'subprocess.check_call(["npm", "run", "build"], cwd=frontend_dir, env=env)' "" 73 + 74 + substituteInPlace src/setup.cfg \ 75 + --replace "--cov=./" "" 76 + ''; 77 + 78 + nativeBuildInputs = [ 79 + gettext 80 + python.pkgs.pythonRelaxDepsHook 81 + ]; 82 + 83 + pythonRelaxDeps = [ 84 + "bleach" 85 + "cssutils" 86 + "django-filter" 87 + "django-formtools" 88 + "libsass" 89 + "markdown" 90 + "pillow" 91 + ]; 92 + 93 + propagatedBuildInputs = with python.pkgs; [ 94 + beautifulsoup4 95 + bleach 96 + celery 97 + css-inline 98 + csscompressor 99 + cssutils 100 + defusedcsv 101 + django 102 + django-bootstrap4 103 + django-compressor 104 + django-context-decorator 105 + django-countries 106 + django-csp 107 + django-filter 108 + django-formset-js-improved 109 + django-formtools 110 + django-hierarkey 111 + django-i18nfield 112 + django-libsass 113 + django-scopes 114 + djangorestframework 115 + libsass 116 + markdown 117 + pillow 118 + publicsuffixlist 119 + python-dateutil 120 + qrcode 121 + reportlab 122 + requests 123 + rules 124 + urlman 125 + vobject 126 + whitenoise 127 + zxcvbn 128 + ] ++ beautifulsoup4.optional-dependencies.lxml; 129 + 130 + passthru.optional-dependencies = { 131 + mysql = with python.pkgs; [ 132 + mysqlclient 133 + ]; 134 + postgres = with python.pkgs; [ 135 + psycopg2 136 + ]; 137 + redis = with python.pkgs; [ 138 + redis 139 + ]; 140 + }; 141 + 142 + postBuild = '' 143 + rm -r ./src/pretalx/frontend/schedule-editor 144 + ln -s ${frontend}/lib/node_modules/@pretalx/schedule-editor ./src/pretalx/frontend/schedule-editor 145 + 146 + # Generate all static files, see https://docs.pretalx.org/administrator/commands.html#python-m-pretalx-rebuild 147 + PYTHONPATH=$PYTHONPATH:./src python -m pretalx rebuild 148 + ''; 149 + 150 + postInstall = '' 151 + mkdir -p $out/bin 152 + cp ./src/manage.py $out/bin/pretalx-manage 153 + 154 + # The processed source files are in the static output, except for fonts, which are duplicated. 155 + # See <https://github.com/pretalx/pretalx/issues/1585> for more details. 156 + find $out/${python.sitePackages}/pretalx/static \ 157 + -mindepth 1 \ 158 + -not -path "$out/${python.sitePackages}/pretalx/static/fonts*" \ 159 + -delete 160 + 161 + # Copy generated static files into dedicated output 162 + mkdir -p $static 163 + cp -r ./src/static.dist/** $static/ 164 + 165 + # Copy frontend files 166 + ln -s ${frontend}/lib/node_modules/@pretalx/schedule-editor/dist/* $static 167 + ''; 168 + 169 + preCheck = '' 170 + export PRETALX_CONFIG_FILE="$src/src/tests/ci_sqlite.cfg" 171 + cd src 172 + ''; 173 + 174 + nativeCheckInputs = with python.pkgs; [ 175 + faker 176 + freezegun 177 + pytest-django 178 + pytest-mock 179 + pytest-xdist 180 + pytestCheckHook 181 + responses 182 + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); 183 + 184 + disabledTests = [ 185 + # tries to run npm run i18n:extract 186 + "test_common_custom_makemessages_does_not_blow_up" 187 + # Expected to perform X queries or less but Y were done 188 + "test_schedule_export_public" 189 + "test_schedule_frab_json_export" 190 + "test_schedule_frab_xml_export" 191 + ]; 192 + 193 + passthru = { 194 + inherit python; 195 + tests = { 196 + inherit (nixosTests) pretalx; 197 + }; 198 + }; 199 + 200 + inherit meta; 201 + }
+46
pkgs/by-name/py/pysqlrecon/package.nix
··· 1 + { lib 2 + , fetchFromGitHub 3 + , python3 4 + }: 5 + 6 + python3.pkgs.buildPythonApplication rec { 7 + pname = "pysqlrecon"; 8 + version = "0.1.3"; 9 + pyproject = true; 10 + 11 + src = fetchFromGitHub { 12 + owner = "Tw1sm"; 13 + repo = "PySQLRecon"; 14 + rev = "refs/tags/v${version}"; 15 + hash = "sha256-IxIYJo2wG8xqetBqgUOePNWPSx9FaZPhqhOFy3kG6Uk="; 16 + }; 17 + 18 + pythonRelaxDeps = [ 19 + "rich" 20 + "typer" 21 + ]; 22 + 23 + nativeBuildInputs = with python3.pkgs; [ 24 + poetry-core 25 + pythonRelaxDepsHook 26 + ]; 27 + 28 + propagatedBuildInputs = with python3.pkgs; [ 29 + impacket 30 + rich 31 + typer 32 + ]; 33 + 34 + pythonImportsCheck = [ 35 + "pysqlrecon" 36 + ]; 37 + 38 + meta = with lib; { 39 + description = "Offensive MSSQL toolkit"; 40 + homepage = "https://github.com/Tw1sm/PySQLRecon"; 41 + changelog = "https://github.com/Tw1sm/PySQLRecon/blob/${version}/CHANGELOG.md"; 42 + license = licenses.bsd3; 43 + maintainers = with maintainers; [ fab ]; 44 + mainProgram = "pysqlrecon"; 45 + }; 46 + }
+3 -3
pkgs/by-name/re/renode-dts2repl/package.nix
··· 6 6 7 7 python3.pkgs.buildPythonApplication { 8 8 pname = "renode-dts2repl"; 9 - version = "unstable-2024-01-09"; 9 + version = "unstable-2024-01-20"; 10 10 pyproject = true; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "antmicro"; 14 14 repo = "dts2repl"; 15 - rev = "429ebc65e0bcbd967ccfe1f9a970abd5b5b6258f"; 16 - hash = "sha256-/62KAVIMCM6VNhW4rDqnKXOFrAO0cHpybGS3lconCqY="; 15 + rev = "bd09db556fa762cb1a4857d874545957d91b0010"; 16 + hash = "sha256-bGDM23PuON4fx4pNCNVYw2bN0tIWjmwZqghhksAIVGA="; 17 17 }; 18 18 19 19 nativeBuildInputs = [
+3 -3
pkgs/by-name/sh/shopware-cli/package.nix
··· 9 9 10 10 buildGoModule rec { 11 11 pname = "shopware-cli"; 12 - version = "0.4.18"; 12 + version = "0.4.22"; 13 13 src = fetchFromGitHub { 14 14 repo = "shopware-cli"; 15 15 owner = "FriendsOfShopware"; 16 16 rev = version; 17 - hash = "sha256-LOmGxH/czICSii8AkoXi1cQPL+MErV92iUZtJc2eg64="; 17 + hash = "sha256-P93wxAApV2iWXSQGXsCPjmvj2gGMwbKw6+yMgiainb4="; 18 18 }; 19 19 20 20 nativeBuildInputs = [ installShellFiles makeWrapper ]; 21 21 nativeCheckInputs = [ git dart-sass ]; 22 22 23 - vendorHash = "sha256-KMNPw2B4fLaOdSIFHBIAKXUtnu0sMwksJg3RUZKLDsE="; 23 + vendorHash = "sha256-FalN3qhw2o9NvSIfEU4juevPAsxQoksNjL3eATf0umU="; 24 24 25 25 postInstall = '' 26 26 export HOME="$(mktemp -d)"
+2 -2
pkgs/data/fonts/0xproto/default.nix
··· 4 4 }: 5 5 stdenvNoCC.mkDerivation rec { 6 6 pname = "0xproto"; 7 - version = "1.500"; 7 + version = "1.601"; 8 8 9 9 src = let 10 10 underscoreVersion = builtins.replaceStrings ["."] ["_"] version; 11 11 in 12 12 fetchzip { 13 13 url = "https://github.com/0xType/0xProto/releases/download/${version}/0xProto_${underscoreVersion}.zip"; 14 - hash = "sha256-4yZtYjNLHDsF16brUADzwS4/Ha0g+g0mU+sl8Gb9Zm0="; 14 + hash = "sha256-f/5YmyIF66+7w2Tb0V0UKRjwDYDdZ0BEqsEuyN0FaDQ="; 15 15 }; 16 16 17 17 installPhase = ''
+2 -2
pkgs/data/fonts/ibm-plex/default.nix
··· 2 2 3 3 stdenvNoCC.mkDerivation rec { 4 4 pname = "ibm-plex"; 5 - version = "6.2.0"; 5 + version = "6.4.0"; 6 6 7 7 src = fetchzip { 8 8 url = "https://github.com/IBM/plex/releases/download/v${version}/OpenType.zip"; 9 - hash = "sha256-RvD/aeZrvltJiuAHqYMNaRsjLgTdcC1/5zqlcd4qKAA="; 9 + hash = "sha256-/aR3bu03VxenSPed6EqrGoPjWCcKT//MVtb9OC8tSRs="; 10 10 }; 11 11 12 12 installPhase = ''
+2 -2
pkgs/desktops/cinnamon/cinnamon-session/default.nix
··· 32 32 in 33 33 stdenv.mkDerivation rec { 34 34 pname = "cinnamon-session"; 35 - version = "6.0.2"; 35 + version = "6.0.3"; 36 36 37 37 src = fetchFromGitHub { 38 38 owner = "linuxmint"; 39 39 repo = pname; 40 40 rev = version; 41 - hash = "sha256-AO4/JUysQyGDsQDbP9X7sqmcxyRSkNGjjTEu4fFzDZA="; 41 + hash = "sha256-dNg1e339NWRzyEsRp7I91SwK2H+lU28Ra+7MSgUDk8w="; 42 42 }; 43 43 44 44 patches = [
+2 -11
pkgs/desktops/deepin/apps/deepin-compressor/default.nix
··· 1 1 { stdenv 2 2 , lib 3 3 , fetchFromGitHub 4 - , fetchpatch 5 4 , dtkwidget 6 5 , qt5integration 7 6 , qt5platform-plugins ··· 21 20 22 21 stdenv.mkDerivation rec { 23 22 pname = "deepin-compressor"; 24 - version = "5.12.20"; 23 + version = "5.12.23"; 25 24 26 25 src = fetchFromGitHub { 27 26 owner = "linuxdeepin"; 28 27 repo = pname; 29 28 rev = version; 30 - hash = "sha256-oOxto0X/GBAA9q691uwC0PtCdHDTMBqi80ov4xCXPn0="; 29 + hash = "sha256-8qfpNM2rci4subdodxfJZLP3OvAxXl7QRl4MHGr15nA="; 31 30 }; 32 - 33 - patches = [ 34 - (fetchpatch { 35 - name = "fix-build-failures-for-new-dtkgui.patch"; 36 - url = "https://github.com/linuxdeepin/deepin-compressor/commit/0ee07030034b06021e366d8d6109f344d47ea26c.patch"; 37 - hash = "sha256-P++SxzZCWoXJnLQhC0H/64/LjW/dqnl3hCGBWHVDn9Q="; 38 - }) 39 - ]; 40 31 41 32 postPatch = '' 42 33 substituteInPlace src/source/common/pluginmanager.cpp \
+1
pkgs/desktops/gnome/core/nautilus/default.nix
··· 130 130 license = licenses.gpl3Plus; 131 131 platforms = platforms.linux; 132 132 maintainers = teams.gnome.members; 133 + mainProgram = "nautilus"; 133 134 }; 134 135 })
+29
pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/2002-Nixpkgs-versioned-QML-path.patch.in
··· 1 + From ca4c52a80532732243067eb00ec12b4ef84010a6 Mon Sep 17 00:00:00 2001 2 + From: OPNA2608 <opna2608@protonmail.com> 3 + Date: Tue, 30 Jan 2024 19:46:09 +0100 4 + Subject: [PATCH] Nixpkgs versioned QML path 5 + 6 + --- 7 + src/LomiriToolkit/uctheme.cpp | 6 ++++++ 8 + 1 file changed, 6 insertions(+) 9 + 10 + diff --git a/src/LomiriToolkit/uctheme.cpp b/src/LomiriToolkit/uctheme.cpp 11 + index a10c89344..4b0653589 100644 12 + --- a/src/LomiriToolkit/uctheme.cpp 13 + +++ b/src/LomiriToolkit/uctheme.cpp 14 + @@ -180,6 +180,12 @@ QStringList themeSearchPath() 15 + pathList << QStandardPaths::standardLocations(QStandardPaths::GenericDataLocation); 16 + } 17 + 18 + + // append versioned QML import path from Nixpkgs 19 + + const QString nixpkgsQmlImportPath = QString::fromLocal8Bit(getenv("NIXPKGS_QT@qtVersion@_QML_IMPORT_PATH")); 20 + + if (!nixpkgsQmlImportPath.isEmpty()) { 21 + + pathList << nixpkgsQmlImportPath.split(':', QString::SkipEmptyParts); 22 + + } 23 + + 24 + // append QML import path(s); we must explicitly support env override here 25 + const QString qml2ImportPath = QString::fromLocal8Bit(getenv("QML2_IMPORT_PATH")); 26 + if (!qml2ImportPath.isEmpty()) { 27 + -- 28 + 2.42.0 29 +
+6
pkgs/desktops/lomiri/qml/lomiri-ui-toolkit/default.nix
··· 3 3 , fetchFromGitLab 4 4 , fetchpatch 5 5 , gitUpdater 6 + , substituteAll 6 7 , testers 7 8 , dbus-test-runner 8 9 , dpkg ··· 74 75 }) 75 76 76 77 ./2001-Mark-problematic-tests.patch 78 + (substituteAll { 79 + src = ./2002-Nixpkgs-versioned-QML-path.patch.in; 80 + name = "2002-Nixpkgs-versioned-QML-path.patch"; 81 + qtVersion = lib.versions.major qtbase.version; 82 + }) 77 83 ]; 78 84 79 85 postPatch = ''
+55 -8
pkgs/development/compilers/koka/default.nix
··· 1 - { stdenv, pkgsHostTarget, cmake, makeWrapper, mkDerivation, fetchFromGitHub 2 - , alex, array, base, bytestring, cond, containers, directory, extra 3 - , filepath, hpack, hspec, hspec-core, isocline, json, lib, mtl 4 - , parsec, process, regex-compat, text, time }: 1 + { stdenv 2 + , pkgsHostTarget 3 + , cmake 4 + , makeWrapper 5 + , mkDerivation 6 + , fetchFromGitHub 7 + , alex 8 + , lib 9 + , hpack 10 + , aeson 11 + , array 12 + , async 13 + , base 14 + , bytestring 15 + , co-log-core 16 + , cond 17 + , containers 18 + , directory 19 + , FloatingHex 20 + , isocline 21 + , lens 22 + , lsp 23 + , mtl 24 + , network 25 + , network-simple 26 + , parsec 27 + , process 28 + , text 29 + , text-rope 30 + , time 31 + }: 5 32 6 33 let 7 - version = "2.4.2"; 34 + version = "3.0.4"; 8 35 src = fetchFromGitHub { 9 36 owner = "koka-lang"; 10 37 repo = "koka"; 11 38 rev = "v${version}"; 12 - sha256 = "sha256-sVjaIzOxNuBtDswpDl5gLB10Sw945TQAf2ywrKumqqk="; 39 + sha256 = "sha256-U8BW1Aq9t3je0YDV8NkE0MzdnjwXBJQbmekh5ufOs3k="; 13 40 fetchSubmodules = true; 14 41 }; 15 42 kklib = stdenv.mkDerivation { ··· 38 65 isExecutable = true; 39 66 libraryToolDepends = [ hpack ]; 40 67 executableHaskellDepends = [ 41 - array base bytestring cond containers directory isocline mtl 42 - parsec process text time kklib 68 + aeson 69 + array 70 + async 71 + base 72 + bytestring 73 + co-log-core 74 + cond 75 + containers 76 + directory 77 + FloatingHex 78 + isocline 79 + lens 80 + lsp 81 + mtl 82 + network 83 + network-simple 84 + parsec 85 + process 86 + text 87 + text-rope 88 + time 89 + kklib 43 90 ]; 44 91 executableToolDepends = [ alex makeWrapper ]; 45 92 postInstall = ''
+3 -3
pkgs/development/compilers/unison/default.nix
··· 11 11 12 12 stdenv.mkDerivation (finalAttrs: { 13 13 pname = "unison-code-manager"; 14 - version = "0.5.13"; 14 + version = "0.5.14"; 15 15 16 16 src = if stdenv.isDarwin then 17 17 fetchurl { 18 18 url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-macos.tar.gz"; 19 - hash = "sha256-/iaL3jTwUeGhfPgZ08njopkOC5t4RY3zggn0n2zLTnw="; 19 + hash = "sha256-LLyJy0qz5qm08Xj+mb09lBN5sw3v8AnaSYv832sYefg="; 20 20 } 21 21 else 22 22 fetchurl { 23 23 url = "https://github.com/unisonweb/unison/releases/download/release/${finalAttrs.version}/ucm-linux.tar.gz"; 24 - hash = "sha256-ZxuHpcyt0zxXMiltue99Tzrlvsrrb1cL3LNcGIo5NsI="; 24 + hash = "sha256-sIw3mc78cGPi+E+fXEpMvt+IEfPW03lex30bs0TVevo="; 25 25 }; 26 26 27 27 # The tarball is just the prebuilt binary, in the archive root.
+1 -1
pkgs/development/haskell-modules/configuration-darwin.nix
··· 345 345 }) (disableCabalFlag "fixity-th" super.fourmolu); 346 346 347 347 # https://github.com/NixOS/nixpkgs/issues/149692 348 - Agda = removeConfigureFlag "-foptimise-heavily" super.Agda; 348 + Agda = disableCabalFlag "optimise-heavily" super.Agda; 349 349 350 350 } // lib.optionalAttrs pkgs.stdenv.isx86_64 { # x86_64-darwin 351 351
+10 -4
pkgs/development/haskell-modules/configuration-nix.nix
··· 1134 1134 preCheck = "export CI=true"; 1135 1135 }) super.aeson-typescript; 1136 1136 1137 - # Enable extra optimisations which increase build time, but also 1138 - # later compiler performance, so we should do this for user's benefit. 1139 - # Flag added in Agda 2.6.2 1140 - Agda = appendConfigureFlag "-foptimise-heavily" super.Agda; 1137 + Agda = lib.pipe super.Agda [ 1138 + # Enable extra optimisations which increase build time, but also 1139 + # later compiler performance, so we should do this for user's benefit. 1140 + # Flag added in Agda 2.6.2 1141 + (enableCabalFlag "optimise-heavily") 1142 + # Enable debug printing, which worsens performance slightly but is 1143 + # very useful. 1144 + # Flag added in Agda 2.6.4.1, was always enabled before 1145 + (enableCabalFlag "debug") 1146 + ]; 1141 1147 1142 1148 # ats-format uses cli-setup in Setup.hs which is quite happy to write 1143 1149 # to arbitrary files in $HOME. This doesn't either not achieve anything
+3 -3
pkgs/development/interpreters/wasmtime/default.nix
··· 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "wasmtime"; 5 - version = "16.0.0"; 5 + version = "17.0.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "bytecodealliance"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - hash = "sha256-kySJme79RQMI8PP2Jhx1mjqJpUIf5jPn2TvbPEzw5hY="; 11 + hash = "sha256-HGs82LMDJJZl1bPaFsVetpMR7ytBgGmOkH1tt7xmUMA="; 12 12 fetchSubmodules = true; 13 13 }; 14 14 15 15 # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. 16 16 auditable = false; 17 - cargoHash = "sha256-2XlnR4OBvdQyMUUOL6VvqDxf8jGYlhz2PDuPd24Ocxw="; 17 + cargoHash = "sha256-bNGpBgAhLN4s90saQqIgFb6hXtfC9NIjOfy+hvkRJ6E="; 18 18 cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ]; 19 19 20 20 outputs = [ "out" "dev" ];
+5 -1
pkgs/development/libraries/agda/1lab/default.nix
··· 11 11 hash = "sha256-0U6s6sXdynk2IWRBDXBJCf7Gc+gE8AhR1PXZl0DS4yU="; 12 12 }; 13 13 14 - # We don't need anything in support; avoid installing LICENSE.agda 15 14 postPatch = '' 15 + # We don't need anything in support; avoid installing LICENSE.agda 16 16 rm -rf support 17 + 18 + # Remove verbosity options as they make Agda take longer and use more memory. 19 + shopt -s globstar extglob 20 + sed -Ei '/OPTIONS/s/ -v ?[^ #]+//g' src/**/*.@(agda|lagda.md) 17 21 ''; 18 22 19 23 libraryName = "1lab";
+2 -2
pkgs/development/libraries/httplib/default.nix
··· 7 7 8 8 stdenv.mkDerivation rec { 9 9 pname = "httplib"; 10 - version = "0.14.3"; 10 + version = "0.15.0"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "yhirose"; 14 14 repo = "cpp-httplib"; 15 15 rev = "v${version}"; 16 - hash = "sha256-53EBZTpz0INtjVSmjvg7XOQf0Bs2ADVe2//+nK6xRyE="; 16 + hash = "sha256-HV2RiWu4rt3rau/flcha500R67oGwbmyEPPnklpAvgY="; 17 17 }; 18 18 19 19 nativeBuildInputs = [ cmake ];
+5
pkgs/development/libraries/openvdb/default.nix
··· 20 20 21 21 cmakeFlags = [ "-DOPENVDB_CORE_STATIC=OFF" ]; 22 22 23 + # error: aligned deallocation function of type 'void (void *, std::align_val_t) noexcept' is only available on macOS 10.13 or newer 24 + env = lib.optionalAttrs (stdenv.isDarwin && lib.versionOlder stdenv.hostPlatform.darwinMinVersion "10.13" && lib.versionAtLeast tbb.version "2021.8.0") { 25 + NIX_CFLAGS_COMPILE = "-faligned-allocation"; 26 + }; 27 + 23 28 postFixup = '' 24 29 substituteInPlace $dev/lib/cmake/OpenVDB/FindOpenVDB.cmake \ 25 30 --replace \''${OPENVDB_LIBRARYDIR} $out/lib \
+69
pkgs/development/libraries/qwlroots/default.nix
··· 1 + { stdenv 2 + , lib 3 + , fetchFromGitHub 4 + , cmake 5 + , pkg-config 6 + , wrapQtAppsHook 7 + , wayland-scanner 8 + , qtbase 9 + , wayland 10 + , wayland-protocols 11 + , wlr-protocols 12 + , pixman 13 + , mesa 14 + , vulkan-loader 15 + , libinput 16 + , xorg 17 + , seatd 18 + , wlroots 19 + }: 20 + 21 + stdenv.mkDerivation (finalAttrs: { 22 + pname = "qwlroots"; 23 + version = "0.1.0"; 24 + 25 + src = fetchFromGitHub { 26 + owner = "vioken"; 27 + repo = "qwlroots"; 28 + rev = finalAttrs.version; 29 + hash = "sha256-ev4oCKR43XaYNTavj9XI3RAtB6RFprChpBFsrA2nVsM="; 30 + }; 31 + 32 + nativeBuildInputs = [ 33 + cmake 34 + pkg-config 35 + wrapQtAppsHook 36 + wayland-scanner 37 + ]; 38 + 39 + buildInputs = [ 40 + qtbase 41 + wayland 42 + wayland-protocols 43 + wlr-protocols 44 + pixman 45 + mesa 46 + vulkan-loader 47 + libinput 48 + xorg.libXdmcp 49 + xorg.xcbutilerrors 50 + seatd 51 + ]; 52 + 53 + propagatedBuildInputs = [ 54 + wlroots 55 + ]; 56 + 57 + cmakeFlags = [ 58 + (lib.cmakeBool "PREFER_QT_5" (lib.versionOlder qtbase.version "6")) 59 + ]; 60 + 61 + meta = { 62 + description = "Qt and QML bindings for wlroots"; 63 + homepage = "https://github.com/vioken/qwlroots"; 64 + license = with lib.licenses; [ gpl3Only lgpl3Only asl20 ]; 65 + platforms = wlroots.meta.platforms; 66 + maintainers = with lib.maintainers; [ rewine ]; 67 + }; 68 + }) 69 +
+1 -1
pkgs/development/libraries/science/networking/ns-3/default.nix
··· 120 120 "-DPython3_EXECUTABLE=${pythonEnv}/bin/python" 121 121 "-DNS3_PYTHON_BINDINGS=ON" 122 122 "-DNS3_DES_METRICS=ON" 123 - "-DNS3_BINDINGS_INSTALL_DIR=lib/${pythonEnv.libPrefix}/site-packages" 123 + "-DNS3_BINDINGS_INSTALL_DIR=${pythonEnv.sitePackages}" 124 124 "-DNS3_LOG=ON" 125 125 "-DNS3_ASSERT=ON" 126 126 "-DNS3_GTK3=ON"
+2 -2
pkgs/development/libraries/spglib/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "spglib"; 5 - version = "2.2.0"; # N.B: if you change this, please update: pythonPackages.spglib 5 + version = "2.3.0"; # N.B: if you change this, please update: pythonPackages.spglib 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "spglib"; 9 9 repo = "spglib"; 10 10 rev = "v${version}"; 11 - hash = "sha256-VaTW7n7DTeYBr/PrxPhfzfx/gLxzJikw5aL1tEbMtbs="; 11 + hash = "sha256-S/i0sIg7VwgpnB2Uo0d4FdVcSIb5tcGJ+0URmkNkxe8="; 12 12 }; 13 13 14 14 nativeBuildInputs = [ cmake gfortran gtest ];
+2 -2
pkgs/development/libraries/talloc/default.nix
··· 13 13 14 14 stdenv.mkDerivation rec { 15 15 pname = "talloc"; 16 - version = "2.4.1"; 16 + version = "2.4.2"; 17 17 18 18 src = fetchurl { 19 19 url = "mirror://samba/talloc/${pname}-${version}.tar.gz"; 20 - sha256 = "sha256-QQpUfwhVcAe+DogZTyGIaDWO3Aq5jJi6jBZ5MNs9M/k="; 20 + sha256 = "sha256-hez55GXiD5j5lQpS6aQR4UMgvFVfolfYdpe356mx2KY="; 21 21 }; 22 22 23 23 nativeBuildInputs = [
+1 -1
pkgs/development/libraries/vigra/default.nix
··· 44 44 python 45 45 ]; 46 46 47 - preConfigure = "cmakeFlags+=\" -DVIGRANUMPY_INSTALL_DIR=$out/lib/${python.libPrefix}/site-packages\""; 47 + preConfigure = "cmakeFlags+=\" -DVIGRANUMPY_INSTALL_DIR=$out/${python.sitePackages}\""; 48 48 49 49 cmakeFlags = [ "-DWITH_OPENEXR=1" ] 50 50 ++ lib.optionals (stdenv.hostPlatform.system == "x86_64-linux")
+1
pkgs/development/libraries/xxHash/default.nix
··· 37 37 ''; 38 38 homepage = "https://github.com/Cyan4973/xxHash"; 39 39 license = with licenses; [ bsd2 gpl2 ]; 40 + mainProgram = "xxhsum"; 40 41 maintainers = with maintainers; [ orivej ]; 41 42 platforms = platforms.all; 42 43 };
+34 -10
pkgs/development/misc/umr/default.nix
··· 1 - { lib, stdenv, fetchgit, bash-completion, cmake, pkg-config 2 - , json_c, libdrm, libpciaccess, llvmPackages, nanomsg, ncurses, SDL2 1 + { lib 2 + , stdenv 3 + 4 + , fetchFromGitLab 5 + 6 + , cmake 7 + , pkg-config 8 + 9 + , libdrm 10 + , mesa # libgbm 11 + , libpciaccess 12 + , llvmPackages 13 + , nanomsg 14 + , ncurses 15 + , SDL2 16 + , bash-completion 17 + 18 + , nix-update-script 3 19 }: 4 20 5 21 stdenv.mkDerivation rec { 6 22 pname = "umr"; 7 - version = "unstable-2022-08-23"; 23 + version = "1.0.8"; 8 24 9 - src = fetchgit { 10 - url = "https://gitlab.freedesktop.org/tomstdenis/umr"; 11 - rev = "87f814b1ffdbac8bfddd8529d344a7901cd7e112"; 12 - hash = "sha256-U1VP1AicSGWzBwzz99i7+3awATZocw5jaqtAxuRNaBE="; 25 + src = fetchFromGitLab { 26 + domain = "gitlab.freedesktop.org"; 27 + owner = "tomstdenis"; 28 + repo = "umr"; 29 + rev = version; 30 + hash = "sha256-ODkTYHDrKWNvjiEeIyfsCByf7hyr5Ps9ytbKb3253bU="; 13 31 }; 14 32 15 - nativeBuildInputs = [ cmake pkg-config llvmPackages.llvm.dev ]; 33 + nativeBuildInputs = [ 34 + cmake 35 + pkg-config 36 + ]; 16 37 17 38 buildInputs = [ 18 - bash-completion 19 - json_c 20 39 libdrm 40 + mesa 21 41 libpciaccess 22 42 llvmPackages.llvm 23 43 nanomsg 24 44 ncurses 25 45 SDL2 46 + 47 + bash-completion # Tries to create bash-completions in /var/empty otherwise? 26 48 ]; 27 49 28 50 # Remove static libraries (there are no dynamic libraries in there) 29 51 postInstall = '' 30 52 rm -r $out/lib 31 53 ''; 54 + 55 + passthru.updateScript = nix-update-script { }; 32 56 33 57 meta = with lib; { 34 58 description = "A userspace debugging and diagnostic tool for AMD GPUs";
+12 -5
pkgs/development/python-modules/aioelectricitymaps/default.nix
··· 2 2 , aiohttp 3 3 , aresponses 4 4 , buildPythonPackage 5 - , dataclasses-json 6 5 , fetchFromGitHub 6 + , mashumaro 7 + , orjson 7 8 , poetry-core 8 9 , pytest-asyncio 9 10 , pytestCheckHook ··· 13 14 14 15 buildPythonPackage rec { 15 16 pname = "aioelectricitymaps"; 16 - version = "0.1.6"; 17 + version = "0.2.0"; 17 18 pyproject = true; 18 19 19 - disabled = pythonOlder "3.10"; 20 + disabled = pythonOlder "3.11"; 20 21 21 22 src = fetchFromGitHub { 22 23 owner = "jpbede"; 23 24 repo = "aioelectricitymaps"; 24 25 rev = "refs/tags/v${version}"; 25 - hash = "sha256-SyI+2hxKOiSdx5e+vkHLsIk5xj4gNvmfZTYZ10oJhfc="; 26 + hash = "sha256-cwRmUHVIviQquZtcQRtCFxBZTt4QEyaCixbY1ExUL9A="; 26 27 }; 27 28 29 + postPatch = '' 30 + substituteInPlace pyproject.toml \ 31 + --replace-warn "--cov" "" 32 + ''; 33 + 28 34 nativeBuildInputs = [ 29 35 poetry-core 30 36 ]; 31 37 32 38 propagatedBuildInputs = [ 33 39 aiohttp 34 - dataclasses-json 40 + mashumaro 41 + orjson 35 42 ]; 36 43 37 44 nativeCheckInputs = [
+1 -1
pkgs/development/python-modules/apache-beam/default.nix
··· 150 150 151 151 # Make sure we're running the tests for the actually installed 152 152 # package, so that cython's .so files are available. 153 - preCheck = "cd $out/lib/${python.libPrefix}/site-packages"; 153 + preCheck = "cd $out/${python.sitePackages}"; 154 154 155 155 disabledTestPaths = [ 156 156 # Fails with
+5 -5
pkgs/development/python-modules/appthreat-vulnerability-db/default.nix
··· 17 17 18 18 buildPythonPackage rec { 19 19 pname = "appthreat-vulnerability-db"; 20 - version = "5.5.10"; 20 + version = "5.6.0"; 21 21 pyproject = true; 22 22 23 - disabled = pythonOlder "3.7"; 23 + disabled = pythonOlder "3.8"; 24 24 25 25 src = fetchFromGitHub { 26 26 owner = "AppThreat"; 27 27 repo = "vulnerability-db"; 28 28 rev = "refs/tags/v${version}"; 29 - hash = "sha256-yBB66H8l+kjVcpmt3gYzggRgfxjFvMPwy3rcYuKYqks="; 29 + hash = "sha256-tRC+w9HyXuN6eWbNaccK0xtcOnJpuErcHaB7+lvTiQI="; 30 30 }; 31 31 32 32 postPatch = '' 33 - substituteInPlace pytest.ini \ 34 - --replace " --cov-append --cov-report term --cov vdb" "" 33 + substituteInPlace pyproject.toml \ 34 + --replace-warn " --cov-report=term-missing --no-cov-on-fail --cov vdb" "" 35 35 ''; 36 36 37 37 pythonRelaxDeps = [
+1 -1
pkgs/development/python-modules/azure-common/default.nix
··· 25 25 ] ++ lib.optionals (!isPy3k) [ setuptools ]; # need for namespace lookup 26 26 27 27 postInstall = lib.optionalString (!isPy3k) '' 28 - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py 28 + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/${python.sitePackages}"/azure/__init__.py 29 29 ''; 30 30 31 31 doCheck = false;
+2 -2
pkgs/development/python-modules/azure-mgmt-common/default.nix
··· 28 28 ]; 29 29 30 30 postInstall = pkgs.lib.optionalString (!isPy3k) '' 31 - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/mgmt/__init__.py 32 - echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/lib/${python.libPrefix}"/site-packages/azure/__init__.py 31 + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/${python.sitePackages}"/azure/mgmt/__init__.py 32 + echo "__import__('pkg_resources').declare_namespace(__name__)" >> "$out/${python.sitePackages}"/azure/__init__.py 33 33 ''; 34 34 35 35 doCheck = false;
+1 -1
pkgs/development/python-modules/backports-zoneinfo/default.nix
··· 46 46 (substituteAll { 47 47 name = "zoneinfo-path"; 48 48 src = ./zoneinfo.patch; 49 - zoneinfo = "${tzdata}/lib/${python.libPrefix}/site-packages/tzdata/zoneinfo"; 49 + zoneinfo = "${tzdata}/${python.sitePackages}/tzdata/zoneinfo"; 50 50 }) 51 51 ]; 52 52
+1 -1
pkgs/development/python-modules/distutils-cfg/default.nix
··· 24 24 dontUnpack = true; 25 25 26 26 installPhase = '' 27 - dest="$out/lib/${python.libPrefix}/site-packages/distutils" 27 + dest="$out/${python.sitePackages}/distutils" 28 28 mkdir -p $dest 29 29 ln -s ${python}/lib/${python.libPrefix}/distutils/* $dest 30 30 ln -s ${distutilsCfg} $dest/distutils.cfg
+42
pkgs/development/python-modules/django-crispy-bootstrap5/default.nix
··· 1 + { lib 2 + , buildPythonPackage 3 + , fetchFromGitHub 4 + , django 5 + , setuptools 6 + , pytestCheckHook 7 + , pytest-django 8 + , django-crispy-forms 9 + }: 10 + 11 + buildPythonPackage rec { 12 + pname = "django-crispy-bootstrap5"; 13 + version = "2023.10"; 14 + format = "pyproject"; 15 + 16 + src = fetchFromGitHub { 17 + owner = "django-crispy-forms"; 18 + repo = "crispy-bootstrap5"; 19 + rev = "refs/tags/${version}"; 20 + hash = "sha256-AUMlLj3GmI+0vYw56Dw2+iF5s1l6GF+zV7PRD889ldg="; 21 + }; 22 + 23 + propagatedBuildInputs = [ 24 + django 25 + setuptools 26 + ]; 27 + 28 + nativeCheckInputs = [ 29 + pytest-django 30 + pytestCheckHook 31 + django-crispy-forms 32 + ]; 33 + 34 + pythonImportsCheck = [ "crispy_bootstrap5" ]; 35 + 36 + meta = with lib; { 37 + description = "Bootstrap 5 template pack for django-crispy-forms"; 38 + homepage = "https://github.com/django-crispy-forms/crispy-bootstrap5"; 39 + license = licenses.mit; 40 + maintainers = with maintainers; [ onny ]; 41 + }; 42 + }
+2 -2
pkgs/development/python-modules/gentools/default.nix
··· 9 9 10 10 buildPythonPackage rec { 11 11 pname = "gentools"; 12 - version = "1.2.1"; 12 + version = "1.2.2"; 13 13 pyproject = true; 14 14 15 15 disabled = pythonOlder "3.7"; ··· 18 18 owner = "ariebovenberg"; 19 19 repo = "gentools"; 20 20 rev = "refs/tags/v${version}"; 21 - hash = "sha256-RBUIji3FOIRjfp4t7zBAVSeiWaYufz4ID8nTWmhDkf8="; 21 + hash = "sha256-+6KTFxOpwvGOCqy6JU87gOZmDa6MvjR10qES5wIfrjI="; 22 22 }; 23 23 24 24 nativeBuildInputs = [
+38 -13
pkgs/development/python-modules/git-annex-adapter/default.nix
··· 1 - { lib, buildPythonPackage, isPy3k, fetchFromGitHub, fetchpatch, substituteAll 2 - , python, util-linux, pygit2, gitMinimal, git-annex, cacert 1 + { lib 2 + , buildPythonPackage 3 + , cacert 4 + , fetchFromGitHub 5 + , fetchpatch 6 + , git-annex 7 + , gitMinimal 8 + , pygit2 9 + , pytestCheckHook 10 + , python 11 + , pythonOlder 12 + , setuptools 13 + , substituteAll 14 + , util-linux 3 15 }: 4 16 5 17 buildPythonPackage rec { 6 18 pname = "git-annex-adapter"; 7 19 version = "0.2.2"; 8 - format = "setuptools"; 20 + pyproject = true; 9 21 10 - disabled = !isPy3k; 22 + disabled = pythonOlder "3.7"; 11 23 12 - # No tests in PyPI tarball 13 24 src = fetchFromGitHub { 14 25 owner = "alpernebbi"; 15 - repo = pname; 16 - rev = "v${version}"; 17 - sha256 = "0666vqspgnvmfs6j3kifwyxr6zmxjs0wlwis7br4zcq0gk32zgdx"; 26 + repo = "git-annex-adapter"; 27 + rev = "refs/tags/v${version}"; 28 + hash = "sha256-vb0vxnwAs0/yOjpyyoGWvX6Tu+cuziGNdnXbdzXexhg="; 18 29 }; 19 30 20 31 patches = [ ··· 37 48 }) 38 49 ]; 39 50 51 + nativeBuildInputs = [ 52 + setuptools 53 + ]; 54 + 55 + propagatedBuildInputs = [ 56 + pygit2 57 + cacert 58 + ]; 59 + 40 60 nativeCheckInputs = [ 41 61 gitMinimal 42 62 util-linux # `rev` is needed in tests/test_process.py 63 + pytestCheckHook 43 64 ]; 44 65 45 - propagatedBuildInputs = [ pygit2 cacert ]; 66 + pythonImportsCheck = [ 67 + "git_annex_adapter" 68 + ]; 46 69 47 - checkPhase = '' 48 - ${python.interpreter} -m unittest 49 - ''; 50 - pythonImportsCheck = [ "git_annex_adapter" ]; 70 + disabledTests = [ 71 + # KeyError and AssertionError 72 + "test_jsonprocess_annex_metadata_batch" 73 + "test_process_annex_metadata_batch" 74 + "test_batchjson_metadata" 75 + ]; 51 76 52 77 meta = with lib; { 53 78 homepage = "https://github.com/alpernebbi/git-annex-adapter";
+2 -2
pkgs/development/python-modules/griffe/default.nix
··· 12 12 13 13 buildPythonPackage rec { 14 14 pname = "griffe"; 15 - version = "0.39.1"; 15 + version = "0.40.0"; 16 16 format = "pyproject"; 17 17 18 18 disabled = pythonOlder "3.8"; ··· 21 21 owner = "mkdocstrings"; 22 22 repo = pname; 23 23 rev = "refs/tags/${version}"; 24 - hash = "sha256-1YHfwiQzt348fuyKpr5YXLeAnXzZljargnTugytvNK0="; 24 + hash = "sha256-VUQmyNO2e4SoXzGbd751l7TtRgvaiWOr75gSGwKGPUI="; 25 25 }; 26 26 27 27 nativeBuildInputs = [
+1 -1
pkgs/development/python-modules/gruut-ipa/default.nix
··· 22 22 postPatch = '' 23 23 patchShebangs bin/* 24 24 substituteInPlace bin/speak-ipa \ 25 - --replace '${"\${src_dir}:"}' "$out/lib/${python.libPrefix}/site-packages:" \ 25 + --replace '${"\${src_dir}:"}' "$out/${python.sitePackages}:" \ 26 26 --replace "do espeak" "do ${espeak}/bin/espeak" 27 27 ''; 28 28
+1 -1
pkgs/development/python-modules/gurobipy/linux.nix
··· 16 16 17 17 postFixup = '' 18 18 patchelf --set-rpath $out/lib \ 19 - $out/lib/${python.libPrefix}/site-packages/gurobipy/gurobipy.so 19 + $out/${python.sitePackages}/gurobipy/gurobipy.so 20 20 ''; 21 21 22 22 meta = with lib; {
+2 -2
pkgs/development/python-modules/hg-commitsigs/default.nix
··· 20 20 dontBuild = true; 21 21 22 22 installPhase = '' 23 - mkdir -p $out/lib/${python.libPrefix}/site-packages/hgext3rd/ 23 + mkdir -p $out/${python.sitePackages}/hgext3rd/ 24 24 install -D $src/commitsigs.py \ 25 - $out/lib/${python.libPrefix}/site-packages/hgext3rd/ 25 + $out/${python.sitePackages}/hgext3rd/ 26 26 ''; 27 27 28 28 meta = with lib; {
+2 -2
pkgs/development/python-modules/hwi/default.nix
··· 15 15 16 16 buildPythonPackage rec { 17 17 pname = "hwi"; 18 - version = "2.3.1"; 18 + version = "2.4.0"; 19 19 format = "setuptools"; 20 20 21 21 disabled = pythonOlder "3.7"; ··· 24 24 owner = "bitcoin-core"; 25 25 repo = "HWI"; 26 26 rev = "refs/tags/${version}"; 27 - hash = "sha256-V4BWB4mCONQ8kjAy6ySonAbCUTaKpBTvhSnHmoH8TQM="; 27 + hash = "sha256-a1ppYDuY7CtNrKSvuAofS79nvDaYUMIm4FCHiiQYrtQ="; 28 28 }; 29 29 30 30 propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/influxdb-client/default.nix
··· 16 16 17 17 buildPythonPackage rec { 18 18 pname = "influxdb-client"; 19 - version = "1.39.0"; 19 + version = "1.40.0"; 20 20 format = "setuptools"; 21 21 22 22 disabled = pythonOlder "3.7"; ··· 25 25 owner = "influxdata"; 26 26 repo = "influxdb-client-python"; 27 27 rev = "refs/tags/v${version}"; 28 - hash = "sha256-cj3qeT5wE/RqrwOW1MV9sVG+khxyRAO5438omqbKbmY="; 28 + hash = "sha256-+I5DxcxNxIRDwtfYXLvXPl8Z3FKcSWyaYtv1KHT9QO4="; 29 29 }; 30 30 31 31 propagatedBuildInputs = [
-111
pkgs/development/python-modules/jq/jq-py-setup.patch
··· 1 - diff --git a/setup.py b/setup.py 2 - index 01cc813..15e9048 100644 3 - --- a/setup.py 4 - +++ b/setup.py 5 - @@ -1,97 +1,18 @@ 6 - #!/usr/bin/env python 7 - 8 - import os 9 - -import subprocess 10 - -import tarfile 11 - -import shutil 12 - -import sysconfig 13 - 14 - from setuptools import setup 15 - -from setuptools.command.build_ext import build_ext 16 - from setuptools.extension import Extension 17 - 18 - - 19 - -def _path_in_dir(relative_path): 20 - - return os.path.abspath(os.path.join(os.path.dirname(__file__), relative_path)) 21 - - 22 - -def _dep_source_path(relative_path): 23 - - return os.path.join(_path_in_dir("deps"), relative_path) 24 - - 25 - -def _dep_build_path(relative_path): 26 - - return os.path.join(_path_in_dir("_deps/build"), relative_path) 27 - - 28 - def _read(fname): 29 - return open(os.path.join(os.path.dirname(__file__), fname)).read() 30 - 31 - 32 - -jq_lib_tarball_path = _dep_source_path("jq-1.6.tar.gz") 33 - -jq_lib_dir = _dep_build_path("jq-1.6") 34 - - 35 - -oniguruma_version = "6.9.4" 36 - -oniguruma_lib_tarball_path = _dep_source_path("onig-{}.tar.gz".format(oniguruma_version)) 37 - -oniguruma_lib_build_dir = _dep_build_path("onig-{}".format(oniguruma_version)) 38 - -oniguruma_lib_install_dir = _dep_build_path("onig-install-{}".format(oniguruma_version)) 39 - - 40 - -class jq_build_ext(build_ext): 41 - - def run(self): 42 - - if not os.path.exists(_dep_build_path(".")): 43 - - os.makedirs(_dep_build_path(".")) 44 - - self._build_oniguruma() 45 - - self._build_libjq() 46 - - build_ext.run(self) 47 - - 48 - - def _build_oniguruma(self): 49 - - self._build_lib( 50 - - tarball_path=oniguruma_lib_tarball_path, 51 - - lib_dir=oniguruma_lib_build_dir, 52 - - commands=[ 53 - - ["./configure", "CFLAGS=-fPIC", "--prefix=" + oniguruma_lib_install_dir], 54 - - ["make"], 55 - - ["make", "install"], 56 - - ]) 57 - - 58 - - 59 - - def _build_libjq(self): 60 - - self._build_lib( 61 - - tarball_path=jq_lib_tarball_path, 62 - - lib_dir=jq_lib_dir, 63 - - commands=[ 64 - - ["./configure", "CFLAGS=-fPIC -pthread", "--disable-maintainer-mode", "--with-oniguruma=" + oniguruma_lib_install_dir], 65 - - ["make"], 66 - - ]) 67 - - 68 - - def _build_lib(self, tarball_path, lib_dir, commands): 69 - - self._extract_tarball( 70 - - tarball_path=tarball_path, 71 - - lib_dir=lib_dir, 72 - - ) 73 - - 74 - - macosx_deployment_target = sysconfig.get_config_var("MACOSX_DEPLOYMENT_TARGET") 75 - - if macosx_deployment_target: 76 - - os.environ['MACOSX_DEPLOYMENT_TARGET'] = str(macosx_deployment_target) 77 - - 78 - - def run_command(args): 79 - - print("Executing: %s" % ' '.join(args)) 80 - - subprocess.check_call(args, cwd=lib_dir) 81 - - 82 - - for command in commands: 83 - - run_command(command) 84 - - 85 - - def _extract_tarball(self, tarball_path, lib_dir): 86 - - if os.path.exists(lib_dir): 87 - - shutil.rmtree(lib_dir) 88 - - tarfile.open(tarball_path, "r:gz").extractall(_dep_build_path(".")) 89 - - 90 - - 91 - jq_extension = Extension( 92 - "jq", 93 - sources=["jq.c"], 94 - - include_dirs=[os.path.join(jq_lib_dir, "src")], 95 - - extra_link_args=["-lm"], 96 - - extra_objects=[ 97 - - os.path.join(jq_lib_dir, ".libs/libjq.a"), 98 - - os.path.join(oniguruma_lib_install_dir, "lib/libonig.a"), 99 - - ], 100 - + libraries=["jq"] 101 - ) 102 - 103 - setup( 104 - @@ -104,7 +25,6 @@ def _extract_tarball(self, tarball_path, lib_dir): 105 - python_requires='>=3.5', 106 - license='BSD 2-Clause', 107 - ext_modules = [jq_extension], 108 - - cmdclass={"build_ext": jq_build_ext}, 109 - classifiers=[ 110 - 'Development Status :: 5 - Production/Stable', 111 - 'Intended Audience :: Developers',
+5 -5
pkgs/development/python-modules/kaa-base/default.nix
··· 24 24 installPhase = '' 25 25 runHook preInstall 26 26 27 - mkdir -p "$out/lib/${python.libPrefix}/site-packages" 27 + mkdir -p "$out/${python.sitePackages}" 28 28 29 - export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" 29 + export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" 30 30 31 31 ${python}/bin/${python.executable} setup.py install \ 32 - --install-lib=$out/lib/${python.libPrefix}/site-packages \ 32 + --install-lib=$out/${python.sitePackages} \ 33 33 --prefix="$out" 34 34 35 - eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth 35 + eapth="$out/${python.sitePackages}/easy-install.pth" 36 36 if [ -e "$eapth" ]; then 37 37 mv "$eapth" $(dirname "$eapth")/${pname}-${version}.pth 38 38 fi 39 39 40 - rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* 40 + rm -f "$out/${python.sitePackages}"/site.py* 41 41 42 42 runHook postInstall 43 43 '';
+5 -5
pkgs/development/python-modules/kaa-metadata/default.nix
··· 29 29 installPhase = '' 30 30 runHook preInstall 31 31 32 - mkdir -p "$out/lib/${python.libPrefix}/site-packages" 32 + mkdir -p "$out/${python.sitePackages}" 33 33 34 - export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" 34 + export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" 35 35 36 36 ${python}/bin/${python.executable} setup.py install \ 37 - --install-lib=$out/lib/${python.libPrefix}/site-packages \ 37 + --install-lib=$out/${python.sitePackages} \ 38 38 --prefix="$out" 39 39 40 - eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth 40 + eapth="$out/${python.sitePackages}/easy-install.pth" 41 41 if [ -e "$eapth" ]; then 42 42 mv "$eapth" $(dirname "$eapth")/${pname}-${version}.pth 43 43 fi 44 44 45 - rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* 45 + rm -f "$out/${python.sitePackages}"/site.py* 46 46 47 47 runHook postInstall 48 48 '';
+2 -2
pkgs/development/python-modules/langchain-community/default.nix
··· 17 17 18 18 buildPythonPackage rec { 19 19 pname = "langchain-community"; 20 - version = "0.0.13"; 20 + version = "0.0.16"; 21 21 pyproject = true; 22 22 23 23 disabled = pythonOlder "3.8"; ··· 25 25 src = fetchPypi { 26 26 pname = "langchain_community"; 27 27 inherit version; 28 - hash = "sha256-z2bG/3/L61gvXojuAN7Op/3spczd2nJQRvKO/Gl8Qac="; 28 + hash = "sha256-wGUSqTAToG+6dnnNWhJU/4uSfN3S0fvgzERL97vfC4w="; 29 29 }; 30 30 31 31 nativeBuildInputs = [
+1 -1
pkgs/development/python-modules/maestral/default.nix
··· 62 62 makeWrapperArgs = [ 63 63 # Add the installed directories to the python path so the daemon can find them 64 64 "--prefix PYTHONPATH : ${makePythonPath propagatedBuildInputs}" 65 - "--prefix PYTHONPATH : $out/lib/${python.libPrefix}/site-packages" 65 + "--prefix PYTHONPATH : $out/${python.sitePackages}" 66 66 ]; 67 67 68 68 nativeCheckInputs = [
+1 -1
pkgs/development/python-modules/meep/default.nix
··· 113 113 checkPhase = '' 114 114 runHook preCheck 115 115 116 - export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" 116 + export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" 117 117 118 118 # Generate a python test script 119 119 cat > test.py << EOF
+3 -3
pkgs/development/python-modules/mpi4py/default.nix
··· 25 25 configurePhase = ""; 26 26 27 27 installPhase = '' 28 - mkdir -p "$out/lib/${python.libPrefix}/site-packages" 29 - export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" 28 + mkdir -p "$out/${python.sitePackages}" 29 + export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" 30 30 31 31 ${python}/bin/${python.executable} setup.py install \ 32 - --install-lib=$out/lib/${python.libPrefix}/site-packages \ 32 + --install-lib=$out/${python.sitePackages} \ 33 33 --prefix="$out" 34 34 35 35 # --install-lib:
+2 -2
pkgs/development/python-modules/oras/default.nix
··· 10 10 11 11 buildPythonPackage rec { 12 12 pname = "oras"; 13 - version = "0.1.26"; 13 + version = "0.1.27"; 14 14 pyproject = true; 15 15 16 16 disabled = pythonOlder "3.7"; ··· 19 19 owner = "oras-project"; 20 20 repo = "oras-py"; 21 21 rev = "refs/tags/${version}"; 22 - hash = "sha256-t3098ZeAkwLhinyrFwmi7KKrFgZZKPN6qvp3REQNwG8="; 22 + hash = "sha256-T2zuflew91UsEjhPKPjNxPBN+C//S1vWvXKVT602EVI="; 23 23 }; 24 24 25 25 nativeBuildInputs = [
+1 -1
pkgs/development/python-modules/pmdarima/default.nix
··· 43 43 # Make sure we're running the tests for the actually installed 44 44 # package, so that cython's compiled files are available. 45 45 preCheck = '' 46 - cd $out/lib/${python.libPrefix}/site-packages 46 + cd $out/${python.sitePackages} 47 47 ''; 48 48 49 49 nativeCheckInputs = [ pytestCheckHook ];
+2 -2
pkgs/development/python-modules/py-sonic/default.nix
··· 2 2 3 3 buildPythonPackage rec { 4 4 pname = "py-sonic"; 5 - version = "1.0.0"; 5 + version = "1.0.1"; 6 6 format = "setuptools"; 7 7 disabled = isPy27; 8 8 9 9 src = fetchPypi { 10 10 inherit pname version; 11 - hash = "sha256-9ho0F5kf74pCsLujwLt+pU+Ikxu70/kk+WP7lnD7CiE="; 11 + hash = "sha256-DU1T86T0jQ6ptkWdjuV70VC8MFx/rK5aQFYjbK6F2Hk="; 12 12 }; 13 13 14 14 # package has no tests
+4 -4
pkgs/development/python-modules/pycaption/default.nix
··· 13 13 14 14 buildPythonPackage rec { 15 15 pname = "pycaption"; 16 - version = "2.2.1"; 16 + version = "2.2.2"; 17 17 18 - disabled = pythonOlder "3.6"; 18 + disabled = pythonOlder "3.8"; 19 19 20 20 pyproject = true; 21 21 22 22 src = fetchFromGitHub { 23 23 owner = "pbs"; 24 24 repo = "pycaption"; 25 - rev = version; 26 - hash = "sha256-IPCU9MsBY+Vsk6SrR9+3j4Izfhw5LeUrK0KUa3seSs4="; 25 + rev = "refs/tags/${version}"; 26 + hash = "sha256-6c16S77K1UC7+rz8tF0tLlBspienhDbgSXhdJzkQZII="; 27 27 }; 28 28 29 29 nativeBuildInputs = [
+10 -4
pkgs/development/python-modules/pygit2/default.nix
··· 10 10 , pycparser 11 11 , pytestCheckHook 12 12 , pythonOlder 13 + , setuptools 13 14 }: 14 15 15 16 buildPythonPackage rec { 16 17 pname = "pygit2"; 17 - version = "1.13.3"; 18 - format = "setuptools"; 18 + version = "1.14.0"; 19 + pyproject = true; 19 20 20 - disabled = pythonOlder "3.7"; 21 + disabled = pythonOlder "3.9"; 21 22 22 23 src = fetchPypi { 23 24 inherit pname version; 24 - hash = "sha256-AlfGJgEeSvuZvbIIdUQ/cG+EIB1MkmN/AiFbmOrBPe0="; 25 + hash = "sha256-9SntlmDtv5tiXMrn5RCY73NmLmFJZgkAl3LUYnqCaqg="; 25 26 }; 26 27 27 28 preConfigure = lib.optionalString stdenv.isDarwin '' 28 29 export DYLD_LIBRARY_PATH="${libgit2}/lib" 29 30 ''; 31 + 32 + nativeBuildInputs = [ 33 + setuptools 34 + ]; 30 35 31 36 buildInputs = [ 32 37 libgit2 ··· 65 70 meta = with lib; { 66 71 description = "A set of Python bindings to the libgit2 shared library"; 67 72 homepage = "https://github.com/libgit2/pygit2"; 73 + changelog = "https://github.com/libgit2/pygit2/blob/v${version}/CHANGELOG.md"; 68 74 license = licenses.gpl2Only; 69 75 maintainers = with maintainers; [ ]; 70 76 };
+1 -1
pkgs/development/python-modules/pygmo/default.nix
··· 28 28 }; 29 29 30 30 cmakeFlags = [ 31 - "-DPYGMO_INSTALL_PATH=${placeholder "out"}/lib/${python.libPrefix}/site-packages" 31 + "-DPYGMO_INSTALL_PATH=${placeholder "out"}/${python.sitePackages}" 32 32 ]; 33 33 34 34 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/pysnmplib/default.nix
··· 10 10 11 11 buildPythonPackage rec { 12 12 pname = "pysnmplib"; 13 - version = "5.0.23"; 13 + version = "5.0.24"; 14 14 format = "pyproject"; 15 15 16 16 disabled = pythonOlder "3.8"; ··· 19 19 owner = "pysnmp"; 20 20 repo = "pysnmp"; 21 21 rev = "refs/tags/v${version}"; 22 - hash = "sha256-1h87fqaWMJN25SOD0xOkP3PFm1GPK99sT0o6ILCFVUI="; 22 + hash = "sha256-AtQqXiy943cYhHDsyz9Yk5uA4xK7Q4p21CT3X3zYzrQ="; 23 23 }; 24 24 25 25 nativeBuildInputs = [
+1 -1
pkgs/development/python-modules/rdkit/default.nix
··· 141 141 checkPhase = '' 142 142 export QT_QPA_PLATFORM='offscreen' 143 143 export RDBASE=$(realpath ..) 144 - export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" 144 + export PYTHONPATH="$out/${python.sitePackages}:$PYTHONPATH" 145 145 (cd $RDBASE/rdkit/Chem && python $RDBASE/rdkit/TestRunner.py test_list.py) 146 146 ''; 147 147
+2 -2
pkgs/development/python-modules/recipe-scrapers/default.nix
··· 14 14 15 15 buildPythonPackage rec { 16 16 pname = "recipe-scrapers"; 17 - version = "14.53.0"; 17 + version = "14.54.0"; 18 18 pyproject = true; 19 19 20 20 disabled = pythonOlder "3.8"; ··· 23 23 owner = "hhursev"; 24 24 repo = "recipe-scrapers"; 25 25 rev = "refs/tags/${version}"; 26 - hash = "sha256-uYUzn3JlsZmzzbk740aD3PW3OuGqdsAfU7HlYX5kPrY="; 26 + hash = "sha256-Q7ubT7SBHNxyvfqFhDmBjnW7ssoXBsMZR+eYg5CntHY="; 27 27 }; 28 28 29 29 nativeBuildInputs = [
+1 -1
pkgs/development/python-modules/recursive-pth-loader/default.nix
··· 14 14 15 15 installPhase = 16 16 '' 17 - dst=$out/lib/${python.libPrefix}/site-packages 17 + dst=$out/${python.sitePackages} 18 18 mkdir -p $dst 19 19 cp sitecustomize.* $dst/ 20 20 '';
+2 -2
pkgs/development/python-modules/requests-pkcs12/default.nix
··· 8 8 9 9 buildPythonPackage rec { 10 10 pname = "requests-pkcs12"; 11 - version = "1.22"; 11 + version = "1.24"; 12 12 format = "setuptools"; 13 13 14 14 disabled = pythonOlder "3.7"; ··· 17 17 owner = "m-click"; 18 18 repo = "requests_pkcs12"; 19 19 rev = version; 20 - hash = "sha256-YMFeWbPTwxP/+lYojXEbJf87FNHL6QrzOdOKF5JERSE="; 20 + hash = "sha256-JLFUdg7kbjhlpGgrQ29U1TRTKhjDlvMGc/FRE+awfLc="; 21 21 }; 22 22 23 23 propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/rokuecp/default.nix
··· 17 17 18 18 buildPythonPackage rec { 19 19 pname = "rokuecp"; 20 - version = "0.18.2"; 20 + version = "0.19.0"; 21 21 format = "pyproject"; 22 22 23 23 disabled = pythonOlder "3.9"; ··· 26 26 owner = "ctalkington"; 27 27 repo = "python-rokuecp"; 28 28 rev = "refs/tags/${version}"; 29 - hash = "sha256-fgnR3TZh+cHvC8qJnvwfrrtxCdEr89Uw8ciACzaQPYE="; 29 + hash = "sha256-e7BY0Y2SdAtECKqOCUZfq7PcCR2bhQ4lESQD9jTaqpI="; 30 30 }; 31 31 32 32 nativeBuildInputs = [
+6 -5
pkgs/development/python-modules/safetensors/default.nix
··· 16 16 17 17 buildPythonPackage rec { 18 18 pname = "safetensors"; 19 - version = "0.3.3"; 20 - format = "pyproject"; 19 + version = "0.4.2"; 20 + pyproject = true; 21 21 22 22 disabled = pythonOlder "3.7"; 23 23 24 24 src = fetchFromGitHub { 25 25 owner = "huggingface"; 26 - repo = pname; 26 + repo = "safetensors"; 27 27 rev = "refs/tags/v${version}"; 28 - hash = "sha256-U+indMoLFN6vMZkJTWFG08lsdXuK5gOfgaHmUVl6DPk="; 28 + hash = "sha256-hdPUI8k7CCQwt2C/AsjUHRmAL6ob+yCN97KkWtqOQL8="; 29 29 }; 30 30 31 31 cargoDeps = rustPlatform.fetchCargoTarball { 32 32 inherit src; 33 33 sourceRoot = "${src.name}/bindings/python"; 34 - hash = "sha256-MhRs9tFCmVZI5O0EVRUbo4ZnUVRQ0EfQTU+E1K+qKZI="; 34 + hash = "sha256-7n9aYlha6IaPsZ2zMfD5EIkrk8ENwMBwj41s6QU7ml0="; 35 35 }; 36 36 37 37 sourceRoot = "${src.name}/bindings/python"; ··· 41 41 cargo 42 42 rustc 43 43 rustPlatform.cargoSetupHook 44 + rustPlatform.maturinBuildHook 44 45 ]; 45 46 46 47 buildInputs = lib.optionals stdenv.isDarwin [ libiconv ];
+2 -2
pkgs/development/python-modules/scmrepo/default.nix
··· 19 19 20 20 buildPythonPackage rec { 21 21 pname = "scmrepo"; 22 - version = "2.0.4"; 22 + version = "2.1.1"; 23 23 format = "pyproject"; 24 24 25 25 disabled = pythonOlder "3.7"; ··· 28 28 owner = "iterative"; 29 29 repo = pname; 30 30 rev = "refs/tags/${version}"; 31 - hash = "sha256-gBGfL6Xet7ASdwRTFJ5nHpyeXi/pqlrL9o5nC3m48hk="; 31 + hash = "sha256-KG7Y+1qqsgDwgRYsb3XbZnF6FduHJCAEizfuugBi0Go="; 32 32 }; 33 33 34 34 nativeBuildInputs = [
+1 -1
pkgs/development/python-modules/selenium/default.nix
··· 34 34 ''; 35 35 36 36 postInstall = '' 37 - DST_PREFIX=$out/lib/${python.libPrefix}/site-packages/selenium/webdriver/ 37 + DST_PREFIX=$out/${python.sitePackages}/selenium/webdriver/ 38 38 DST_REMOTE=$DST_PREFIX/remote/ 39 39 DST_FF=$DST_PREFIX/firefox 40 40 cp ../rb/lib/selenium/webdriver/atoms/getAttribute.js $DST_REMOTE
+2 -2
pkgs/development/python-modules/stdlibs/default.nix
··· 7 7 8 8 buildPythonPackage rec { 9 9 pname = "stdlibs"; 10 - version = "2023.12.15"; 10 + version = "2024.1.28"; 11 11 format = "pyproject"; 12 12 13 13 disabled = pythonOlder "3.8"; ··· 16 16 owner = "omnilib"; 17 17 repo = "stdlibs"; 18 18 rev = "refs/tags/v${version}"; 19 - hash = "sha256-1Av10FNJkCC2XGNx1LDqd0GwiNPIDPXPFatW8+2XoaI="; 19 + hash = "sha256-xf46ih7viVUKNIT1tLs5MQPNjNtQlQ2N9BJIGPt4Srk="; 20 20 }; 21 21 22 22 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/subarulink/default.nix
··· 11 11 12 12 buildPythonPackage rec { 13 13 pname = "subarulink"; 14 - version = "0.7.9"; 14 + version = "0.7.10"; 15 15 format = "setuptools"; 16 16 17 17 disabled = pythonOlder "3.7"; ··· 20 20 owner = "G-Two"; 21 21 repo = pname; 22 22 rev = "refs/tags/v${version}"; 23 - hash = "sha256-dRhZWV58tHoGpJ2bDWFov1timTHYnqTPILySauutyzg="; 23 + hash = "sha256-OKZ55J294I3wPo2vL+wuMMCA4N1ejgtquA8Bf7wPiIs="; 24 24 }; 25 25 26 26 propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/transformers/default.nix
··· 53 53 54 54 buildPythonPackage rec { 55 55 pname = "transformers"; 56 - version = "4.37.1"; 56 + version = "4.37.2"; 57 57 format = "setuptools"; 58 58 59 59 disabled = pythonOlder "3.8"; ··· 62 62 owner = "huggingface"; 63 63 repo = "transformers"; 64 64 rev = "refs/tags/v${version}"; 65 - hash = "sha256-1W6Ec3+zdv75qd6s6Ogy/wkAKc+lA0xjZNAcMo8Q3ns="; 65 + hash = "sha256-O8A+6f6Qwr/OqwzA3i3MPCmcwg1BoQY6mvhozrLz16Y="; 66 66 }; 67 67 68 68 propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/types-aiobotocore/default.nix
··· 364 364 365 365 buildPythonPackage rec { 366 366 pname = "types-aiobotocore"; 367 - version = "2.11.0"; 367 + version = "2.11.1"; 368 368 pyproject = true; 369 369 370 370 src = fetchPypi { 371 371 inherit pname version; 372 - hash = "sha256-gw6q/ht30klxav7Du4siFvAkU6Mx2VIzNyDbJzaK47Y="; 372 + hash = "sha256-LsG7jHSIEk//iAiBD6SwL6JjlQSezBFGEzrxeYtPrkQ="; 373 373 }; 374 374 375 375 nativeBuildInputs = [
+2 -10
pkgs/development/python-modules/uamqp/default.nix
··· 2 2 , stdenv 3 3 , buildPythonPackage 4 4 , fetchFromGitHub 5 - , fetchpatch 6 5 , cython 7 6 , certifi 8 7 , CFNetwork ··· 17 16 18 17 buildPythonPackage rec { 19 18 pname = "uamqp"; 20 - version = "1.6.5"; 19 + version = "1.6.8"; 21 20 format = "setuptools"; 22 21 23 22 src = fetchFromGitHub { 24 23 owner = "Azure"; 25 24 repo = "azure-uamqp-python"; 26 25 rev = "refs/tags/v${version}"; 27 - hash = "sha256-q8FxM4PBXLD5q68nrUJ+TGkui1yQJ3HHNF7jn+e+HkA="; 26 + hash = "sha256-L4E7nnsVZ/VrOM0t4KtztU9ALmtGfi1vDzUi0ogtZOc="; 28 27 }; 29 28 30 29 patches = lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [ 31 30 ./darwin-azure-c-shared-utility-corefoundation.patch 32 31 ] ++ [ 33 - (fetchpatch { 34 - name = "CVE-2024-21646.patch"; 35 - url = "https://github.com/Azure/azure-uamqp-c/commit/12ddb3a31a5a97f55b06fa5d74c59a1d84ad78fe.patch"; 36 - stripLen = 1; 37 - extraPrefix = "src/vendor/azure-uamqp-c/"; 38 - hash = "sha256-9o3TNKFeJvZRZeS6qo2Zl+JVFrrqAGYWDQbusz4Ou+g="; 39 - }) 40 32 # Fix incompatible function pointer conversion error with clang 16. 41 33 ./clang-fix-incompatible-function-pointer-conversion.patch 42 34 ];
+2 -2
pkgs/development/python-modules/zcbor/default.nix
··· 13 13 14 14 buildPythonPackage rec { 15 15 pname = "zcbor"; 16 - version = "0.8.0"; 16 + version = "0.8.1"; 17 17 pyproject = true; 18 18 19 19 src = fetchPypi { 20 20 inherit pname version; 21 - hash = "sha256-47HwITfFcHNze3tt4vJxHB4BQ7oyl17DM8IV0WomM5Q="; 21 + hash = "sha256-U3Y/r3tBhzK6bGnMxdqKzS7bLHyAzgpGZ5PVK9pw7Pk="; 22 22 }; 23 23 24 24 nativeBuildInputs = [
+2 -2
pkgs/development/python2-modules/pygtk/default.nix
··· 64 64 postInstall = '' 65 65 rm $out/bin/pygtk-codegen-2.0 66 66 ln -s ${pygobject2}/bin/pygobject-codegen-2.0 $out/bin/pygtk-codegen-2.0 67 - ln -s ${pygobject2}/lib/${python.libPrefix}/site-packages/pygobject-${pygobject2.version}.pth \ 68 - $out/lib/${python.libPrefix}/site-packages/${pname}-${version}.pth 67 + ln -s ${pygobject2}/${python.sitePackages}/pygobject-${pygobject2.version}.pth \ 68 + $out/${python.sitePackages}/${pname}-${version}.pth 69 69 ''; 70 70 71 71 meta = with lib; {
+1 -1
pkgs/development/r-modules/default.nix
··· 1304 1304 substituteInPlace R/zzz.R \ 1305 1305 --replace ".onLoad <- function(...) {" \ 1306 1306 ".onLoad <- function(...) { 1307 - Sys.setenv(\"SPARK_HOME\" = Sys.getenv(\"SPARK_HOME\", unset = \"${pkgs.python3Packages.pyspark}/lib/${pkgs.python3Packages.python.libPrefix}/site-packages/pyspark\")) 1307 + Sys.setenv(\"SPARK_HOME\" = Sys.getenv(\"SPARK_HOME\", unset = \"${pkgs.python3Packages.pyspark}/${pkgs.python3Packages.python.sitePackages}/pyspark\")) 1308 1308 Sys.setenv(\"JAVA_HOME\" = Sys.getenv(\"JAVA_HOME\", unset = \"${pkgs.jdk}\"))" 1309 1309 ''; 1310 1310 });
+3 -1
pkgs/development/ruby-modules/gem-config/default.nix
··· 312 312 cp -R ext/fast_mmaped_file_rs $out 313 313 ''; 314 314 }; 315 - hash = "sha256-XuQZPbFWqPHlrJvllkvLl1FjKeoAUbi8oKDrS2rY1KM="; 315 + hash = if lib.versionAtLeast attrs.version "1.1.0" 316 + then "sha256-tSyoCEBtMMkFfPynaMx8oc9bO7I+Pf6Y/f3Ld8uwlEE=" 317 + else "sha256-XuQZPbFWqPHlrJvllkvLl1FjKeoAUbi8oKDrS2rY1KM="; 316 318 }; 317 319 nativeBuildInputs = [ 318 320 cargo
+3 -3
pkgs/development/tools/build-managers/moon/default.nix
··· 9 9 10 10 rustPlatform.buildRustPackage rec { 11 11 pname = "moon"; 12 - version = "1.20.0"; 12 + version = "1.20.1"; 13 13 14 14 src = fetchFromGitHub { 15 15 owner = "moonrepo"; 16 16 repo = pname; 17 17 rev = "v${version}"; 18 - hash = "sha256-J/xlLKCoh+NekPcCAyM4ZN+OL6dLcworiO3gqCetu9A="; 18 + hash = "sha256-wAY5jifyjK5jp5nlrwt/Krp96in06SnayTKx8inrf0A="; 19 19 }; 20 20 21 - cargoHash = "sha256-TU1vWyAbbS9ScRdDgQMvY6Ov9uCv9TrzzhznyZleC0E="; 21 + cargoHash = "sha256-qfDw+zmhk0M3gItiB7qfgiQCBRvOYBOirJFMyNRr714="; 22 22 23 23 env = { 24 24 RUSTFLAGS = "-C strip=symbols";
+2 -2
pkgs/development/tools/capnproto-java/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "capnproto-java"; 5 - version = "0.1.15"; 5 + version = "0.1.16"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "capnproto"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - hash = "sha256:IcmzI1G0mXOlpzmiyeLD7o1p/eOeVpwkiGsgy5OIjxw="; 11 + hash = "sha256-7uYtRHKsJvbE1b0HbNXGbRXpkUHHLjMDIWLlOUcQWDk="; 12 12 }; 13 13 14 14 nativeBuildInputs = [ pkg-config ];
+2 -2
pkgs/development/tools/database/clickhouse-backup/default.nix
··· 7 7 8 8 buildGoModule rec { 9 9 pname = "clickhouse-backup"; 10 - version = "2.4.22"; 10 + version = "2.4.23"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "AlexAkulov"; 14 14 repo = pname; 15 15 rev = "v${version}"; 16 - sha256 = "sha256-PcUcafUV+SAzs0d/xrDDL0A5MMQN5IO1UjDBuENr37E="; 16 + sha256 = "sha256-6S1XJEaZE6h69KfBddkJ+sE3OfUnY1KECPKyJ2pExRU="; 17 17 }; 18 18 19 19 vendorHash = "sha256-DTykJR/dMIDKL5fTzDivsRf2DIfzJcm+AN3rQHflpJo=";
+16 -5
pkgs/development/tools/language-servers/jq-lsp/default.nix
··· 3 3 , fetchFromGitHub 4 4 }: 5 5 6 - buildGoModule { 6 + buildGoModule rec { 7 7 pname = "jq-lsp"; 8 - version = "unstable-2023-10-27"; 8 + version = "0.1.2"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "wader"; 12 12 repo = "jq-lsp"; 13 - rev = "b4707e7776a4eb3093b1a7533ebd41368240095a"; 14 - hash = "sha256-AU4xGweeFx+kSsrqkTtSjl+N77cITF/qvAVZGUZY5SE="; 13 + rev = "refs/tags/v${version}"; 14 + hash = "sha256-a3ZqVWG7kjWQzL1efrKc4s4D14qD/+6JM26vaduxhWg="; 15 15 }; 16 16 17 - vendorHash = "sha256-ppQ81uERHBgOr/bm/CoDSWcK+IqHwvcL6RFi0DgoLuw="; 17 + vendorHash = "sha256-bIe006I1ryvIJ4hC94Ux2YVdlmDIM4oZaK/qXafYYe0="; 18 + 19 + # based on https://github.com/wader/jq-lsp/blob/master/.goreleaser.yml 20 + CGO_ENABLED = 0; 21 + GOFLAGS = [ "-trimpath" ]; 22 + ldflags = [ 23 + "-s" 24 + "-w" 25 + "-X main.version=${version}" 26 + "-X main.commit=${src.rev}" 27 + "-X main.builtBy=Nix" 28 + ]; 18 29 19 30 meta = with lib; { 20 31 description = "jq language server";
+17 -9
pkgs/development/tools/minizinc/ide.nix
··· 1 - { lib, mkDerivation, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, minizinc }: 1 + { lib, stdenv, fetchFromGitHub, qtbase, qmake, qtwebsockets, minizinc, makeWrapper, Cocoa }: 2 2 3 - mkDerivation rec { 3 + let 4 + executableLoc = if stdenv.isDarwin then "$out/Applications/MiniZincIDE.app/Contents/MacOS/MiniZincIDE" else "$out/bin/MiniZincIDE"; 5 + in 6 + stdenv.mkDerivation rec { 4 7 pname = "minizinc-ide"; 5 - version = "2.5.5"; 8 + version = "2.8.2"; 6 9 7 10 src = fetchFromGitHub { 8 11 owner = "MiniZinc"; 9 12 repo = "MiniZincIDE"; 10 13 rev = version; 11 - sha256 = "sha256-0U3KFRDam8psbCaEOcrwqzICAy1oBgo8SFEiR/PMqZk="; 14 + hash = "sha256-3L/hulNI7e2wE9gMt2h3mS0ubHZ4kcVpwALCmWQtv7A="; 12 15 fetchSubmodules = true; 13 16 }; 14 17 15 - nativeBuildInputs = [ qmake ]; 16 - buildInputs = [ qtbase qtwebengine qtwebkit ]; 18 + nativeBuildInputs = [ qmake makeWrapper ]; 19 + buildInputs = [ qtbase qtwebsockets ] ++ lib.optionals stdenv.isDarwin [ Cocoa ]; 17 20 18 21 sourceRoot = "${src.name}/MiniZincIDE"; 19 22 20 23 dontWrapQtApps = true; 21 24 22 - postInstall = '' 23 - wrapProgram $out/bin/MiniZincIDE --prefix PATH ":" ${lib.makeBinPath [ minizinc ]} 25 + postInstall = lib.optionalString stdenv.hostPlatform.isDarwin '' 26 + mkdir -p $out/Applications 27 + mv $out/bin/MiniZincIDE.app $out/Applications/ 28 + '' + '' 29 + wrapProgram ${executableLoc} \ 30 + --prefix PATH ":" ${lib.makeBinPath [ minizinc ]} \ 31 + --set QT_QPA_PLATFORM_PLUGIN_PATH "${qtbase}/lib/qt-6/plugins/platforms" 24 32 ''; 25 33 26 34 meta = with lib; { ··· 34 42 It is a subset of the higher-level language Zinc. 35 43 ''; 36 44 license = licenses.mpl20; 37 - platforms = platforms.linux; 45 + platforms = platforms.unix; 38 46 maintainers = [ maintainers.dtzWill ]; 39 47 }; 40 48 }
+2 -2
pkgs/development/tools/misc/opengrok/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "opengrok"; 5 - version = "1.13.1"; 5 + version = "1.13.2"; 6 6 7 7 # binary distribution 8 8 src = fetchurl { 9 9 url = "https://github.com/oracle/opengrok/releases/download/${version}/${pname}-${version}.tar.gz"; 10 - hash = "sha256-3/BBLPoYX1/ft3MGiJD9OPtkB2PJM7bXkGRuXxTToXI="; 10 + hash = "sha256-Er6f1KgMZ4e/o3TJkw6z96rxBGQ/KEc9gGI2W6m+b8U="; 11 11 }; 12 12 13 13 nativeBuildInputs = [ makeWrapper ];
+3 -3
pkgs/development/tools/misc/texlab/default.nix
··· 15 15 in 16 16 rustPlatform.buildRustPackage rec { 17 17 pname = "texlab"; 18 - version = "5.12.2"; 18 + version = "5.12.3"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "latex-lsp"; 22 22 repo = "texlab"; 23 23 rev = "refs/tags/v${version}"; 24 - hash = "sha256-NEiUWMmJjhhK9XYbW1dla7iZJG4bdttbuSJmtO4f1UE="; 24 + hash = "sha256-/QjaAzCPhXzsiRhnRRZcujmk1C9IONYlMfjp/a1iIDA="; 25 25 }; 26 26 27 - cargoHash = "sha256-OFgBBO4RZ7oS2da9cGIePnLhfFdHfW3FdOT0B8bNC3g="; 27 + cargoHash = "sha256-VDRLbhgQkPkeTpQxRsq8QEU53Zd4b5F0phoq2cAWIK8="; 28 28 29 29 outputs = [ "out" ] ++ lib.optional (!isCross) "man"; 30 30
+5 -7
pkgs/development/tools/mysql-shell/innovation.nix
··· 16 16 , libssh 17 17 , zstd 18 18 , lz4 19 - , boost 20 19 , readline 21 20 , libtirpc 22 21 , rpcsvc-proto ··· 35 34 let 36 35 pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ]; 37 36 38 - mysqlShellVersion = "8.2.1"; 39 - mysqlServerVersion = "8.2.0"; 37 + mysqlShellVersion = "8.3.0"; 38 + mysqlServerVersion = "8.3.0"; 40 39 in 41 40 stdenv.mkDerivation (finalAttrs: { 42 41 pname = "mysql-shell-innovation"; ··· 45 44 srcs = [ 46 45 (fetchurl { 47 46 url = "https://cdn.mysql.com//Downloads/MySQL-${lib.versions.majorMinor mysqlServerVersion}/mysql-${mysqlServerVersion}.tar.gz"; 48 - hash = "sha256-itPj8cWuIVS+Y4rPVW6JgfcC0FKsxZV+d23xciwhGXk="; 47 + hash = "sha256-HyFJWgt6grJKRT1S4hU6gUs8pwTsz5mXZtVFvOUvOG4="; 49 48 }) 50 49 (fetchurl { 51 50 url = "https://cdn.mysql.com//Downloads/MySQL-Shell/mysql-shell-${finalAttrs.version}-src.tar.gz"; 52 - hash = "sha256-m6WdFow28bxW52q+m8PniZCU/1Ej4secdPQi8GKlziE="; 51 + hash = "sha256-O0j/gvS9fR/xp9plytjj249H7LY/+eyst1IsFpy318U="; 53 52 }) 54 53 ]; 55 54 ··· 71 70 ++ lib.optionals stdenv.isDarwin [ cctools DarwinTools ]; 72 71 73 72 buildInputs = [ 74 - boost 75 73 curl 76 74 libedit 77 75 libssh ··· 98 96 # Build MySQL 99 97 echo "Building mysqlclient mysqlxclient" 100 98 101 - cmake -DWITH_BOOST=system -DWITH_SYSTEM_LIBS=ON -DWITH_ROUTER=OFF -DWITH_UNIT_TESTS=OFF \ 99 + cmake -DWITH_SYSTEM_LIBS=ON -DWITH_FIDO=system -DWITH_ROUTER=OFF -DWITH_UNIT_TESTS=OFF \ 102 100 -DFORCE_UNSUPPORTED_COMPILER=1 -S ../mysql -B ../mysql/build 103 101 104 102 cmake --build ../mysql/build --parallel ''${NIX_BUILD_CORES:-1} --target mysqlclient mysqlxclient
+3 -3
pkgs/development/tools/packer/default.nix
··· 6 6 7 7 buildGoModule rec { 8 8 pname = "packer"; 9 - version = "1.10.0"; 9 + version = "1.10.1"; 10 10 11 11 src = fetchFromGitHub { 12 12 owner = "hashicorp"; 13 13 repo = "packer"; 14 14 rev = "v${version}"; 15 - hash = "sha256-pHqYO3a9JruOCbMbLLQ2BqS4bcCeaBf82cBxGVHgLoY="; 15 + hash = "sha256-P7QG4ldOJn83w5XxIzC1dhVmn2e/gcwHBT9cZiQmsbo="; 16 16 }; 17 17 18 - vendorHash = "sha256-ydG1nINW9uGYv5uNlJ6p8GHSkIW83qGpUAfRU+yQXmc="; 18 + vendorHash = "sha256-KtMK6jZ9c84OVWJC1njgOh1U+wrFo4G6Qt/XfOFvIhE="; 19 19 20 20 subPackages = [ "." ]; 21 21
+1 -1
pkgs/development/tools/postiats-utilities/default.nix
··· 26 26 ''; 27 27 28 28 installPhase = '' 29 - libdir="$out/lib/${python3.libPrefix}/site-packages" 29 + libdir="$out/${python3.sitePackages}" 30 30 mkdir -p "$libdir" 31 31 cp -r postiats "$libdir" 32 32
+3 -3
pkgs/development/tools/pscale/default.nix
··· 8 8 9 9 buildGoModule rec { 10 10 pname = "pscale"; 11 - version = "0.178.0"; 11 + version = "0.181.0"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "planetscale"; 15 15 repo = "cli"; 16 16 rev = "v${version}"; 17 - sha256 = "sha256-Ttz6Ny9HYG07rp/6TkWw1E3DTRw1IkLvMBBm/gkI1j0="; 17 + sha256 = "sha256-f/SrH/xdH0HYxGAbbIvr7yAgHJZlIfT/P1mC+yzQ7Vs="; 18 18 }; 19 19 20 - vendorHash = "sha256-0xHyIe5fGld6LJmhKqTR/6toecRX/pyxEJabW47HU6Y="; 20 + vendorHash = "sha256-Fj2yOENvomRcaIgP91NRl8rcggjPFZbKTwdUBBizios="; 21 21 22 22 ldflags = [ 23 23 "-s" "-w"
+3 -3
pkgs/development/tools/sentry-cli/default.nix
··· 10 10 }: 11 11 rustPlatform.buildRustPackage rec { 12 12 pname = "sentry-cli"; 13 - version = "2.26.0"; 13 + version = "2.27.0"; 14 14 15 15 src = fetchFromGitHub { 16 16 owner = "getsentry"; 17 17 repo = "sentry-cli"; 18 18 rev = version; 19 - sha256 = "sha256-9Qwonp2tGmaffYj5Vv09+Z3YcbFSFmeS/zc7PXjmrk4="; 19 + sha256 = "sha256-dhIja1f+57QdgE0uYBNbgSsmFNE7h0GdcyBx4Z8bGpA="; 20 20 }; 21 21 doCheck = false; 22 22 ··· 26 26 buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ CoreServices Security SystemConfiguration ]; 27 27 nativeBuildInputs = [ pkg-config ]; 28 28 29 - cargoHash = "sha256-t1Gqis4Gd6Zdkka8u/tCRM5xmm3z85OqZIkINm9jNyc="; 29 + cargoHash = "sha256-zLTdpbBy+41tVEItSjkHCu+D3YKiBJqlpAPMpUt5+VM="; 30 30 31 31 meta = with lib; { 32 32 homepage = "https://docs.sentry.io/cli/";
+2 -2
pkgs/development/tools/twilio-cli/default.nix
··· 2 2 3 3 stdenvNoCC.mkDerivation (finalAttrs: { 4 4 pname = "twilio-cli"; 5 - version = "5.17.0"; 5 + version = "5.17.1"; 6 6 7 7 src = fetchzip { 8 8 url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz"; 9 - hash = "sha256-7BJ/9dqEKBjH89XDyIonRbfCn8cyjvgtV2PwdzGIUro="; 9 + hash = "sha256-wgZdivfFjkX3bMmBLWY5vy32pXE7CqEkRGQqIhJrcdE="; 10 10 }; 11 11 12 12 buildInputs = [ nodejs-slim ];
+3 -3
pkgs/development/tools/zed/default.nix
··· 7 7 8 8 buildGoModule rec { 9 9 pname = "zed"; 10 - version = "1.12.0"; 10 + version = "1.13.0"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "brimdata"; 14 14 repo = pname; 15 15 rev = "v${version}"; 16 - sha256 = "sha256-mBJmAV7ax4F61gP8yeiJj/EQyJi3zaex6jT/CKzR3LU="; 16 + sha256 = "sha256-xyTHCBvklK8x6V7WsWDYytnVEfLcja78crvs62WJJ9o="; 17 17 }; 18 18 19 - vendorHash = "sha256-BWvMy1dc3PzAc3kDTXtI6Y8kjRGLWR+aUleItg5EgRU="; 19 + vendorHash = "sha256-m8GOKBwXlNhjEIkkbaIOAGslX4WRVPZ0OknGEG29b4E="; 20 20 21 21 subPackages = [ "cmd/zed" "cmd/zq" ]; 22 22
+3 -3
pkgs/development/web/minify/default.nix
··· 9 9 10 10 buildGoModule rec { 11 11 pname = "minify"; 12 - version = "2.20.15"; 12 + version = "2.20.16"; 13 13 14 14 src = fetchFromGitHub { 15 15 owner = "tdewolff"; 16 16 repo = pname; 17 17 rev = "v${version}"; 18 - hash = "sha256-/CTQ1Ok9ODueM2cDpDTAnpu5vvvYAAVxqhF+Uu487N4="; 18 + hash = "sha256-0RiSNRoRmN7X2udwgGaArXgIRTaxaGH4fo3usiCJNbA="; 19 19 }; 20 20 21 - vendorHash = "sha256-OrBFQl/IBzMFK3O1C1vsJdRRrq9AP6rs2KUIcyx2IlQ="; 21 + vendorHash = "sha256-8OEF2sAJZuGX4z/OsXCAkRR82JO3rYCEJQbidIjGOJ8="; 22 22 23 23 nativeBuildInputs = [ installShellFiles ]; 24 24
+3 -3
pkgs/games/ferium/default.nix
··· 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "ferium"; 5 - version = "4.4.1"; 5 + version = "4.5.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "gorilla-devs"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-3ILDR6CmR/CTzZfUEPD10TQZRSDKSqHmwxU3GPHIyK8="; 11 + sha256 = "sha256-1avmzaIDz4/ARewB7yLYMBVtwdkY4FFfwcHAZSyg1Xc="; 12 12 }; 13 13 14 14 buildInputs = lib.optionals stdenv.isDarwin [ Security ]; 15 15 16 - cargoHash = "sha256-00rzn8eWcxRfPvIT2+EVQLd6e8gnMWx78QrwURpxstg="; 16 + cargoHash = "sha256-IOnTJ/0mul7buBDNHkeqMM9NrFiX58xa03bVGrbAdNg="; 17 17 18 18 # Disable the GUI file picker so that GTK/XDG dependencies aren't used 19 19 buildNoDefaultFeatures = true;
+3 -3
pkgs/games/nile/default.nix
··· 15 15 16 16 buildPythonApplication rec { 17 17 pname = "nile"; 18 - version = "unstable-2024-01-25"; 18 + version = "unstable-2024-01-27"; 19 19 format = "pyproject"; 20 20 21 21 src = fetchFromGitHub { 22 22 owner = "imLinguin"; 23 23 repo = "nile"; 24 - rev = "731d653f71d679cc318b411d7b3a197396ca59d4"; 25 - hash = "sha256-oja7xSIXZT1/0t1qep0C9tU524L4GVMrXF5WWiIXwyA="; 24 + rev = "f4eca37794b7c06affcf0bc28660de7c54eddc9a"; 25 + hash = "sha256-WsCR2xjQc4Kx1nUdApxbkkyX+nYoLl5IsSUVW3rjT1Q="; 26 26 }; 27 27 28 28 disabled = pythonOlder "3.8";
+2 -2
pkgs/games/vintagestory/default.nix
··· 20 20 21 21 stdenv.mkDerivation rec { 22 22 pname = "vintagestory"; 23 - version = "1.19.1"; 23 + version = "1.19.3"; 24 24 25 25 src = fetchurl { 26 26 url = "https://cdn.vintagestory.at/gamefiles/stable/vs_client_linux-x64_${version}.tar.gz"; 27 - hash = "sha256-PrsClGSXTah5kkhww7slfkwpo0gJryf6pm61LsCYbiE="; 27 + hash = "sha256-ULxwNdQLQCWJqCTiGtT1X/Y32f406FT/UPAJNBYrV/s="; 28 28 }; 29 29 30 30
+6 -9
pkgs/os-specific/darwin/airbuddy/default.nix
··· 1 1 { lib 2 2 , stdenvNoCC 3 3 , fetchurl 4 - , undmg 4 + , _7zz 5 5 }: 6 6 7 7 stdenvNoCC.mkDerivation (finalAttrs: { ··· 19 19 dontBuild = true; 20 20 dontFixup = true; 21 21 22 - nativeBuildInputs = [ undmg ]; 22 + nativeBuildInputs = [ _7zz ]; 23 23 24 - # AirBuddy.dmg is not HFS formatted, default unpackPhase fails 25 - # https://discourse.nixos.org/t/help-with-error-only-hfs-file-systems-are-supported-on-ventura 24 + # AirBuddy.dmg is APFS formatted, unpack with 7zz 26 25 unpackCmd = '' 27 - mnt=$(mktemp -d) 26 + runHook preUnpack 28 27 29 - /usr/bin/hdiutil attach -nobrowse -readonly $src -mountpoint $mnt 28 + 7zz x $src 30 29 31 - shopt -s extglob 32 - DEST="$PWD" 33 - (cd "$mnt"; cp -a !(Applications) "$DEST/") 30 + runHook postUnpack 34 31 ''; 35 32 36 33 sourceRoot = "AirBuddy.app";
+6 -15
pkgs/os-specific/darwin/aldente/default.nix
··· 1 1 { lib 2 2 , stdenvNoCC 3 3 , fetchurl 4 - , undmg 4 + , _7zz 5 5 }: 6 6 7 7 stdenvNoCC.mkDerivation (finalAttrs: { ··· 16 16 dontBuild = true; 17 17 dontFixup = true; 18 18 19 - nativeBuildInputs = [ undmg ]; 19 + nativeBuildInputs = [ _7zz ]; 20 20 21 - # AlDente.dmg is not HFS formatted, default unpackPhase fails 22 - # https://discourse.nixos.org/t/help-with-error-only-hfs-file-systems-are-supported-on-ventura 21 + # AlDente.dmg is APFS formatted, unpack with 7zz 23 22 unpackCmd = '' 24 - if ! [[ "$curSrc" =~ \.dmg$ ]]; then return 1; fi 25 - mnt=$(mktemp -d -t ci-XXXXXXXXXX) 23 + runHook preUnpack 26 24 27 - function finish { 28 - /usr/bin/hdiutil detach $mnt -force 29 - } 30 - trap finish EXIT 25 + 7zz x $src 31 26 32 - /usr/bin/hdiutil attach -nobrowse -readonly $src -mountpoint $mnt 33 - 34 - shopt -s extglob 35 - DEST="$PWD" 36 - (cd "$mnt"; cp -a !(Applications) "$DEST/") 27 + runHook postUnpack 37 28 ''; 38 29 39 30 sourceRoot = "AlDente.app";
+7 -1
pkgs/os-specific/linux/lxc/default.nix
··· 45 45 systemd 46 46 ]; 47 47 48 - patches = [ ./add-meson-options.patch ]; 48 + patches = [ 49 + # make build more nix compatible 50 + ./add-meson-options.patch 51 + 52 + # fix docbook2man version detection 53 + ./docbook-hack.patch 54 + ]; 49 55 50 56 mesonFlags = [ 51 57 "-Dinstall-init-files=false"
+21
pkgs/os-specific/linux/lxc/docbook-hack.patch
··· 1 + diff --git a/meson.build b/meson.build 2 + index d1527679e..360824994 100644 3 + --- a/meson.build 4 + +++ b/meson.build 5 + @@ -320,15 +320,7 @@ docconf.set('LXC_USERNIC_CONF', lxc_user_network_conf) 6 + docconf.set('LXC_USERNIC_DB', lxc_user_network_db) 7 + docconf.set('PACKAGE_VERSION', version_data.get('LXC_VERSION')) 8 + docconf.set('docdtd', '"-//OASIS//DTD DocBook XML" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"') 9 + -sgml2man = find_program('docbook2X2man', 'docbook2x-man', 'db2x_docbook2man', 'docbook2man', 'docbook-to-man', required: false, version: '>=0.8') 10 + -if not sgml2man.found() 11 + - sgml2man = find_program('docbook2man', required: false, version: '<0.8') 12 + - if sgml2man.found() 13 + - docconf.set('docdtd', '"-//Davenport//DTD DocBook V3.0//EN"') 14 + - elif want_mans 15 + - error('missing required docbook2x or docbook-utils dependency') 16 + - endif 17 + -endif 18 + +sgml2man = find_program('docbook2X2man', 'docbook2x-man', 'db2x_docbook2man', 'docbook2man', 'docbook-to-man', required: false) 19 + 20 + ## Threads. 21 + threads = dependency('threads')
+1 -1
pkgs/servers/apache-airflow/python-package.nix
··· 265 265 ]; 266 266 267 267 postInstall = '' 268 - cp -rv ${airflow-frontend}/static/dist $out/lib/${python.libPrefix}/site-packages/airflow/www/static 268 + cp -rv ${airflow-frontend}/static/dist $out/${python.sitePackages}/airflow/www/static 269 269 # Needed for pythonImportsCheck below 270 270 export HOME=$(mktemp -d) 271 271 '';
+2 -2
pkgs/servers/baserow/default.nix
··· 127 127 128 128 fixupPhase = '' 129 129 cp -r src/baserow/contrib/database/{api,action,trash,formula,file_import} \ 130 - $out/lib/${python.libPrefix}/site-packages/baserow/contrib/database/ 131 - cp -r src/baserow/core/management/backup $out/lib/${python.libPrefix}/site-packages/baserow/core/management/ 130 + $out/${python.sitePackages}/baserow/contrib/database/ 131 + cp -r src/baserow/core/management/backup $out/${python.sitePackages}/baserow/core/management/ 132 132 ''; 133 133 134 134 disabledTests = [
+10 -3
pkgs/servers/dex/default.nix
··· 1 - { lib, buildGoModule, fetchFromGitHub, nixosTests }: 1 + { lib, buildGoModule, fetchFromGitHub, nixosTests, testers, dex-oidc }: 2 2 3 3 buildGoModule rec { 4 4 pname = "dex"; ··· 18 18 ]; 19 19 20 20 ldflags = [ 21 - "-w" "-s" "-X github.com/dexidp/dex/version.Version=${src.rev}" 21 + "-w" "-s" "-X main.version=${src.rev}" 22 22 ]; 23 23 24 24 postInstall = '' ··· 26 26 cp -r $src/web $out/share/web 27 27 ''; 28 28 29 - passthru.tests = { inherit (nixosTests) dex-oidc; }; 29 + passthru.tests = { 30 + inherit (nixosTests) dex-oidc; 31 + version = testers.testVersion { 32 + package = dex-oidc; 33 + command = "dex version"; 34 + version = "v${version}"; 35 + }; 36 + }; 30 37 31 38 meta = with lib; { 32 39 description = "OpenID Connect and OAuth2 identity provider with pluggable connectors";
+1 -1
pkgs/servers/gpsd/default.nix
··· 84 84 substituteInPlace SConscript --replace "env['CCVERSION']" "env['CC']" 85 85 86 86 sconsFlags+=" udevdir=$out/lib/udev" 87 - sconsFlags+=" python_libdir=$out/lib/${python3Packages.python.libPrefix}/site-packages" 87 + sconsFlags+=" python_libdir=$out/${python3Packages.python.sitePackages}" 88 88 ''; 89 89 90 90 # - leapfetch=no disables going online at build time to fetch leap-seconds
+2 -2
pkgs/servers/komga/default.nix
··· 8 8 9 9 stdenvNoCC.mkDerivation rec { 10 10 pname = "komga"; 11 - version = "1.10.1"; 11 + version = "1.10.3"; 12 12 13 13 src = fetchurl { 14 14 url = "https://github.com/gotson/${pname}/releases/download/${version}/${pname}-${version}.jar"; 15 - sha256 = "sha256-fgboHXS5lBvhnAfKUbCmKVjvRp+WF7kuU/VTEgky3VI="; 15 + sha256 = "sha256-t/nwqEVrsBeELJLLtizDI737VnODRsuPfQlnDUBfoKc="; 16 16 }; 17 17 18 18 nativeBuildInputs = [
+3 -3
pkgs/servers/matrix-synapse/default.nix
··· 17 17 in 18 18 python3.pkgs.buildPythonApplication rec { 19 19 pname = "matrix-synapse"; 20 - version = "1.99.0"; 20 + version = "1.100.0"; 21 21 format = "pyproject"; 22 22 23 23 src = fetchFromGitHub { 24 24 owner = "element-hq"; 25 25 repo = "synapse"; 26 26 rev = "v${version}"; 27 - hash = "sha256-NS0in7zUkIS+fI5gQEua9y1UXspEHWNCntyZHZCtfPg="; 27 + hash = "sha256-6YK/VV0ELvMJoA5ipmoB4S13HqA0UEOnQ6JbQdlkYWU="; 28 28 }; 29 29 30 30 cargoDeps = rustPlatform.fetchCargoTarball { 31 31 inherit src; 32 32 name = "${pname}-${version}"; 33 - hash = "sha256-FQhHpbp8Rkkqp6Ngly/HP8iWGlWh5CDaztgAwKB/afI="; 33 + hash = "sha256-oXIraayA6Dd8aYirRhM9Av8x7bj+WZI6o7dEr9OCtdk="; 34 34 }; 35 35 36 36 postPatch = ''
-23
pkgs/servers/monitoring/prometheus/openvpn-exporter.nix
··· 1 - { lib, buildGoModule, fetchFromGitHub }: 2 - 3 - buildGoModule rec { 4 - pname = "openvpn_exporter-unstable"; 5 - version = "0.3.0"; 6 - 7 - src = fetchFromGitHub { 8 - owner = "kumina"; 9 - repo = "openvpn_exporter"; 10 - rev = "v${version}"; 11 - hash = "sha256-tIB4yujZj36APGAe4doKF4YlEUnieeC8bTV+FFKxpJI="; 12 - }; 13 - 14 - vendorHash = "sha256-urxzQU0bBS49mBg2jm6jHNZA3MTS3DlQY7D5Fa0F/Mk="; 15 - 16 - meta = with lib; { 17 - inherit (src.meta) homepage; 18 - description = "Prometheus exporter for OpenVPN"; 19 - broken = true; 20 - license = licenses.asl20; 21 - maintainers = with maintainers; [ ]; 22 - }; 23 - }
+2 -2
pkgs/servers/monitoring/prometheus/sql-exporter.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "sql_exporter"; 5 - version = "0.5.2"; 5 + version = "0.5.3"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "justwatchcom"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - sha256 = "sha256-TkTxmumL7T8stNPWkVrMdB23jjMyQcv2x9F+rK6Vj6E="; 11 + sha256 = "sha256-Cp8+vVGyAwYcrBiEN1SmUnHqWFGtuypvzfDROJgOn28="; 12 12 }; 13 13 14 14 vendorHash = null;
+3 -3
pkgs/servers/monitoring/prometheus/unbound-exporter.nix
··· 5 5 }: 6 6 7 7 let 8 - version = "0.4.4"; 8 + version = "0.4.5"; 9 9 in 10 10 buildGoModule { 11 11 pname = "unbound_exporter"; ··· 15 15 owner = "letsencrypt"; 16 16 repo = "unbound_exporter"; 17 17 rev = "refs/tags/v${version}"; 18 - hash = "sha256-0eo56z5b+hzKCY5OKg/9F7rjLyoSKPJoHLoXeMjCuFU="; 18 + hash = "sha256-p2VSIQXTnNGgqUSvWQ4J3SbrnWGBO21ps4VCWOjioLM="; 19 19 }; 20 20 21 - vendorHash = "sha256-4aWuf9UTPQseEwDJfWIcQW4uGMffRnWlHhiu0yMz4vk="; 21 + vendorHash = "sha256-q3JqAGeEU5WZWTzdFE9hR2dAnsFjMM44JiYdodZrnhs="; 22 22 23 23 passthru.tests = { 24 24 inherit (nixosTests.prometheus-exporters) unbound;
+3 -3
pkgs/servers/rustdesk-server/Cargo.lock
··· 779 779 780 780 [[package]] 781 781 name = "hbbs" 782 - version = "1.1.9" 782 + version = "1.1.10-3" 783 783 dependencies = [ 784 784 "async-speed-limit", 785 785 "async-trait", ··· 1111 1111 1112 1112 [[package]] 1113 1113 name = "mac_address" 1114 - version = "1.1.3" 1114 + version = "1.1.5" 1115 1115 source = "registry+https://github.com/rust-lang/crates.io-index" 1116 - checksum = "df1d1bc1084549d60725ccc53a2bfa07f67fe4689fda07b05a36531f2988104a" 1116 + checksum = "4863ee94f19ed315bf3bc00299338d857d4b5bc856af375cc97d237382ad3856" 1117 1117 dependencies = [ 1118 1118 "nix", 1119 1119 "winapi",
+2 -2
pkgs/servers/rustdesk-server/default.nix
··· 13 13 14 14 rustPlatform.buildRustPackage rec { 15 15 pname = "rustdesk-server"; 16 - version = "1.1.9"; 16 + version = "1.1.10-3"; 17 17 18 18 src = fetchFromGitHub { 19 19 owner = "rustdesk"; 20 20 repo = "rustdesk-server"; 21 21 rev = version; 22 - hash = "sha256-bC1eraMSa9Lz5icvU7dPnEIeqE5TaW8HseBQMRmDCXQ="; 22 + hash = "sha256-iXe5V99hvtdRi6t/2wUMQ/aSCWfscA1s48vrdO6H2Rw="; 23 23 }; 24 24 25 25 cargoLock = {
+29 -7
pkgs/servers/seafile-server/default.nix
··· 1 - { stdenv, lib, fetchFromGitHub, pkg-config, python3, autoreconfHook 2 - , libuuid, sqlite, glib, libevent, libsearpc, openssl, fuse, libarchive, which 3 - , vala, cmake, oniguruma, nixosTests }: 1 + { stdenv 2 + , lib 3 + , fetchFromGitHub 4 + , pkg-config 5 + , python3 6 + , autoreconfHook 7 + , libuuid 8 + , sqlite 9 + , glib 10 + , libevent 11 + , libsearpc 12 + , openssl 13 + , fuse 14 + , libarchive 15 + , libjwt 16 + , curl 17 + , which 18 + , vala 19 + , cmake 20 + , oniguruma 21 + , nixosTests 22 + }: 4 23 5 24 let 6 25 # seafile-server relies on a specific version of libevhtp. ··· 8 27 libevhtp = import ./libevhtp.nix { 9 28 inherit stdenv lib fetchFromGitHub cmake libevent; 10 29 }; 11 - in stdenv.mkDerivation rec { 30 + in 31 + stdenv.mkDerivation rec { 12 32 pname = "seafile-server"; 13 - version = "9.0.10"; 33 + version = "10.0.1"; 14 34 15 35 src = fetchFromGitHub { 16 36 owner = "haiwen"; 17 37 repo = "seafile-server"; 18 - rev = "079a8b65a543bfbc48e7671c3dbbffe19fd02944"; # using a fixed revision because upstream may re-tag releases :/ 19 - sha256 = "sha256-F1n4E6ajpri3CVM7B28UKoTV1oOLr5nTy6Lw0E5tCrc="; 38 + rev = "db09baec1b88fc131bf4453a808ab63a3fc714c9"; # using a fixed revision because upstream may re-tag releases :/ 39 + sha256 = "sha256-a5vtJcbnaYzq6/3xmhbWk23BZ+Wil/Tb/q22ML4bDqs="; 20 40 }; 21 41 22 42 nativeBuildInputs = [ autoreconfHook pkg-config ]; ··· 31 51 python3 32 52 fuse 33 53 libarchive 54 + libjwt 55 + curl 34 56 which 35 57 vala 36 58 libevhtp
+84
pkgs/test/buildFHSEnv/default.nix
··· 1 + { lib 2 + , buildFHSEnv 3 + , runCommand 4 + , stdenv 5 + , fetchurl 6 + , dpkg 7 + , glibc 8 + , callPackage 9 + }: 10 + 11 + let 12 + getSharedObjectFromDebian = sharedObjectName: src: stdenv.mkDerivation { 13 + name = "${sharedObjectName}-fetcher"; 14 + inherit src; 15 + nativeBuildInputs = [ 16 + dpkg 17 + ]; 18 + dontBuild = true; 19 + dontConfigure = true; 20 + dontFixup = true; 21 + installPhase = '' 22 + echo shared objects found are: 23 + ls -l usr/lib/*/ 24 + cp usr/lib/*/${sharedObjectName} $out 25 + ''; 26 + }; 27 + 28 + makeSharedObjectTest = sharedObject: targetPkgs: let 29 + lddFHSEnv = buildFHSEnv { 30 + name = "ldd-with-ncurses-FHS-env"; 31 + inherit targetPkgs; 32 + runScript = "ldd"; 33 + }; 34 + ldd-in-FHS = "${lddFHSEnv}/bin/${lddFHSEnv.name}"; 35 + ldd = "${lib.getBin glibc}/bin/ldd"; 36 + find_libFHSEnv = buildFHSEnv { 37 + name = "ls-with-ncurses-FHS-env"; 38 + targetPkgs = p: [ 39 + p.ncurses5 40 + ]; 41 + runScript = "find /lib/ -executable"; 42 + }; 43 + find_lib-in-FHS = "${find_libFHSEnv}/bin/${find_libFHSEnv.name}"; 44 + in runCommand "FHS-lib-test" {} '' 45 + echo original ldd output is: 46 + ${ldd} ${sharedObject} 47 + lddOutput="$(${ldd-in-FHS} ${sharedObject})" 48 + echo ldd output inside FHS is: 49 + echo "$lddOutput" 50 + if echo $lddOutput | grep -q "not found"; then 51 + echo "shared object could not find all dependencies in the FHS!" 52 + echo The libraries below where found in the FHS: 53 + ${find_lib-in-FHS} 54 + exit 1 55 + else 56 + echo $lddOutput > $out 57 + fi 58 + ''; 59 + 60 + in { 61 + # This test proves an issue with buildFHSEnv - don't expect it to succeed, 62 + # this is discussed in https://github.com/NixOS/nixpkgs/pull/279844 . 63 + libtinfo = makeSharedObjectTest (getSharedObjectFromDebian "libedit.so.2.0.70" (fetchurl { 64 + url = "mirror://debian/pool/main/libe/libedit/libedit2_3.1-20221030-2_amd64.deb"; 65 + hash = "sha256-HPFKvycW0yedsS0GV6VzfPcAdKHnHTvfcyBmJePInOY="; 66 + })) (p: let 67 + ncurses' = p.ncurses.overrideAttrs (old: { 68 + configureFlags = old.configureFlags ++ [ "--with-termlib" ]; 69 + postFixup = ""; 70 + }); 71 + in [ 72 + (ncurses'.override { unicodeSupport = false; }) 73 + p.libbsd 74 + ]); 75 + 76 + liblzma = makeSharedObjectTest (getSharedObjectFromDebian "libxml2.so.2.9.14" (fetchurl { 77 + url = "mirror://debian/pool/main/libx/libxml2/libxml2_2.9.14+dfsg-1.3~deb12u1_amd64.deb"; 78 + hash = "sha256-NbdstwOPwclAIEpPBfM/+3nQJzU85Gk5fZrc+Pmz4ac="; 79 + })) (p: [ 80 + p.xz 81 + p.zlib 82 + p.icu72 83 + ]); 84 + }
+2
pkgs/test/default.nix
··· 169 169 170 170 pkgs-lib = recurseIntoAttrs (import ../pkgs-lib/tests { inherit pkgs; }); 171 171 172 + buildFHSEnv = recurseIntoAttrs (callPackages ./buildFHSEnv { }); 173 + 172 174 nixpkgs-check-by-name = callPackage ./nixpkgs-check-by-name { }; 173 175 174 176 auto-patchelf-hook = callPackage ./auto-patchelf-hook { };
+3 -3
pkgs/tools/admin/balena-cli/default.nix
··· 18 18 }; 19 19 in buildNpmPackage' rec { 20 20 pname = "balena-cli"; 21 - version = "17.5.0"; 21 + version = "17.5.1"; 22 22 23 23 src = fetchFromGitHub { 24 24 owner = "balena-io"; 25 25 repo = "balena-cli"; 26 26 rev = "v${version}"; 27 - hash = "sha256-qc1qYDdWIk3r/0B9mpV0BqNFLvG5in2KSBs+0/s5oCk="; 27 + hash = "sha256-DapVJAXfTdGjtVBIKuc+xKZ6yWw1eC2pxTwt5O0QrWk="; 28 28 }; 29 29 30 - npmDepsHash = "sha256-WZoBSZuW8qLaiCc/KY9MO+IeUy3r44OFI5s5wdsNUaE="; 30 + npmDepsHash = "sha256-yAcUGOSrQ+AB2b0eDKCMhZRP/LEKcmJmO5xNhVJcqX4="; 31 31 32 32 postPatch = '' 33 33 ln -s npm-shrinkwrap.json package-lock.json
+3 -3
pkgs/tools/admin/copilot-cli/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "copilot-cli"; 5 - version = "1.33.0"; 5 + version = "1.33.1"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "aws"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - hash = "sha256-4LDeilWi3FzvrvHjEyQKQi1GxouSlzDY96yBuMfpsXM="; 11 + hash = "sha256-/xuS5tJBV67gXGHQ93FpMXMLXnhAgnicQnKx/pnwyAM="; 12 12 }; 13 13 14 - vendorHash = "sha256-EqgOyjb2raE5hW3h+czbsi/F9SVNDwPWM1L6GC7v6IY="; 14 + vendorHash = "sha256-ekAuvvLxk9cwIuElosc6QbsW7+3f/mO8vsA74DA82D0="; 15 15 16 16 nativeBuildInputs = [ installShellFiles ]; 17 17
+2 -2
pkgs/tools/admin/gam/default.nix
··· 52 52 runHook preInstall 53 53 mkdir -p $out/bin 54 54 cp gam.py $out/bin/gam 55 - mkdir -p $out/lib/${python3.libPrefix}/site-packages 56 - cp -r gam $out/lib/${python3.libPrefix}/site-packages 55 + mkdir -p $out/${python3.sitePackages} 56 + cp -r gam $out/${python3.sitePackages} 57 57 runHook postInstall 58 58 ''; 59 59
+2 -2
pkgs/tools/admin/qovery-cli/default.nix
··· 8 8 9 9 buildGoModule rec { 10 10 pname = "qovery-cli"; 11 - version = "0.81.1"; 11 + version = "0.82.0"; 12 12 13 13 src = fetchFromGitHub { 14 14 owner = "Qovery"; 15 15 repo = "qovery-cli"; 16 16 rev = "refs/tags/v${version}"; 17 - hash = "sha256-vzE2Slj69kJbXHNKM9mCBwPkbOqG3DkVa6y4DmfBdn0="; 17 + hash = "sha256-jdYCJU+oQtfG79iJEvnbrDZUIcV06b1SNQv3d6aW+Bo="; 18 18 }; 19 19 20 20 vendorHash = "sha256-IDKJaWnQsOtghpCh7UyO6RzWgSZS0S0jdF5hVV7xVbs=";
+1 -1
pkgs/tools/audio/tts/default.nix
··· 128 128 129 129 for file in $(grep -rl 'python TTS/bin' tests); do 130 130 substituteInPlace "$file" \ 131 - --replace "python TTS/bin" "${python.interpreter} $out/lib/${python.libPrefix}/site-packages/TTS/bin" 131 + --replace "python TTS/bin" "${python.interpreter} $out/${python.sitePackages}/TTS/bin" 132 132 done 133 133 ''; 134 134
+1 -1
pkgs/tools/misc/debian-devscripts/default.nix
··· 39 39 40 40 preConfigure = '' 41 41 export PERL5LIB="$PERL5LIB''${PERL5LIB:+:}${dpkg}"; 42 - tgtpy="$out/lib/${python.libPrefix}/site-packages" 42 + tgtpy="$out/${python.sitePackages}" 43 43 mkdir -p "$tgtpy" 44 44 export PYTHONPATH="$PYTHONPATH''${PYTHONPATH:+:}$tgtpy" 45 45 find lib po4a scripts -type f -exec sed -r \
+2 -2
pkgs/tools/misc/fastfetch/default.nix
··· 32 32 33 33 stdenv.mkDerivation (finalAttrs: { 34 34 pname = "fastfetch"; 35 - version = "2.7.0"; 35 + version = "2.7.1"; 36 36 37 37 src = fetchFromGitHub { 38 38 owner = "fastfetch-cli"; 39 39 repo = "fastfetch"; 40 40 rev = finalAttrs.version; 41 - hash = "sha256-+p85f2cH+syRpnSozc++jPT4Hbn/kGkVsUv3L5Na8+s="; 41 + hash = "sha256-s0N3Rt3lLOCyaeXeNYu6hlGtNtGR+YC7Aj4/3SeVMpQ="; 42 42 }; 43 43 44 44 nativeBuildInputs = [
+3 -3
pkgs/tools/misc/twm/default.nix
··· 9 9 10 10 rustPlatform.buildRustPackage rec { 11 11 pname = "twm"; 12 - version = "0.8.2"; 12 + version = "0.9.0"; 13 13 14 14 src = fetchFromGitHub { 15 15 owner = "vinnymeller"; 16 16 repo = pname; 17 17 rev = "v${version}"; 18 - sha256 = "sha256-r9l5gNWoIkKHzjHOCK7qnPLfg6O+km7OX+6pHQKhN6g="; 18 + sha256 = "sha256-gvo5+lZNe5QOHNI4nrPbCR65D+VFf/anmLVdu5RXJiY="; 19 19 }; 20 20 21 - cargoHash = "sha256-0nCMgfnEqr0D3HpocUN/Hc9tG9byu2CYvBy/8vIU+bI="; 21 + cargoHash = "sha256-5+1B+SbrIrswGjtNLlwbtLEhARMZNs75DFK8wQI2O0M="; 22 22 23 23 nativeBuildInputs = [ pkg-config ]; 24 24 buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security ];
+3 -3
pkgs/tools/misc/wasm-tools/default.nix
··· 5 5 6 6 rustPlatform.buildRustPackage rec { 7 7 pname = "wasm-tools"; 8 - version = "1.0.55"; 8 + version = "1.0.57"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "bytecodealliance"; 12 12 repo = pname; 13 13 rev = "${pname}-${version}"; 14 - hash = "sha256-9HcHM5ao0lSGctvjYQZNb5wlNsYPTD3NtPDZA/kHJdY="; 14 + hash = "sha256-3syV4zPoSJtMiogmRu90pYTwNw2T/dRKFWczYI2J1r0="; 15 15 fetchSubmodules = true; 16 16 }; 17 17 18 18 # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved. 19 19 auditable = false; 20 - cargoHash = "sha256-fU9tpN+tVlwbTNWinylcRACSLhDD/uPPGW6GNWm/tvo="; 20 + cargoHash = "sha256-w1BVh7/L4+CXTgjkQKzbzgqw3XE49hYrkWtaNmcfDi4="; 21 21 cargoBuildFlags = [ "--package" "wasm-tools" ]; 22 22 cargoTestFlags = [ "--all" ]; 23 23
+2 -2
pkgs/tools/networking/xdp-tools/default.nix
··· 15 15 }: 16 16 stdenv.mkDerivation rec { 17 17 pname = "xdp-tools"; 18 - version = "1.4.1"; 18 + version = "1.4.2"; 19 19 20 20 src = fetchFromGitHub { 21 21 owner = "xdp-project"; 22 22 repo = "xdp-tools"; 23 23 rev = "v${version}"; 24 - hash = "sha256-5rc3RbAgWVd7Tt16NoHymFME5a9tBCmup+1ZmnMGPhs="; 24 + hash = "sha256-kWgjt7mYwHtf8I4sXPzzrQJkWQyC8AC85ulGOWmQNZI="; 25 25 }; 26 26 27 27 outputs = [ "out" "lib" ];
+5 -3
pkgs/tools/package-management/apx/default.nix
··· 7 7 8 8 buildGoModule rec { 9 9 pname = "apx"; 10 - version = "2.3.0"; 10 + version = "2.4.0"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "Vanilla-OS"; 14 14 repo = "apx"; 15 15 rev = "v${version}"; 16 - hash = "sha256-/RGL2mCfJiJInnt5zgc1xXPqZxXCAcoWIbky99okvL0="; 16 + hash = "sha256-OLJrwibw9uX5ty7FRZ0q8zx0i1vQXRKK8reQsJFFxAI="; 17 17 }; 18 18 19 19 vendorHash = null; ··· 31 31 ''; 32 32 33 33 postInstall = '' 34 - install -m 444 -D config/apx.json -t $out/share/apx/ 34 + install -Dm444 config/apx.json -t $out/share/apx/ 35 35 installManPage man/man1/* 36 + install -Dm444 README.md -t $out/share/docs/apx 37 + install -Dm444 COPYING.md $out/share/licenses/apx/LICENSE 36 38 ''; 37 39 38 40 meta = with lib; {
+1 -1
pkgs/tools/security/arubaotp-seed-extractor/default.nix
··· 28 28 ]; 29 29 30 30 installPhase = '' 31 - libdir="$out/lib/${python3Packages.python.libPrefix}/site-packages/arubaotp-seed-extractor" 31 + libdir="$out/${python3Packages.python.sitePackages}/arubaotp-seed-extractor" 32 32 mkdir -p "$libdir" 33 33 cp scripts/* "$libdir" 34 34 chmod +x "$libdir/main.py"
+3 -3
pkgs/tools/security/cyclonedx-gomod/default.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "cyclonedx-gomod"; 8 - version = "1.5.0"; 8 + version = "1.6.0"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "CycloneDX"; 12 12 repo = pname; 13 13 rev = "v${version}"; 14 - hash = "sha256-whAHZDUQBJaYu+OZiqcYzWxOru1GXDQ4FMDCj+ngCDs="; 14 + hash = "sha256-3YHlh7edRWU8plAJh96RDkrC9YUQjvV4vNGOxmbS0sA="; 15 15 }; 16 16 17 - vendorHash = "sha256-FpsZonGJSzbAsnM00qq/qiTJLUN4q08dR+6rhTKvX0I="; 17 + vendorHash = "sha256-0Fx9pOofcY5rpX6DU2xPeg7xEZ8ows/DWwyV5B7LHGY="; 18 18 19 19 # Tests require network access and cyclonedx executable 20 20 doCheck = false;
+1 -1
pkgs/tools/security/hash-slinger/default.nix
··· 49 49 ''; 50 50 51 51 installPhase = '' 52 - mkdir -p $out/bin $out/man $out/lib/${python3.libPrefix}/site-packages 52 + mkdir -p $out/bin $out/man $out/${python3.sitePackages} 53 53 make install 54 54 wrapPythonPrograms 55 55 '';
+4 -3
pkgs/tools/security/notation/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "notation"; 5 - version = "1.0.1"; 5 + version = "1.1.0"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "notaryproject"; 9 9 repo = pname; 10 10 rev = "v${version}"; 11 - hash = "sha256-KcB5l6TRZhciXO04mz5iORR4//cAhrh+o4Kdq7LA4A4="; 11 + hash = "sha256-MJBFdtx+HkPCN1SIohKOy33BW746GNN2fWkr7TIuBmk="; 12 12 }; 13 13 14 - vendorHash = "sha256-r58ZV63KIHKxh5HDeQRfd0OF0s7xpC4sXvsYLhm8AIE="; 14 + vendorHash = "sha256-USkufc1dG4eyRfRJHSX4mVZHnvOc5onHenF98Aedac4="; 15 15 16 16 # This is a Go sub-module and cannot be built directly (e2e tests). 17 17 excludedPackages = [ "./test" ]; ··· 33 33 homepage = "https://notaryproject.dev/"; 34 34 license = licenses.asl20; 35 35 maintainers = with maintainers; [ aaronjheng ]; 36 + mainProgram = "notation"; 36 37 }; 37 38 }
+3 -3
pkgs/tools/security/nuclei/default.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "nuclei"; 8 - version = "3.1.7"; 8 + version = "3.1.8"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "projectdiscovery"; 12 12 repo = "nuclei"; 13 13 rev = "refs/tags/v${version}"; 14 - hash = "sha256-O7GWH65zOKK9mPlap5BL302ow/ruXOz8CxUjaHfIj3w="; 14 + hash = "sha256-uNPMQ4I85R8xY9IrEX3puaKXvk3+nTT32fimEpzStjM="; 15 15 }; 16 16 17 - vendorHash = "sha256-mwqDoX79cnG6zPncN1l5uAdOSbyAVWzw2dV+2rnBsqw="; 17 + vendorHash = "sha256-bk8vgCZqzLYmtO2sj5p3l22X5SSZ5zA5RvlrijsiW10="; 18 18 19 19 subPackages = [ 20 20 "cmd/nuclei/"
+1 -1
pkgs/tools/security/pass/extensions/audit/default.nix
··· 41 41 installFlags = [ "DESTDIR=${placeholder "out"}" "PREFIX=" ]; 42 42 postInstall = '' 43 43 wrapProgram $out/lib/password-store/extensions/audit.bash \ 44 - --prefix PYTHONPATH : "$out/lib/${pythonEnv.libPrefix}/site-packages" \ 44 + --prefix PYTHONPATH : "$out/${pythonEnv.sitePackages}" \ 45 45 --run "export COMMAND" 46 46 ''; 47 47
+2 -2
pkgs/tools/security/trufflehog/default.nix
··· 7 7 8 8 buildGoModule rec { 9 9 pname = "trufflehog"; 10 - version = "3.65.0"; 10 + version = "3.66.1"; 11 11 12 12 src = fetchFromGitHub { 13 13 owner = "trufflesecurity"; 14 14 repo = "trufflehog"; 15 15 rev = "refs/tags/v${version}"; 16 - hash = "sha256-v2RhyXwjCvlhbfFiTuURatEq5foylatGOdqQCYQbZAE="; 16 + hash = "sha256-NTBZldpocuFVJvI+wL74S3mj6waiNu1Hkncan4oqd8U="; 17 17 }; 18 18 19 19 vendorHash = "sha256-yhgNsiKh0sgVn0N1LqpWT1Utapc5DL+Ueposg+bAO5o=";
+2 -2
pkgs/tools/text/crowdin-cli/default.nix
··· 14 14 15 15 stdenv.mkDerivation rec { 16 16 pname = "crowdin-cli"; 17 - version = "3.16.1"; 17 + version = "3.17.0"; 18 18 19 19 src = fetchurl { 20 20 url = "https://github.com/crowdin/${pname}/releases/download/${version}/${pname}.zip"; 21 - hash = "sha256-B68pCNQYly/0OQJkSjztP08bQGaGQeE+AAOiu5VbszY="; 21 + hash = "sha256-thiwggDtzQsfbzwWF2tTMRQHfktq+W9fBH6QT7t2gKc="; 22 22 }; 23 23 24 24 nativeBuildInputs = [ installShellFiles makeWrapper unzip ];
+2 -2
pkgs/tools/text/diffstat/default.nix
··· 2 2 3 3 stdenv.mkDerivation rec { 4 4 pname = "diffstat"; 5 - version = "1.65"; 5 + version = "1.66"; 6 6 7 7 src = fetchurl { 8 8 urls = [ 9 9 "ftp://ftp.invisible-island.net/diffstat/diffstat-${version}.tgz" 10 10 "https://invisible-mirror.net/archives/diffstat/diffstat-${version}.tgz" 11 11 ]; 12 - sha256 = "sha256-jPJ0JJJt682FkhdVw5FVWSiCRL0QP2LXQNxrg7VXooo="; 12 + sha256 = "sha256-9UUxu+Mujg+kYfAYtB469Ra2MggBcvNh8F5QNn7Ltp4="; 13 13 }; 14 14 15 15 meta = with lib; {
+3 -3
pkgs/tools/text/vale/default.nix
··· 2 2 3 3 buildGoModule rec { 4 4 pname = "vale"; 5 - version = "3.0.5"; 5 + version = "3.0.6"; 6 6 7 7 subPackages = [ "cmd/vale" ]; 8 8 outputs = [ "out" "data" ]; ··· 11 11 owner = "errata-ai"; 12 12 repo = "vale"; 13 13 rev = "v${version}"; 14 - hash = "sha256-tRsfmQ3FkRQgIg3lD8xjbn1iV2QcwDdW5pmKh96+2Gs="; 14 + hash = "sha256-hCGJI2copXuyrxq4X1akR2Vz3DYS87dv3RZdw3gopNM="; 15 15 }; 16 16 17 - vendorHash = "sha256-AsBbJJQs+pU2UNfEFvNnPwaaabTrXvFBQLcriIA2ST4="; 17 + vendorHash = "sha256-dkX/aQKuYNRynHuoj9m/6DI/mCEdp9XcKDt4TLx1rDU="; 18 18 19 19 postInstall = '' 20 20 mkdir -p $data/share/vale
+3 -3
pkgs/tools/wayland/hyprland-per-window-layout/default.nix
··· 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "hyprland-per-window-layout"; 5 - version = "2.6"; 5 + version = "2.7"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "coffebar"; 9 9 repo = pname; 10 10 rev = version; 11 - hash = "sha256-g6cFZXEWKB9IxP/ARe788tXFpDofJNDWMwUU15yKYhA="; 11 + hash = "sha256-Tci3OR7c8hEWAnFsBlSNZYt7znAxPRDhJV+1q7fw6z8="; 12 12 }; 13 13 14 - cargoHash = "sha256-kVu81NnwcKksHeS5ZM/SgTuh2olMgdBBxY3cJxwuW0Q="; 14 + cargoHash = "sha256-lVNephJ6UfdM6dPnHs+jHG9A79qHEsrm7tcjcDralnY="; 15 15 16 16 meta = with lib; { 17 17 description = "Per window keyboard layout (language) for Hyprland wayland compositor";
+1
pkgs/top-level/aliases.nix
··· 860 860 probe-rs-cli = throw "probe-rs-cli is now part of the probe-rs package"; # Added 2023-07-03 861 861 processing3 = throw "'processing3' has been renamed to/replaced by 'processing'"; # Converted to throw 2023-09-10 862 862 prometheus-dmarc-exporter = dmarc-metrics-exporter; # added 2022-05-31 863 + prometheus-openvpn-exporter = throw "'prometheus-openvpn-exporter' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-12-23 863 864 prometheus-speedtest-exporter = throw "prometheus-speedtest-exporter was removed as unmaintained"; # Added 2023-07-31 864 865 protobuf3_17 = throw "protobuf3_17 does not receive updates anymore and has been removed"; # Added 2023-05-21 865 866 protobuf3_19 = throw "protobuf3_19 does not receive updates anymore and has been removed"; # Added 2023-10-01
+15 -11
pkgs/top-level/all-packages.nix
··· 1114 1114 inherit (darwin) cctools DarwinTools; 1115 1115 inherit (darwin.apple_sdk.frameworks) CoreServices; 1116 1116 antlr = antlr4_10; 1117 - boost = boost177; # Configure checks for specific version. 1118 1117 icu = icu69; 1119 1118 protobuf = protobuf_21; 1120 1119 }; ··· 3363 3362 authenticator = callPackage ../applications/misc/authenticator { }; 3364 3363 3365 3364 authelia = callPackage ../servers/authelia { }; 3365 + 3366 + authentik-outposts = recurseIntoAttrs (callPackages ../by-name/au/authentik/outposts.nix { }); 3366 3367 3367 3368 autoflake = with python3.pkgs; toPythonApplication autoflake; 3368 3369 ··· 18154 18155 18155 18156 publii = callPackage ../development/web/publii {}; 18156 18157 18157 - umr = callPackage ../development/misc/umr { 18158 - llvmPackages = llvmPackages_14; 18159 - }; 18158 + umr = callPackage ../development/misc/umr { }; 18160 18159 18161 18160 refurb = callPackage ../development/tools/refurb { }; 18162 18161 ··· 19547 19546 minify = callPackage ../development/web/minify { }; 19548 19547 19549 19548 minizinc = callPackage ../development/tools/minizinc { }; 19550 - minizincide = libsForQt5.callPackage ../development/tools/minizinc/ide.nix { }; 19549 + minizincide = qt6Packages.callPackage ../development/tools/minizinc/ide.nix { 19550 + inherit (darwin.apple_sdk_11_0.frameworks) Cocoa; 19551 + }; 19551 19552 19552 19553 mkcert = callPackage ../development/tools/misc/mkcert { }; 19553 19554 ··· 27100 27101 }; 27101 27102 prometheus-nut-exporter = callPackage ../servers/monitoring/prometheus/nut-exporter.nix { }; 27102 27103 prometheus-openldap-exporter = callPackage ../servers/monitoring/prometheus/openldap-exporter.nix { } ; 27103 - prometheus-openvpn-exporter = callPackage ../servers/monitoring/prometheus/openvpn-exporter.nix { }; 27104 27104 prometheus-pgbouncer-exporter = callPackage ../servers/monitoring/prometheus/pgbouncer-exporter.nix { }; 27105 27105 prometheus-php-fpm-exporter = callPackage ../servers/monitoring/prometheus/php-fpm-exporter.nix { }; 27106 27106 prometheus-pihole-exporter = callPackage ../servers/monitoring/prometheus/pihole-exporter.nix { }; ··· 31622 31622 }; 31623 31623 }; 31624 31624 }; 31625 - gnuradio3_8 = disable-warnings-if-gcc13 (callPackage ../applications/radio/gnuradio/wrapper.nix { 31626 - unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix { 31625 + gnuradio3_8 = callPackage ../applications/radio/gnuradio/wrapper.nix { 31626 + unwrapped = callPackage ../applications/radio/gnuradio/3.8.nix ({ 31627 31627 inherit (darwin.apple_sdk.frameworks) CoreAudio; 31628 31628 python = python3; 31629 - }; 31630 - }); 31629 + } // lib.optionalAttrs stdenv.isLinux { 31630 + stdenv = pkgs.stdenvAdapters.useLibsFrom stdenv pkgs.gcc12Stdenv; 31631 + }); 31632 + }; 31631 31633 gnuradio3_8Packages = lib.recurseIntoAttrs gnuradio3_8.pkgs; 31632 31634 # A build without gui components and other utilites not needed if gnuradio is 31633 31635 # used as a c++ library. ··· 35319 35321 35320 35322 printrun = callPackage ../applications/misc/printrun { }; 35321 35323 35322 - prusa-slicer = darwin.apple_sdk_11_0.callPackage ../applications/misc/prusa-slicer { }; 35324 + prusa-slicer = darwin.apple_sdk_11_0.callPackage ../applications/misc/prusa-slicer { 35325 + stdenv = if stdenv.isDarwin then overrideLibcxx darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv; 35326 + }; 35323 35327 35324 35328 super-slicer = darwin.apple_sdk_11_0.callPackage ../applications/misc/prusa-slicer/super-slicer.nix { }; 35325 35329
+2
pkgs/top-level/python-packages.nix
··· 3050 3050 3051 3051 django-crispy-bootstrap4 = callPackage ../development/python-modules/django-crispy-bootstrap4 { }; 3052 3052 3053 + django-crispy-bootstrap5 = callPackage ../development/python-modules/django-crispy-bootstrap5 { }; 3054 + 3053 3055 django-crispy-forms = callPackage ../development/python-modules/django-crispy-forms { }; 3054 3056 3055 3057 django-crontab = callPackage ../development/python-modules/django-crontab { };
+4
pkgs/top-level/qt6-packages.nix
··· 70 70 71 71 qscintilla = callPackage ../development/libraries/qscintilla { }; 72 72 73 + qwlroots = callPackage ../development/libraries/qwlroots { 74 + wlroots = pkgs.wlroots_0_17; 75 + }; 76 + 73 77 qxlsx = callPackage ../development/libraries/qxlsx { }; 74 78 75 79 qzxing = callPackage ../development/libraries/qzxing { };