Merge staging-next into staging

authored by github-actions[bot] and committed by GitHub 6884210d 17c6f710

+830 -355
+6
maintainers/maintainer-list.nix
··· 14228 14228 githubId = 1069318; 14229 14229 name = "Robin Lambertz"; 14230 14230 }; 14231 + robwalt = { 14232 + email = "robwalter96@gmail.com"; 14233 + github = "robwalt"; 14234 + githubId = 26892280; 14235 + name = "Robert Walter"; 14236 + }; 14231 14237 roconnor = { 14232 14238 email = "roconnor@theorem.ca"; 14233 14239 github = "roconnor";
+2
nixos/doc/manual/release-notes/rl-2311.section.md
··· 28 28 29 29 - [osquery](https://www.osquery.io/), a SQL powered operating system instrumentation, monitoring, and analytics. 30 30 31 + - [ebusd](https://ebusd.eu), a daemon for handling communication with eBUS devices connected to a 2-wire bus system (“energy bus” used by numerous heating systems). Available as [services.ebusd](#opt-services.ebusd.enable). 32 + 31 33 ## Backward Incompatibilities {#sec-release-23.11-incompatibilities} 32 34 33 35 - The `boot.loader.raspberryPi` options have been marked deprecated, with intent for removal for NixOS 24.11. They had a limited use-case, and do not work like people expect. They required either very old installs ([before mid-2019](https://github.com/NixOS/nixpkgs/pull/62462)) or customized builds out of scope of the standard and generic AArch64 support. That option set never supported the Raspberry Pi 4 family of devices.
+2
nixos/modules/module-list.nix
··· 536 536 ./services/hardware/usbrelayd.nix 537 537 ./services/hardware/vdr.nix 538 538 ./services/hardware/keyd.nix 539 + ./services/home-automation/ebusd.nix 539 540 ./services/home-automation/esphome.nix 540 541 ./services/home-automation/evcc.nix 541 542 ./services/home-automation/home-assistant.nix ··· 599 600 ./services/matrix/mjolnir.nix 600 601 ./services/matrix/mx-puppet-discord.nix 601 602 ./services/matrix/pantalaimon.nix 603 + ./services/matrix/matrix-sliding-sync.nix 602 604 ./services/matrix/synapse.nix 603 605 ./services/misc/airsonic.nix 604 606 ./services/misc/ananicy.nix
+270
nixos/modules/services/home-automation/ebusd.nix
··· 1 + { config, lib, pkgs, ... }: 2 + 3 + with lib; 4 + 5 + let 6 + cfg = config.services.ebusd; 7 + 8 + package = pkgs.ebusd; 9 + 10 + arguments = [ 11 + "${package}/bin/ebusd" 12 + "--foreground" 13 + "--updatecheck=off" 14 + "--device=${cfg.device}" 15 + "--port=${toString cfg.port}" 16 + "--configpath=${cfg.configpath}" 17 + "--scanconfig=${cfg.scanconfig}" 18 + "--log=main:${cfg.logs.main}" 19 + "--log=network:${cfg.logs.network}" 20 + "--log=bus:${cfg.logs.bus}" 21 + "--log=update:${cfg.logs.update}" 22 + "--log=other:${cfg.logs.other}" 23 + "--log=all:${cfg.logs.all}" 24 + ] ++ lib.optionals cfg.readonly [ 25 + "--readonly" 26 + ] ++ lib.optionals cfg.mqtt.enable [ 27 + "--mqtthost=${cfg.mqtt.host}" 28 + "--mqttport=${toString cfg.mqtt.port}" 29 + "--mqttuser=${cfg.mqtt.user}" 30 + "--mqttpass=${cfg.mqtt.password}" 31 + ] ++ lib.optionals cfg.mqtt.home-assistant [ 32 + "--mqttint=${package}/etc/ebusd/mqtt-hassio.cfg" 33 + "--mqttjson" 34 + ] ++ lib.optionals cfg.mqtt.retain [ 35 + "--mqttretain" 36 + ] ++ cfg.extraArguments; 37 + 38 + usesDev = hasPrefix "/" cfg.device; 39 + 40 + command = concatStringsSep " " arguments; 41 + 42 + in 43 + { 44 + meta.maintainers = with maintainers; [ nathan-gs ]; 45 + 46 + options.services.ebusd = { 47 + enable = mkEnableOption (lib.mdDoc "ebusd service"); 48 + 49 + device = mkOption { 50 + type = types.str; 51 + default = ""; 52 + example = "IP:PORT"; 53 + description = lib.mdDoc '' 54 + Use DEV as eBUS device [/dev/ttyUSB0]. 55 + This can be either: 56 + enh:DEVICE or enh:IP:PORT for enhanced device (only adapter v3 and newer), 57 + ens:DEVICE for enhanced high speed serial device (only adapter v3 and newer with firmware since 20220731), 58 + DEVICE for serial device (normal speed, for all other serial adapters like adapter v2 as well as adapter v3 in non-enhanced mode), or 59 + [udp:]IP:PORT for network device. 60 + https://github.com/john30/ebusd/wiki/2.-Run#device-options 61 + ''; 62 + }; 63 + 64 + port = mkOption { 65 + default = 8888; 66 + type = types.port; 67 + description = lib.mdDoc '' 68 + The port on which to listen on 69 + ''; 70 + }; 71 + 72 + readonly = mkOption { 73 + type = types.bool; 74 + default = false; 75 + description = lib.mdDoc '' 76 + Only read from device, never write to it 77 + ''; 78 + }; 79 + 80 + configpath = mkOption { 81 + type = types.str; 82 + default = "https://cfg.ebusd.eu/"; 83 + description = lib.mdDoc '' 84 + Read CSV config files from PATH (local folder or HTTPS URL) [https://cfg.ebusd.eu/] 85 + ''; 86 + }; 87 + 88 + scanconfig = mkOption { 89 + type = types.str; 90 + default = "full"; 91 + description = lib.mdDoc '' 92 + Pick CSV config files matching initial scan ("none" or empty for no initial scan message, "full" for full scan, or a single hex address to scan, default is to send a broadcast ident message). 93 + If combined with --checkconfig, you can add scan message data as arguments for checking a particular scan configuration, e.g. "FF08070400/0AB5454850303003277201". For further details on this option, 94 + see [Automatic configuration](https://github.com/john30/ebusd/wiki/4.7.-Automatic-configuration). 95 + ''; 96 + }; 97 + 98 + logs = { 99 + main = mkOption { 100 + type = types.enum [ "error" "notice" "info" "debug"]; 101 + default = "info"; 102 + description = lib.mdDoc '' 103 + Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice]. 104 + ''; 105 + }; 106 + 107 + network = mkOption { 108 + type = types.enum [ "error" "notice" "info" "debug"]; 109 + default = "info"; 110 + description = lib.mdDoc '' 111 + Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice]. 112 + ''; 113 + }; 114 + 115 + bus = mkOption { 116 + type = types.enum [ "error" "notice" "info" "debug"]; 117 + default = "info"; 118 + description = lib.mdDoc '' 119 + Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice]. 120 + ''; 121 + }; 122 + 123 + update = mkOption { 124 + type = types.enum [ "error" "notice" "info" "debug"]; 125 + default = "info"; 126 + description = lib.mdDoc '' 127 + Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice]. 128 + ''; 129 + }; 130 + 131 + other = mkOption { 132 + type = types.enum [ "error" "notice" "info" "debug"]; 133 + default = "info"; 134 + description = lib.mdDoc '' 135 + Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice]. 136 + ''; 137 + }; 138 + 139 + all = mkOption { 140 + type = types.enum [ "error" "notice" "info" "debug"]; 141 + default = "info"; 142 + description = lib.mdDoc '' 143 + Only write log for matching AREAs (main|network|bus|update|other|all) below or equal to LEVEL (error|notice|info|debug) [all:notice]. 144 + ''; 145 + }; 146 + }; 147 + 148 + mqtt = { 149 + 150 + enable = mkOption { 151 + type = types.bool; 152 + default = false; 153 + description = lib.mdDoc '' 154 + Adds support for MQTT 155 + ''; 156 + }; 157 + 158 + host = mkOption { 159 + type = types.str; 160 + default = "localhost"; 161 + description = lib.mdDoc '' 162 + Connect to MQTT broker on HOST. 163 + ''; 164 + }; 165 + 166 + port = mkOption { 167 + default = 1883; 168 + type = types.port; 169 + description = lib.mdDoc '' 170 + The port on which to connect to MQTT 171 + ''; 172 + }; 173 + 174 + home-assistant = mkOption { 175 + type = types.bool; 176 + default = false; 177 + description = lib.mdDoc '' 178 + Adds the Home Assistant topics to MQTT, read more at [MQTT Integration](https://github.com/john30/ebusd/wiki/MQTT-integration) 179 + ''; 180 + }; 181 + 182 + retain = mkOption { 183 + type = types.bool; 184 + default = false; 185 + description = lib.mdDoc '' 186 + Set the retain flag on all topics instead of only selected global ones 187 + ''; 188 + }; 189 + 190 + user = mkOption { 191 + type = types.str; 192 + description = lib.mdDoc '' 193 + The MQTT user to use 194 + ''; 195 + }; 196 + 197 + password = mkOption { 198 + type = types.str; 199 + description = lib.mdDoc '' 200 + The MQTT password. 201 + ''; 202 + }; 203 + 204 + }; 205 + 206 + extraArguments = mkOption { 207 + type = types.listOf types.str; 208 + default = []; 209 + description = lib.mdDoc '' 210 + Extra arguments to the ebus daemon 211 + ''; 212 + }; 213 + 214 + }; 215 + 216 + config = mkIf (cfg.enable) { 217 + 218 + systemd.services.ebusd = { 219 + description = "EBUSd Service"; 220 + wantedBy = [ "multi-user.target" ]; 221 + after = [ "network.target" ]; 222 + serviceConfig = { 223 + ExecStart = command; 224 + DynamicUser = true; 225 + Restart = "on-failure"; 226 + 227 + # Hardening 228 + CapabilityBoundingSet = ""; 229 + DeviceAllow = lib.optionals usesDev [ 230 + cfg.device 231 + ] ; 232 + DevicePolicy = "closed"; 233 + LockPersonality = true; 234 + MemoryDenyWriteExecute = false; 235 + NoNewPrivileges = true; 236 + PrivateDevices = usesDev; 237 + PrivateUsers = true; 238 + PrivateTmp = true; 239 + ProtectClock = true; 240 + ProtectControlGroups = true; 241 + ProtectHome = true; 242 + ProtectHostname = true; 243 + ProtectKernelLogs = true; 244 + ProtectKernelModules = true; 245 + ProtectKernelTunables = true; 246 + ProtectProc = "invisible"; 247 + ProcSubset = "pid"; 248 + ProtectSystem = "strict"; 249 + RemoveIPC = true; 250 + RestrictAddressFamilies = [ 251 + "AF_INET" 252 + "AF_INET6" 253 + ]; 254 + RestrictNamespaces = true; 255 + RestrictRealtime = true; 256 + RestrictSUIDSGID = true; 257 + SupplementaryGroups = [ 258 + "dialout" 259 + ]; 260 + SystemCallArchitectures = "native"; 261 + SystemCallFilter = [ 262 + "@system-service @pkey" 263 + "~@privileged @resources" 264 + ]; 265 + UMask = "0077"; 266 + }; 267 + }; 268 + 269 + }; 270 + }
+96
nixos/modules/services/matrix/matrix-sliding-sync.nix
··· 1 + { config, lib, pkgs, ... }: 2 + 3 + let 4 + cfg = config.services.matrix-synapse.sliding-sync; 5 + in 6 + { 7 + options.services.matrix-synapse.sliding-sync = { 8 + enable = lib.mkEnableOption (lib.mdDoc "sliding sync"); 9 + 10 + package = lib.mkPackageOption pkgs "matrix-sliding-sync" { }; 11 + 12 + settings = lib.mkOption { 13 + type = lib.types.submodule { 14 + freeformType = with lib.types; attrsOf str; 15 + options = { 16 + SYNCV3_SERVER = lib.mkOption { 17 + type = lib.types.str; 18 + description = lib.mdDoc '' 19 + The destination homeserver to talk to not including `/_matrix/` e.g `https://matrix.example.org`. 20 + ''; 21 + }; 22 + 23 + SYNCV3_DB = lib.mkOption { 24 + type = lib.types.str; 25 + default = "postgresql:///matrix-sliding-sync?host=/run/postgresql"; 26 + description = lib.mdDoc '' 27 + The postgres connection string. 28 + Refer to <https://www.postgresql.org/docs/current/libpq-connect.html#LIBPQ-CONNSTRING>. 29 + ''; 30 + }; 31 + 32 + SYNCV3_BINDADDR = lib.mkOption { 33 + type = lib.types.str; 34 + default = "127.0.0.1:8009"; 35 + example = "[::]:8008"; 36 + description = lib.mdDoc "The interface and port to listen on."; 37 + }; 38 + 39 + SYNCV3_LOG_LEVEL = lib.mkOption { 40 + type = lib.types.enum [ "trace" "debug" "info" "warn" "error" "fatal" ]; 41 + default = "info"; 42 + description = lib.mdDoc "The level of verbosity for messages logged."; 43 + }; 44 + }; 45 + }; 46 + default = { }; 47 + description = '' 48 + Freeform environment variables passed to the sliding sync proxy. 49 + Refer to <https://github.com/matrix-org/sliding-sync#setup> for all supported values. 50 + ''; 51 + }; 52 + 53 + createDatabase = lib.mkOption { 54 + type = lib.types.bool; 55 + default = true; 56 + description = lib.mdDoc '' 57 + Whether to enable and configure `services.postgres` to ensure that the database user `matrix-sliding-sync` 58 + and the database `matrix-sliding-sync` exist. 59 + ''; 60 + }; 61 + 62 + environmentFile = lib.mkOption { 63 + type = lib.types.str; 64 + description = lib.mdDoc '' 65 + Environment file as defined in {manpage}`systemd.exec(5)`. 66 + 67 + This must contain the {env}`SYNCV3_SECRET` variable which should 68 + be generated with {command}`openssl rand -hex 32`. 69 + ''; 70 + }; 71 + }; 72 + 73 + config = lib.mkIf cfg.enable { 74 + services.postgresql = lib.optionalAttrs cfg.createDatabase { 75 + enable = true; 76 + ensureDatabases = [ "matrix-sliding-sync" ]; 77 + ensureUsers = [ rec { 78 + name = "matrix-sliding-sync"; 79 + ensurePermissions."DATABASE \"${name}\"" = "ALL PRIVILEGES"; 80 + } ]; 81 + }; 82 + 83 + systemd.services.matrix-sliding-sync = { 84 + after = lib.optional cfg.createDatabase "postgresql.service"; 85 + wantedBy = [ "multi-user.target" ]; 86 + environment = cfg.settings; 87 + serviceConfig = { 88 + DynamicUser = true; 89 + EnvironmentFile = cfg.environmentFile; 90 + ExecStart = lib.getExe cfg.package; 91 + StateDirectory = "matrix-sliding-sync"; 92 + WorkingDirectory = "%S/matrix-sliding-sync"; 93 + }; 94 + }; 95 + }; 96 + }
+3 -1
nixos/modules/services/misc/gitea.nix
··· 439 439 lfs = mkIf cfg.lfs.enable { 440 440 PATH = cfg.lfs.contentDir; 441 441 }; 442 + 443 + packages.CHUNKED_UPLOAD_PATH = "${cfg.stateDir}/tmp/package-upload"; 442 444 }; 443 445 444 446 services.postgresql = optionalAttrs (usePostgresql && cfg.database.createDatabase) { ··· 575 577 ''; 576 578 577 579 serviceConfig = { 578 - Type = "simple"; 580 + Type = "notify"; 579 581 User = cfg.user; 580 582 Group = cfg.group; 581 583 WorkingDirectory = cfg.stateDir;
+1 -1
nixos/modules/services/monitoring/netdata.nix
··· 225 225 ExecStart = "${cfg.package}/bin/netdata -P /run/netdata/netdata.pid -D -c /etc/netdata/netdata.conf"; 226 226 ExecReload = "${pkgs.util-linux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID"; 227 227 ExecStartPost = pkgs.writeShellScript "wait-for-netdata-up" '' 228 - while [ "$(${pkgs.netdata}/bin/netdatacli ping)" != pong ]; do sleep 0.5; done 228 + while [ "$(${cfg.package}/bin/netdatacli ping)" != pong ]; do sleep 0.5; done 229 229 ''; 230 230 231 231 TimeoutStopSec = cfg.deadlineBeforeStopSec;
+5
nixos/modules/virtualisation/podman/default.nix
··· 206 206 207 207 systemd.user.sockets.podman.wantedBy = [ "sockets.target" ]; 208 208 209 + systemd.timers.podman-prune.timerConfig = lib.mkIf cfg.autoPrune.enable { 210 + Persistent = true; 211 + RandomizedDelaySec = 1800; 212 + }; 213 + 209 214 systemd.tmpfiles.packages = [ 210 215 # The /run/podman rule interferes with our podman group, so we remove 211 216 # it and let the systemd socket logic take care of it.
+1 -5
nixos/tests/gitea.nix
··· 121 121 client2.succeed(f"GIT_SSH_COMMAND='{GIT_SSH_COMMAND}' git clone {REPO}") 122 122 client2.succeed('test "$(cat repo/testfile | xargs echo -n)" = "hello world"') 123 123 124 - server.succeed( 124 + server.wait_until_succeeds( 125 125 'test "$(curl http://localhost:3000/api/v1/repos/test/repo/commits ' 126 126 + '-H "Accept: application/json" | jq length)" = "1"' 127 127 ) 128 - 129 - client1.shutdown() 130 - client2.shutdown() 131 - server.shutdown() 132 128 ''; 133 129 }); 134 130 in
+1
nixos/tests/installer.nix
··· 427 427 # The test cannot access the network, so any packages we 428 428 # need must be included in the VM. 429 429 system.extraDependencies = with pkgs; [ 430 + bintools 430 431 brotli 431 432 brotli.dev 432 433 brotli.lib
-207
pkgs/applications/audio/faust/faust1.nix
··· 1 - { lib, stdenv 2 - , coreutils 3 - , fetchurl 4 - , makeWrapper 5 - , pkg-config 6 - }: 7 - 8 - with lib.strings; 9 - 10 - let 11 - 12 - version = "0.9.90"; 13 - 14 - src = fetchurl { 15 - url = "mirror://sourceforge/project/faudiostream/faust-${version}.tgz"; 16 - sha256 = "0d1fqwymyfb73zkmpwv4zk4gsg4ji7qs20mfsr20skmnqx30xvna"; 17 - }; 18 - 19 - meta = with lib; { 20 - homepage = "https://faust.grame.fr/"; 21 - downloadPage = "https://sourceforge.net/projects/faudiostream/files/"; 22 - license = licenses.gpl2; 23 - platforms = platforms.linux; 24 - maintainers = with maintainers; [ magnetophon pmahoney ]; 25 - }; 26 - 27 - faust = stdenv.mkDerivation { 28 - pname = "faust"; 29 - inherit version; 30 - 31 - inherit src; 32 - 33 - nativeBuildInputs = [ makeWrapper ]; 34 - 35 - passthru = { 36 - inherit wrap wrapWithBuildEnv; 37 - }; 38 - 39 - preConfigure = '' 40 - makeFlags="$makeFlags prefix=$out" 41 - 42 - # The faust makefiles use 'system ?= $(shell uname -s)' but nix 43 - # defines 'system' env var, so undefine that so faust detects the 44 - # correct system. 45 - unset system 46 - ''; 47 - 48 - # Remove most faust2appl scripts since they won't run properly 49 - # without additional paths setup. See faust.wrap, 50 - # faust.wrapWithBuildEnv. 51 - postInstall = '' 52 - # syntax error when eval'd directly 53 - pattern="faust2!(*@(atomsnippets|graph|graphviewer|md|plot|sig|sigviewer|svg))" 54 - (shopt -s extglob; rm "$out"/bin/$pattern) 55 - ''; 56 - 57 - postFixup = '' 58 - # Set faustpath explicitly. 59 - substituteInPlace "$out"/bin/faustpath \ 60 - --replace "/usr/local /usr /opt /opt/local" "$out" 61 - 62 - # The 'faustoptflags' is 'source'd into other faust scripts and 63 - # not used as an executable, so patch 'uname' usage directly 64 - # rather than use makeWrapper. 65 - substituteInPlace "$out"/bin/faustoptflags \ 66 - --replace uname "${coreutils}/bin/uname" 67 - 68 - # wrapper for scripts that don't need faust.wrap* 69 - for script in "$out"/bin/faust2*; do 70 - wrapProgram "$script" \ 71 - --prefix PATH : "$out"/bin 72 - done 73 - ''; 74 - 75 - meta = meta // { 76 - description = "A functional programming language for realtime audio signal processing"; 77 - longDescription = '' 78 - FAUST (Functional Audio Stream) is a functional programming 79 - language specifically designed for real-time signal processing 80 - and synthesis. FAUST targets high-performance signal processing 81 - applications and audio plug-ins for a variety of platforms and 82 - standards. 83 - The Faust compiler translates DSP specifications into very 84 - efficient C++ code. Thanks to the notion of architecture, 85 - FAUST programs can be easily deployed on a large variety of 86 - audio platforms and plugin formats (jack, alsa, ladspa, maxmsp, 87 - puredata, csound, supercollider, pure, vst, coreaudio) without 88 - any change to the FAUST code. 89 - 90 - This package has just the compiler, libraries, and headers. 91 - Install faust2* for specific faust2appl scripts. 92 - ''; 93 - }; 94 - 95 - }; 96 - 97 - # Default values for faust2appl. 98 - faust2ApplBase = 99 - { baseName 100 - , dir ? "tools/faust2appls" 101 - , scripts ? [ baseName ] 102 - , ... 103 - }@args: 104 - 105 - args // { 106 - name = "${baseName}-${version}"; 107 - 108 - inherit src; 109 - 110 - dontBuild = true; 111 - 112 - installPhase = '' 113 - runHook preInstall 114 - 115 - mkdir -p "$out/bin" 116 - for script in ${concatStringsSep " " scripts}; do 117 - cp "${dir}/$script" "$out/bin/" 118 - done 119 - 120 - runHook postInstall 121 - ''; 122 - 123 - postInstall = '' 124 - # For the faust2appl script, change 'faustpath' and 125 - # 'faustoptflags' to absolute paths. 126 - for script in "$out"/bin/*; do 127 - substituteInPlace "$script" \ 128 - --replace ". faustpath" ". '${faust}/bin/faustpath'" \ 129 - --replace ". faustoptflags" ". '${faust}/bin/faustoptflags'" 130 - done 131 - ''; 132 - 133 - meta = meta // { 134 - description = "The ${baseName} script, part of faust functional programming language for realtime audio signal processing"; 135 - }; 136 - }; 137 - 138 - # Some 'faust2appl' scripts, such as faust2alsa, run faust to 139 - # generate cpp code, then invoke the c++ compiler to build the code. 140 - # This builder wraps these scripts in parts of the stdenv such that 141 - # when the scripts are called outside any nix build, they behave as 142 - # if they were running inside a nix build in terms of compilers and 143 - # paths being configured (e.g. rpath is set so that compiled 144 - # binaries link to the libs inside the nix store) 145 - # 146 - # The function takes two main args: the appl name (e.g. 147 - # 'faust2alsa') and an optional list of propagatedBuildInputs. It 148 - # returns a derivation that contains only the bin/${appl} script, 149 - # wrapped up so that it will run as if it was inside a nix build 150 - # with those build inputs. 151 - # 152 - # The build input 'faust' is automatically added to the 153 - # propagatedBuildInputs. 154 - wrapWithBuildEnv = 155 - { baseName 156 - , propagatedBuildInputs ? [ ] 157 - , ... 158 - }@args: 159 - 160 - stdenv.mkDerivation ((faust2ApplBase args) // { 161 - 162 - nativeBuildInputs = [ pkg-config makeWrapper ]; 163 - 164 - propagatedBuildInputs = [ faust ] ++ propagatedBuildInputs; 165 - 166 - postFixup = '' 167 - 168 - # export parts of the build environment 169 - for script in "$out"/bin/*; do 170 - wrapProgram "$script" \ 171 - --set FAUSTLIB "${faust}/lib/faust" \ 172 - --set FAUSTINC "${faust}/include/faust" \ 173 - --prefix PATH : "$PATH" \ 174 - --prefix PKG_CONFIG_PATH : "$PKG_CONFIG_PATH" \ 175 - --set NIX_CFLAGS_COMPILE "$NIX_CFLAGS_COMPILE" \ 176 - --set NIX_LDFLAGS "$NIX_LDFLAGS" 177 - done 178 - ''; 179 - }); 180 - 181 - # Builder for 'faust2appl' scripts, such as faust2firefox that 182 - # simply need to be wrapped with some dependencies on PATH. 183 - # 184 - # The build input 'faust' is automatically added to the PATH. 185 - wrap = 186 - { baseName 187 - , runtimeInputs ? [ ] 188 - , ... 189 - }@args: 190 - 191 - let 192 - 193 - runtimePath = concatStringsSep ":" (map (p: "${p}/bin") ([ faust ] ++ runtimeInputs)); 194 - 195 - in stdenv.mkDerivation ((faust2ApplBase args) // { 196 - 197 - nativeBuildInputs = [ makeWrapper ]; 198 - 199 - postFixup = '' 200 - for script in "$out"/bin/*; do 201 - wrapProgram "$script" --prefix PATH : "${runtimePath}" 202 - done 203 - ''; 204 - 205 - }); 206 - 207 - in faust
+18 -17
pkgs/applications/editors/jetbrains/default.nix
··· 97 97 }; 98 98 }); 99 99 100 - buildDataSpell = { pname, version, src, license, description, wmClass, buildNumber, ... }: 101 - (mkJetBrainsProduct { 102 - inherit pname version src wmClass jdk buildNumber; 103 - product = "DataSpell"; 104 - meta = with lib; { 105 - homepage = "https://www.jetbrains.com/dataspell/"; 106 - inherit description license platforms; 107 - longDescription = '' 108 - DataSpell is a new IDE from JetBrains built for Data Scientists. 109 - Mainly it integrates Jupyter notebooks in the IntelliJ platform. 110 - ''; 111 - maintainers = with maintainers; [ leona ]; 112 - }; 113 - }); 100 + buildDataSpell = { pname, version, src, license, description, wmClass, buildNumber, ... }: 101 + (mkJetBrainsProduct { 102 + inherit pname version src wmClass jdk buildNumber; 103 + product = "DataSpell"; 104 + meta = with lib; { 105 + homepage = "https://www.jetbrains.com/dataspell/"; 106 + inherit description license platforms; 107 + longDescription = '' 108 + DataSpell is a new IDE from JetBrains built for Data Scientists. 109 + Mainly it integrates Jupyter notebooks in the IntelliJ platform. 110 + ''; 111 + maintainers = with maintainers; [ leona ]; 112 + }; 113 + }); 114 114 115 115 buildGateway = { pname, version, src, license, description, wmClass, buildNumber, product, ... }: 116 116 (mkJetBrainsProduct { ··· 132 132 (mkJetBrainsProduct { 133 133 inherit pname version src wmClass jdk buildNumber; 134 134 product = "Goland"; 135 + extraWrapperArgs = [ 136 + # fortify source breaks build since delve compiles with -O0 137 + ''--prefix CGO_CPPFLAGS " " "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0"'' 138 + ]; 135 139 meta = with lib; { 136 140 homepage = "https://www.jetbrains.com/go/"; 137 141 inherit description license platforms; ··· 148 152 interp="$(cat $NIX_CC/nix-support/dynamic-linker)" 149 153 patchelf --set-interpreter $interp $out/goland/plugins/go-plugin/lib/dlv/linux/dlv 150 154 chmod +x $out/goland/plugins/go-plugin/lib/dlv/linux/dlv 151 - # fortify source breaks build since delve compiles with -O0 152 - wrapProgram $out/bin/goland \ 153 - --prefix CGO_CPPFLAGS " " "-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0" 154 155 ''; 155 156 }); 156 157
+6 -10
pkgs/applications/editors/jetbrains/plugins/default.nix
··· 68 68 # Only use if you know what youre doing 69 69 raw = { inherit files byId byName; }; 70 70 71 + tests = callPackage ./tests.nix {}; 72 + 71 73 addPlugins = ide: unprocessedPlugins: 72 74 let 73 75 ··· 98 100 let 99 101 pluginCmdsLines = map (plugin: "ln -s ${plugin} \"$out\"/${meta.mainProgram}/plugins/${baseNameOf plugin}") plugins; 100 102 pluginCmds = builtins.concatStringsSep "\n" pluginCmdsLines; 101 - extraBuildPhase = rec { 102 - clion = '' 103 - sed "s|${ide}|$out|" -i $out/bin/.clion-wrapped 104 - ''; 105 - goland = '' 106 - sed "s|${ide}|$out|" -i $out/bin/.goland-wrapped 107 - ''; 108 - }; 109 103 in 110 104 '' 111 105 cp -r ${ide} $out ··· 115 109 do 116 110 ln -s "$plugin" -t $out/${meta.mainProgram}/plugins/ 117 111 done 118 - sed "s|${ide.outPath}|$out|" -i $out/bin/${meta.mainProgram} 112 + sed "s|${ide.outPath}|$out|" \ 113 + -i $(realpath $out/bin/${meta.mainProgram}) \ 114 + -i $(realpath $out/bin/${meta.mainProgram}-remote-dev-server) 119 115 autoPatchelf $out/${meta.mainProgram}/bin 120 - '' + (extraBuildPhase."${ide.meta.mainProgram}" or ""); 116 + ''; 121 117 }; 122 118 }
+29
pkgs/applications/editors/jetbrains/plugins/plugins.json
··· 244 244 }, 245 245 "name": "csv-editor" 246 246 }, 247 + "12062": { 248 + "compatible": [ 249 + "clion", 250 + "datagrip", 251 + "goland", 252 + "idea-community", 253 + "idea-ultimate", 254 + "mps", 255 + "phpstorm", 256 + "pycharm-community", 257 + "pycharm-professional", 258 + "rider", 259 + "ruby-mine", 260 + "webstorm" 261 + ], 262 + "builds": { 263 + "223.8836.1185": "https://plugins.jetbrains.com/files/12062/256327/keymap-vscode-223.7571.113.zip", 264 + "231.9011.35": "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip", 265 + "231.9225.12": "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip", 266 + "231.9225.15": "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip", 267 + "231.9225.16": "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip", 268 + "231.9225.18": "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip", 269 + "231.9225.21": "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip", 270 + "231.9225.23": "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip" 271 + }, 272 + "name": "vscode-keymap" 273 + }, 247 274 "12559": { 248 275 "compatible": [ 249 276 "clion", ··· 383 410 "files": { 384 411 "https://plugins.jetbrains.com/files/10037/358810/CSVEditor-3.2.1-231.zip": "sha256-JC/NOICLHf1gc4wTarDPw7lYfGHOkCOlG194yt18xOA=", 385 412 "https://plugins.jetbrains.com/files/10037/358812/CSVEditor-3.2.1-223.zip": "sha256-l8xq7XXQheZYcP+kdnLXAO7FhfPJYwIh+ZffbttBI9s=", 413 + "https://plugins.jetbrains.com/files/12062/256327/keymap-vscode-223.7571.113.zip": "sha256-MlWTPLA6517inAtiOdJDUeUMyHczXzeUIe4dfASLzsM=", 414 + "https://plugins.jetbrains.com/files/12062/307834/keymap-vscode-231.8109.91.zip": "sha256-OqK3HmcksgNlrADv7Ld91VCW+uzTOVWtcXcRC60IKfw=", 386 415 "https://plugins.jetbrains.com/files/12559/257029/keymap-eclipse-223.7571.125.zip": "sha256-0hMn8Qt+xJjB9HnYz7OMw8xmI0FxDFy+lYfXHURhTKY=", 387 416 "https://plugins.jetbrains.com/files/12559/307825/keymap-eclipse-231.8109.91.zip": "sha256-8jUsRK4evNMzjuWQIjIMrvQ0sIXPoY1C/buu1nod5X8=", 388 417 "https://plugins.jetbrains.com/files/13017/257030/keymap-visualStudio-223.7571.125.zip": "sha256-YiJALivO1a+I4bCtZEv68PZ21Vydk5UW6gAgErj28DQ=",
+26
pkgs/applications/editors/jetbrains/plugins/tests.nix
··· 1 + { jetbrains, writeText }: 2 + 3 + { 4 + # Check to see if the process for adding plugins is breaking anything, instead of the plugins themselves 5 + default = 6 + let 7 + modify-ide = ide: jetbrains.plugins.addPlugins ide [ ]; 8 + ides = with jetbrains; map modify-ide [ 9 + clion 10 + datagrip 11 + dataspell 12 + goland 13 + idea-community 14 + idea-ultimate 15 + mps 16 + phpstorm 17 + pycharm-community 18 + pycharm-professional 19 + rider 20 + ruby-mine 21 + webstorm 22 + ]; 23 + paths = builtins.concatStringsSep " " ides; 24 + in 25 + writeText "jb-ides" paths; 26 + }
+14 -14
pkgs/applications/networking/cluster/terraform-providers/providers.json
··· 110 110 "vendorHash": null 111 111 }, 112 112 "aws": { 113 - "hash": "sha256-VDet4IGyd0RXCzlQ+s08QwX9eby5oYfwq2eVRfSS9ME=", 113 + "hash": "sha256-6/KnfV4Gti79nh9Cpic1swfOjDkxRK1Zx57DLqTj/nE=", 114 114 "homepage": "https://registry.terraform.io/providers/hashicorp/aws", 115 115 "owner": "hashicorp", 116 116 "repo": "terraform-provider-aws", 117 - "rev": "v5.8.0", 117 + "rev": "v5.9.0", 118 118 "spdx": "MPL-2.0", 119 - "vendorHash": "sha256-oNPWz/0jcSL0FYuIW9wnj8Jp94vm9dJdiC9gfhtbQiU=" 119 + "vendorHash": "sha256-uBfZLiKLv60WoN+DXf6U62XnHxYt/jx2DRcWP58B6GA=" 120 120 }, 121 121 "azuread": { 122 122 "hash": "sha256-6LSvqMi79HW1GdEG0lSVwLF2nWft/JnKyj9EQO4pMW4=", ··· 128 128 "vendorHash": null 129 129 }, 130 130 "azurerm": { 131 - "hash": "sha256-4cJal4GrL8OwoFNMjN0AKlicq2mC0ba3N8bYISMaY3A=", 131 + "hash": "sha256-7irC2P8Sev0lqUbJrHi6MjZGQ1ag0BDiQ84iEBVoDss=", 132 132 "homepage": "https://registry.terraform.io/providers/hashicorp/azurerm", 133 133 "owner": "hashicorp", 134 134 "repo": "terraform-provider-azurerm", 135 - "rev": "v3.65.0", 135 + "rev": "v3.66.0", 136 136 "spdx": "MPL-2.0", 137 137 "vendorHash": null 138 138 }, ··· 282 282 "vendorHash": "sha256-ZCMSmOCPEMxCSpl3DjIUGPj1W/KNJgyjtHpmQ19JquA=" 283 283 }, 284 284 "datadog": { 285 - "hash": "sha256-2ahiJ4YL0BmrDwc9f9fp/ppStb51bZlzpwEfuTAlgko=", 285 + "hash": "sha256-sytQJgrfgtJ761mGo0KUTxAukqvmPYyLM8+vsYGtoZc=", 286 286 "homepage": "https://registry.terraform.io/providers/DataDog/datadog", 287 287 "owner": "DataDog", 288 288 "repo": "terraform-provider-datadog", 289 - "rev": "v3.27.0", 289 + "rev": "v3.28.0", 290 290 "spdx": "MPL-2.0", 291 - "vendorHash": "sha256-yAOWcs+rFjjp21Xq1Ch/sE/6N0BSpOC167mxIOmR9nk=" 291 + "vendorHash": "sha256-foS7GyRUdhF/M8uTPf2I4WQo7qEg4Z/3FXjagoeSRkU=" 292 292 }, 293 293 "dhall": { 294 294 "hash": "sha256-K0j90YAzYqdyJD4aofyxAJF9QBYNMbhSVm/s1GvWuJ4=", ··· 971 971 "vendorHash": null 972 972 }, 973 973 "scaleway": { 974 - "hash": "sha256-W1s4SCxpPsZH31KOExoGX1h5y8twaJQ6qKPiRXUkTZk=", 974 + "hash": "sha256-NFBDqRVlSzEHTptAWg3OnK5zYm6JnvuzZnfh8mTtl2Q=", 975 975 "homepage": "https://registry.terraform.io/providers/scaleway/scaleway", 976 976 "owner": "scaleway", 977 977 "repo": "terraform-provider-scaleway", 978 - "rev": "v2.25.0", 978 + "rev": "v2.25.1", 979 979 "spdx": "MPL-2.0", 980 - "vendorHash": "sha256-wwm0edsOwsuCiURFI2Y2Jue0FD+4pAzyDxqSVJYkQYE=" 980 + "vendorHash": "sha256-rgM+TkygUIUXbw+QNsZOr003A/42iC52Zybw2zBJ15U=" 981 981 }, 982 982 "secret": { 983 983 "hash": "sha256-MmAnA/4SAPqLY/gYcJSTnEttQTsDd2kEdkQjQj6Bb+A=", ··· 1198 1198 "vendorHash": "sha256-xd2tsJ5k/8PCSegHqeyJ1ePFBS0ho8SD+4m4QyFMTL0=" 1199 1199 }, 1200 1200 "vcd": { 1201 - "hash": "sha256-AiVmxqktBgvXbMl6jA5sMa86sEAvxD1LjVuxdwdBJvU=", 1201 + "hash": "sha256-ltdkB9PqmuCs5daRjcThVhy1wIoDW21yBiwtRo/pMss=", 1202 1202 "homepage": "https://registry.terraform.io/providers/vmware/vcd", 1203 1203 "owner": "vmware", 1204 1204 "repo": "terraform-provider-vcd", 1205 - "rev": "v3.9.0", 1205 + "rev": "v3.10.0", 1206 1206 "spdx": "MPL-2.0", 1207 - "vendorHash": "sha256-dYFLohH/gU+cAiaLLNluxAjfj7giqnk+zQKGVSR1Kws=" 1207 + "vendorHash": "sha256-p/wTnEr/+qe8S83x6EtfsnIMVUF1VWZVHOq0vLDbh60=" 1208 1208 }, 1209 1209 "venafi": { 1210 1210 "hash": "sha256-/5X/+BilaYwi1Vce7mIvVeHjTpVX/OuYquZ+2BGfxrs=",
+3 -3
pkgs/applications/networking/irc/thelounge/default.nix
··· 16 16 17 17 stdenv.mkDerivation (finalAttrs: { 18 18 pname = "thelounge"; 19 - version = "4.4.0"; 19 + version = "4.4.1"; 20 20 21 21 src = fetchFromGitHub { 22 22 owner = "thelounge"; 23 23 repo = "thelounge"; 24 24 rev = "v${finalAttrs.version}"; 25 - hash = "sha256-2MHq71lKkFe1uHEENgUiYsO99bPyLmEZZIdcdgsZfSM="; 25 + hash = "sha256-4FdNYP9VLgv/rfvT7KHCF+ABFsZvPbJjfz6IvvDkRNA="; 26 26 }; 27 27 28 28 # Allow setting package path for the NixOS module. ··· 35 35 36 36 offlineCache = fetchYarnDeps { 37 37 yarnLock = "${finalAttrs.src}/yarn.lock"; 38 - hash = "sha256-OKLsNGl94EDyLgP2X2tiwihgRQFXGvf5XgXwgX+JEpk="; 38 + hash = "sha256-MM6SgVT7Pjdu96A4eWRucEzT7uNPxBqUDgHKl8mH2C0="; 39 39 }; 40 40 41 41 nativeBuildInputs = [ nodejs yarn fixup_yarn_lock python3 npmHooks.npmInstallHook ] ++ lib.optional stdenv.isDarwin darwin.cctools;
+4 -2
pkgs/applications/networking/mkchromecast/default.nix
··· 13 13 , opusTools 14 14 , gst_all_1 15 15 , enableSonos ? true 16 + , qtwayland 16 17 }: 17 18 let packages = [ 18 19 vorbis-tools ··· 27 28 ] ++ lib.optionals stdenv.isLinux [ pulseaudio ]; 28 29 29 30 in 30 - python3Packages.buildPythonApplication rec { 31 + python3Packages.buildPythonApplication { 31 32 pname = "mkchromecast-unstable"; 32 33 version = "2022-10-31"; 33 34 34 - src = fetchFromGitHub rec { 35 + src = fetchFromGitHub { 35 36 owner = "muammar"; 36 37 repo = "mkchromecast"; 37 38 rev = "0de9fd78c4122dec4f184aeae2564790b45fe6dc"; 38 39 sha256 = "sha256-dxsIcBPrZaXlsfzOEXhYj2qoK5LRducJG2ggMrMMl9Y="; 39 40 }; 40 41 42 + buildInputs = lib.optional stdenv.isLinux qtwayland; 41 43 propagatedBuildInputs = with python3Packages; ([ 42 44 pychromecast 43 45 psutil
+42
pkgs/applications/version-management/codeberg-cli/default.nix
··· 1 + { lib 2 + , CoreServices 3 + , Security 4 + , fetchFromGitea 5 + , installShellFiles 6 + , openssl 7 + , pkg-config 8 + , rustPlatform 9 + , stdenv 10 + }: 11 + rustPlatform.buildRustPackage rec { 12 + pname = "codeberg-cli"; 13 + version = "0.3.5"; 14 + 15 + src = fetchFromGitea { 16 + domain = "codeberg.org"; 17 + owner = "RobWalt"; 18 + repo = "codeberg-cli"; 19 + rev = "v${version}"; 20 + hash = "sha256-KjH78yqfZoN24TBYyFZuxf7z9poRov0uFYQ8+eq9p/o="; 21 + }; 22 + 23 + cargoHash = "sha256-RE4Zwa5vUWPc42w5GaaYkS6fLIbges1fAsOUuwqR2ag="; 24 + nativeBuildInputs = [ pkg-config installShellFiles ]; 25 + 26 + buildInputs = [ openssl ] 27 + ++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; 28 + 29 + postInstall = '' 30 + installShellCompletion --cmd berg \ 31 + --bash <($out/bin/berg completion bash) \ 32 + --fish <($out/bin/berg completion fish) \ 33 + --zsh <($out/bin/berg completion zsh) 34 + ''; 35 + 36 + meta = with lib; { 37 + description = "CLI Tool for Codeberg similar to gh and glab"; 38 + homepage = "https://codeberg.org/RobWalt/codeberg-cli"; 39 + license = with licenses; [ agpl3Plus ]; 40 + maintainers = with maintainers; [ robwalt ]; 41 + }; 42 + }
+2 -2
pkgs/applications/version-management/gitea/default.nix
··· 20 20 21 21 buildGoModule rec { 22 22 pname = "gitea"; 23 - version = "1.19.4"; 23 + version = "1.20.0"; 24 24 25 25 # not fetching directly from the git repo, because that lacks several vendor files for the web UI 26 26 src = fetchurl { 27 27 url = "https://dl.gitea.com/gitea/${version}/gitea-src-${version}.tar.gz"; 28 - hash = "sha256-vNMNEKMpUoVLUGwPPVhLKfElFmjCWgZHY5i1liNs+xk="; 28 + hash = "sha256-ME2ZYSeaHru/7wBFBmXLpf9dKpl0WrtrmAqmzw37tq4="; 29 29 }; 30 30 31 31 vendorHash = null;
+3 -3
pkgs/development/compilers/gleam/default.nix
··· 2 2 3 3 rustPlatform.buildRustPackage rec { 4 4 pname = "gleam"; 5 - version = "0.30.1"; 5 + version = "0.30.2"; 6 6 7 7 src = fetchFromGitHub { 8 8 owner = "gleam-lang"; 9 9 repo = pname; 10 10 rev = "refs/tags/v${version}"; 11 - hash = "sha256-x/Wb65UIVzuIBwbJmTNVpCzNBu/0bIDL5UD98Bo8n4Q="; 11 + hash = "sha256-XrXN+HZlCPzywFo10/vLHbz/zjglSZnNQKfYvLvx35I="; 12 12 }; 13 13 14 14 nativeBuildInputs = [ git pkg-config ]; ··· 16 16 buildInputs = [ openssl ] ++ 17 17 lib.optionals stdenv.isDarwin [ Security libiconv ]; 18 18 19 - cargoHash = "sha256-IKCrIATDALS4Bvl26dzVlHtj90U+XR3n7+Lu772sy1I="; 19 + cargoHash = "sha256-K7MrrnupH1BS8KEIgVdlnGF91J5ND5umgdeLVCg7DbQ="; 20 20 21 21 meta = with lib; { 22 22 description = "A statically typed language for the Erlang VM";
+2 -2
pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix
··· 4 4 let source = 5 5 if lib.versionAtLeast ocaml.version "4.13" 6 6 then { 7 - version = "0.21.0"; 8 - sha256 = "sha256-KhgX9rxYH/DM6fCqloe4l7AnJuKrdXSe6Y1XY3BXMy0="; 7 + version = "0.26.0"; 8 + sha256 = "sha256-AxSUq3cM7xCo9qocvrVmDkbDqmwM1FexEP7IWadeh30="; 9 9 } else { 10 10 version = "0.20.0"; 11 11 sha256 = "sha256-JtmNCgwjbCyUE4bWqdH5Nc2YSit+rekwS43DcviIfgk=";
+2 -2
pkgs/development/python-modules/bleak-retry-connector/default.nix
··· 13 13 14 14 buildPythonPackage rec { 15 15 pname = "bleak-retry-connector"; 16 - version = "3.0.2"; 16 + version = "3.1.0"; 17 17 format = "pyproject"; 18 18 19 19 disabled = pythonOlder "3.7"; ··· 22 22 owner = "Bluetooth-Devices"; 23 23 repo = pname; 24 24 rev = "refs/tags/v${version}"; 25 - hash = "sha256-mJQ3Y6o6HAqnktsPVuD9ebGgJo0BjSnlDTyqTpNPb1M="; 25 + hash = "sha256-hFtk25ia3ZupqAWp9ODLYGMClKLPU9UrSfYFXRX4rJE="; 26 26 }; 27 27 28 28 postPatch = ''
+2 -2
pkgs/development/python-modules/bluetooth-adapters/default.nix
··· 17 17 18 18 buildPythonPackage rec { 19 19 pname = "bluetooth-adapters"; 20 - version = "0.15.4"; 20 + version = "0.16.0"; 21 21 format = "pyproject"; 22 22 23 23 disabled = pythonOlder "3.9"; ··· 26 26 owner = "Bluetooth-Devices"; 27 27 repo = pname; 28 28 rev = "refs/tags/v${version}"; 29 - hash = "sha256-H8QkOs+QPN9jB/g4f3OaGlX/F2SO2hIDptoPB47ogqA="; 29 + hash = "sha256-gbnsTRiT/4YumyaJ1h4VRzDAf8/oSkD3yL9mdACvWWk="; 30 30 }; 31 31 32 32 postPatch = ''
+2 -2
pkgs/development/python-modules/bluetooth-data-tools/default.nix
··· 9 9 10 10 buildPythonPackage rec { 11 11 pname = "bluetooth-data-tools"; 12 - version = "1.3.0"; 12 + version = "1.6.0"; 13 13 format = "pyproject"; 14 14 15 15 disabled = pythonOlder "3.9"; ··· 18 18 owner = "Bluetooth-Devices"; 19 19 repo = pname; 20 20 rev = "refs/tags/v${version}"; 21 - hash = "sha256-uN3N8/RzZyMp+ljgGYqBLUperNYOnbOPTWjlDlos5QE="; 21 + hash = "sha256-Doz8T7XuX/8JFu1yutTUxrtvasDLWD3Fp/+JMLEUIQM="; 22 22 }; 23 23 24 24 nativeBuildInputs = [
+2 -3
pkgs/development/python-modules/bravado-core/default.nix
··· 1 1 { lib 2 - , stdenv 3 2 , buildPythonPackage 4 3 , fetchFromGitHub 5 4 , pythonOlder ··· 21 20 22 21 buildPythonPackage rec { 23 22 pname = "bravado-core"; 24 - version = "5.17.1"; 23 + version = "6.1.0"; 25 24 format = "setuptools"; 26 25 27 26 disabled = pythonOlder "3.7"; ··· 30 29 owner = "Yelp"; 31 30 repo = pname; 32 31 rev = "v${version}"; 33 - hash = "sha256-7LnKNR1/YIzw2iIPYXAuoC6G7fdm4D3frkSl/wJhYG4="; 32 + hash = "sha256-/ePs3znbwamMHHzb/PD4UHq+7v0j1r1X3J3Bnb4S2VU="; 34 33 }; 35 34 36 35 propagatedBuildInputs = [
+8 -3
pkgs/development/python-modules/crytic-compile/default.nix
··· 5 5 , pycryptodome 6 6 , pythonOlder 7 7 , setuptools 8 + , solc-select 8 9 }: 9 10 10 11 buildPythonPackage rec { 11 12 pname = "crytic-compile"; 12 - version = "0.3.0"; 13 + version = "0.3.3"; 13 14 format = "setuptools"; 14 15 15 16 disabled = pythonOlder "3.6"; ··· 18 19 owner = "crytic"; 19 20 repo = "crytic-compile"; 20 21 rev = "refs/tags/${version}"; 21 - hash = "sha256-4iTvtu2TmxvLTyWm4PV0+yV1fRLYpJHZNBgjy1MFLjM="; 22 + hash = "sha256-Nx3eKy/0BLg82o3qDHjxcHXtpX3KDdnBKYwCuTLWRUE="; 22 23 }; 23 24 24 25 propagatedBuildInputs = [ 25 26 cbor2 26 27 pycryptodome 27 28 setuptools 29 + solc-select 28 30 ]; 29 31 30 32 # Test require network access 31 33 doCheck = false; 32 34 35 + # required for import check to work 36 + # PermissionError: [Errno 13] Permission denied: '/homeless-shelter' 37 + env.HOME = "/tmp"; 33 38 pythonImportsCheck = [ 34 39 "crytic_compile" 35 40 ]; ··· 39 44 homepage = "https://github.com/crytic/crytic-compile"; 40 45 changelog = "https://github.com/crytic/crytic-compile/releases/tag/${version}"; 41 46 license = licenses.agpl3Plus; 42 - maintainers = with maintainers; [ SuperSandro2000 arturcygan ]; 47 + maintainers = with maintainers; [ arturcygan hellwolf ]; 43 48 }; 44 49 }
+2
pkgs/development/python-modules/dissect-cobaltstrike/default.nix
··· 64 64 ]; 65 65 }; 66 66 67 + __darwinAllowLocalNetworking = true; 68 + 67 69 nativeCheckInputs = [ 68 70 pytest-httpserver 69 71 pytestCheckHook
+2 -2
pkgs/development/python-modules/google-cloud-bigquery/default.nix
··· 28 28 29 29 buildPythonPackage rec { 30 30 pname = "google-cloud-bigquery"; 31 - version = "3.11.3"; 31 + version = "3.11.4"; 32 32 format = "setuptools"; 33 33 34 34 disabled = pythonOlder "3.7"; 35 35 36 36 src = fetchPypi { 37 37 inherit pname version; 38 - hash = "sha256-1Fhb6edsmE7IPvKQ6+/xdWLSyfL0+E0wFdm3sntJmp0="; 38 + hash = "sha256-aX3xFyQaIoO8u5OyHhC63BTlHJqQgA0qfho+HH2EKXQ="; 39 39 }; 40 40 41 41 propagatedBuildInputs = [
+2 -2
pkgs/development/python-modules/google-cloud-container/default.nix
··· 13 13 14 14 buildPythonPackage rec { 15 15 pname = "google-cloud-container"; 16 - version = "2.26.0"; 16 + version = "2.27.0"; 17 17 format = "setuptools"; 18 18 19 19 disabled = pythonOlder "3.7"; 20 20 21 21 src = fetchPypi { 22 22 inherit pname version; 23 - hash = "sha256-fUqX5n/tQ7BgtIo3/1jyOGvkIUiVltbfLpzwIZ0YJ0M="; 23 + hash = "sha256-d5XR09tdeJ/x5SRtExplDUWsbFXBtzcTQ4pbWhmjkvk="; 24 24 }; 25 25 26 26 propagatedBuildInputs = [
+4 -4
pkgs/development/python-modules/identify/default.nix
··· 9 9 10 10 buildPythonPackage rec { 11 11 pname = "identify"; 12 - version = "2.5.24"; 12 + version = "2.5.25"; 13 13 format = "setuptools"; 14 14 15 - disabled = pythonOlder "3.7"; 15 + disabled = pythonOlder "3.8"; 16 16 17 17 src = fetchFromGitHub { 18 18 owner = "pre-commit"; 19 19 repo = pname; 20 - rev = "v${version}"; 21 - hash = "sha256-L73M+lWonuT7sSk+piBkZZJtxxeBvZ1XUXUypvS65G0="; 20 + rev = "refs/tags/v${version}"; 21 + hash = "sha256-kqeqo0qWE9O9Q57Ef/0zTSGR04ubYibFFs6FzP9UQys="; 22 22 }; 23 23 24 24 nativeCheckInputs = [
+3 -3
pkgs/development/python-modules/msoffcrypto-tool/default.nix
··· 11 11 12 12 buildPythonPackage rec { 13 13 pname = "msoffcrypto-tool"; 14 - version = "5.0.1"; 14 + version = "5.1.1"; 15 15 format = "pyproject"; 16 16 17 - disabled = pythonOlder "3.7"; 17 + disabled = pythonOlder "3.8"; 18 18 19 19 src = fetchFromGitHub { 20 20 owner = "nolze"; 21 21 repo = pname; 22 22 rev = "refs/tags/v${version}"; 23 - hash = "sha256-OrGgY+CEhAHGOOIPYK8OijRdoh0PRelnsKB++ksUIXY="; 23 + hash = "sha256-A1TeTE4TMHAb+KtFxTi+b4yTfuEFya8iyzy92dzQ0Z4="; 24 24 }; 25 25 26 26 nativeBuildInputs = [
+2 -2
pkgs/development/python-modules/pynisher/default.nix
··· 8 8 9 9 buildPythonPackage rec { 10 10 pname = "pynisher"; 11 - version = "1.0.5"; 11 + version = "1.0.7"; 12 12 format = "setuptools"; 13 13 14 14 disabled = pythonOlder "3.7"; 15 15 16 16 src = fetchPypi { 17 17 inherit pname version; 18 - hash = "sha256-usSowgCwGTATiX1dbPpScO9/FI+E567dvGZxAC+zS14="; 18 + hash = "sha256-cqgRoV3AJn96zAJDGbRJ5e3xOTuujmBu8HwZi2RQ6GY="; 19 19 }; 20 20 21 21 propagatedBuildInputs = [
+5 -3
pkgs/development/python-modules/slither-analyzer/default.nix
··· 9 9 , pythonOlder 10 10 , setuptools 11 11 , solc 12 + , web3 12 13 , withSolc ? false 13 14 }: 14 15 15 16 buildPythonPackage rec { 16 17 pname = "slither-analyzer"; 17 - version = "0.9.2"; 18 + version = "0.9.6"; 18 19 format = "setuptools"; 19 20 20 21 disabled = pythonOlder "3.8"; ··· 23 24 owner = "crytic"; 24 25 repo = "slither"; 25 26 rev = "refs/tags/${version}"; 26 - hash = "sha256-Co3BFdLmSIMqlZVEPJHYH/Cf7oKYSZ+Ktbnd5RZGmfE="; 27 + hash = "sha256-c6H7t+aPPWn1i/30G9DLOmwHhdHHHbcP3FRVVjk1XR4="; 27 28 }; 28 29 29 30 nativeBuildInputs = [ ··· 35 36 packaging 36 37 prettytable 37 38 setuptools 39 + web3 38 40 ]; 39 41 40 42 postFixup = lib.optionalString withSolc '' ··· 55 57 homepage = "https://github.com/trailofbits/slither"; 56 58 changelog = "https://github.com/crytic/slither/releases/tag/${version}"; 57 59 license = licenses.agpl3Plus; 58 - maintainers = with maintainers; [ arturcygan fab ]; 60 + maintainers = with maintainers; [ arturcygan fab hellwolf ]; 59 61 }; 60 62 }
+2 -2
pkgs/development/python-modules/types-urllib3/default.nix
··· 5 5 6 6 buildPythonPackage rec { 7 7 pname = "types-urllib3"; 8 - version = "1.26.25.13"; 8 + version = "1.26.25.14"; 9 9 format = "setuptools"; 10 10 11 11 src = fetchPypi { 12 12 inherit pname version; 13 - hash = "sha256-MwBTjJ3BHa0y6uSCesMT9dmGuLIUlIAfG/l6GsbAOuU="; 13 + hash = "sha256-Ipt/V3yVG4wbksG8Ky/bC0mEe9KvbRzCouPdNA872o8="; 14 14 }; 15 15 16 16 # Module doesn't have tests
+99
pkgs/development/python-modules/unstructured-inference/default.nix
··· 1 + { lib 2 + , buildPythonPackage 3 + , fetchFromGitHub 4 + # runtime dependencies 5 + , layoutparser 6 + , python-multipart 7 + , huggingface-hub 8 + , opencv 9 + , onnxruntime 10 + , transformers 11 + , detectron2 12 + # check inputs 13 + , pytestCheckHook 14 + , coverage 15 + , click 16 + , httpx 17 + , mypy 18 + , pytest-cov 19 + , pdf2image 20 + }: 21 + 22 + buildPythonPackage rec { 23 + pname = "unstructured-inference"; 24 + version = "0.5.5"; 25 + format = "setuptools"; 26 + 27 + src = fetchFromGitHub { 28 + owner = "Unstructured-IO"; 29 + repo = "unstructured-inference"; 30 + rev = version; 31 + hash = "sha256-Oma6vPoiA+5czauYFgsU1W6UECDRurYmBTaCSiEILNs="; 32 + }; 33 + 34 + postPatch = '' 35 + substituteInPlace requirements/base.in \ 36 + --replace "opencv-python" "opencv" 37 + ''; 38 + 39 + propagatedBuildInputs = [ 40 + layoutparser 41 + python-multipart 42 + huggingface-hub 43 + opencv 44 + onnxruntime 45 + transformers 46 + detectron2 47 + # paddleocr 48 + # yolox 49 + ] 50 + ++ layoutparser.optional-dependencies.layoutmodels 51 + ++ layoutparser.optional-dependencies.tesseract; 52 + 53 + nativeCheckInputs = [ 54 + pytestCheckHook 55 + coverage 56 + click 57 + httpx 58 + mypy 59 + pytest-cov 60 + pdf2image 61 + huggingface-hub 62 + ]; 63 + 64 + preCheck = '' 65 + export HOME=$(mktemp -d) 66 + ''; 67 + 68 + disabledTests = [ 69 + # not sure why this fails 70 + "test_get_path_oob_move_deeply_nested" 71 + "test_get_path_oob_move_nested[False]" 72 + # requires yolox 73 + "test_yolox" 74 + # requires paddleocr 75 + "test_table_prediction" 76 + ]; 77 + 78 + disabledTestPaths = [ 79 + # network access 80 + "test_unstructured_inference/inference/test_layout.py" 81 + "test_unstructured_inference/models/test_chippermodel.py" 82 + "test_unstructured_inference/models/test_detectron2.py" 83 + "test_unstructured_inference/models/test_detectron2onnx.py" 84 + # unclear failure 85 + "test_unstructured_inference/models/test_donut.py" 86 + "test_unstructured_inference/models/test_model.py" 87 + "test_unstructured_inference/models/test_tables.py" 88 + ]; 89 + 90 + pythonImportsCheck = [ "unstructured_inference" ]; 91 + 92 + meta = with lib; { 93 + description = ""; 94 + homepage = "https://github.com/Unstructured-IO/unstructured-inference"; 95 + changelog = "https://github.com/Unstructured-IO/unstructured-inference/blob/${src.rev}/CHANGELOG.md"; 96 + license = licenses.asl20; 97 + maintainers = with maintainers; [ happysalada ]; 98 + }; 99 + }
+2 -2
pkgs/development/python-modules/weconnect/default.nix
··· 12 12 13 13 buildPythonPackage rec { 14 14 pname = "weconnect"; 15 - version = "0.55.0"; 15 + version = "0.56.2"; 16 16 format = "setuptools"; 17 17 18 18 disabled = pythonOlder "3.8"; ··· 21 21 owner = "tillsteinbach"; 22 22 repo = "WeConnect-python"; 23 23 rev = "refs/tags/v${version}"; 24 - hash = "sha256-+ISWPrpY/urpZZZrn6+Ii8gbrwkQMLL6gXhydXd8HqI="; 24 + hash = "sha256-Z6QIEFITMjmB3JbbcfGC5JMJtAz5/3F21TRgao5lBs0="; 25 25 }; 26 26 27 27 propagatedBuildInputs = [
+4 -2
pkgs/development/tools/qtcreator/qt6.nix
··· 15 15 , qtsvg 16 16 , qttools 17 17 , qtwebengine 18 + , qtwayland 18 19 , qtshadertools 19 20 , wrapQtAppsHook 20 21 , yaml-cpp ··· 28 29 29 30 stdenv.mkDerivation rec { 30 31 pname = "qtcreator"; 31 - version = "10.0.2"; 32 + version = "11.0.0"; 32 33 33 34 src = fetchurl { 34 35 url = "https://download.qt.io/official_releases/${pname}/${lib.versions.majorMinor version}/${version}/qt-creator-opensource-src-${version}.tar.xz"; 35 - hash = "sha256-2n/F59wagMccCeJFt9JxHrAbpXXi+ZEQ0Ep855mSbU4="; 36 + hash = "sha256-2/RPVfsDg00nC+3v9pWsT8Aq862oRfW575graxWaFDA="; 36 37 }; 37 38 38 39 nativeBuildInputs = [ ··· 50 51 qtsvg 51 52 qtquick3d 52 53 qtwebengine 54 + qtwayland 53 55 qtserialport 54 56 qtshadertools 55 57 qt5compat
+15 -15
pkgs/os-specific/linux/kernel/hardened/patches.json
··· 52 52 "6.1": { 53 53 "patch": { 54 54 "extra": "-hardened1", 55 - "name": "linux-hardened-6.1.38-hardened1.patch", 56 - "sha256": "0sv8i26xwgw3a36yga79n36a5xbrs3ajn8wdkqn40ydbzp24i0qc", 57 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.38-hardened1/linux-hardened-6.1.38-hardened1.patch" 55 + "name": "linux-hardened-6.1.39-hardened1.patch", 56 + "sha256": "0j4sgcs6m2mq9dn1v525bymhdhha3x8ivrpfrhqm553q4vdnmbg7", 57 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.1.39-hardened1/linux-hardened-6.1.39-hardened1.patch" 58 58 }, 59 - "sha256": "0hrdh1w9z8bgy4cxqsxfkwa01yincfw1mq1bbwm36zczc0dzk97r", 60 - "version": "6.1.38" 59 + "sha256": "1f45j3ch1ljbacjlg8q45iva9lvwys938rdg0s516mznzlifxpac", 60 + "version": "6.1.39" 61 61 }, 62 62 "6.3": { 63 63 "patch": { 64 64 "extra": "-hardened1", 65 - "name": "linux-hardened-6.3.12-hardened1.patch", 66 - "sha256": "12dqdn2prr0mczwcy48907wpp235n87pl22gwyfilsxcj94x2wrx", 67 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.3.12-hardened1/linux-hardened-6.3.12-hardened1.patch" 65 + "name": "linux-hardened-6.3.13-hardened1.patch", 66 + "sha256": "1iy95awbkrdk5529w9s07axb21l2snab4kifbzjghhz9vwzx22rp", 67 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.3.13-hardened1/linux-hardened-6.3.13-hardened1.patch" 68 68 }, 69 - "sha256": "1mvcirkhqnf03cci3jiq077fs9b42a3xdk3zjkpyim3x43ydwzyb", 70 - "version": "6.3.12" 69 + "sha256": "1ywijjhf19bciip75ppzjjh7bkadd449jr64yg2j5049w9h0aipa", 70 + "version": "6.3.13" 71 71 }, 72 72 "6.4": { 73 73 "patch": { 74 74 "extra": "-hardened1", 75 - "name": "linux-hardened-6.4.3-hardened1.patch", 76 - "sha256": "1xwy9088f8qy7algv1gad90gd6sv03diz16jvfnk2yb01k4f87wv", 77 - "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.3-hardened1/linux-hardened-6.4.3-hardened1.patch" 75 + "name": "linux-hardened-6.4.4-hardened1.patch", 76 + "sha256": "0yy02hn190wvl24z1j9kjmnyxrlp6s9fhkyvqgcm8i56d7d69zhb", 77 + "url": "https://github.com/anthraxx/linux-hardened/releases/download/6.4.4-hardened1/linux-hardened-6.4.4-hardened1.patch" 78 78 }, 79 - "sha256": "18c8ikghvlr6h9jajy11dldck4h57wl301j14rxg7xhd6qlysd3i", 80 - "version": "6.4.3" 79 + "sha256": "0apzfnn04w6jda9yw5cbgj8784frvqrryb1iw5ad390lwwmlmg4w", 80 + "version": "6.4.4" 81 81 } 82 82 }
+2 -2
pkgs/os-specific/linux/kernel/linux-6.1.nix
··· 3 3 with lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "6.1.38"; 6 + version = "6.1.39"; 7 7 8 8 # modDirVersion needs to be x.y.z, will automatically add .0 if needed 9 9 modDirVersion = versions.pad 3 version; ··· 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; 16 - sha256 = "0hrdh1w9z8bgy4cxqsxfkwa01yincfw1mq1bbwm36zczc0dzk97r"; 16 + sha256 = "1f45j3ch1ljbacjlg8q45iva9lvwys938rdg0s516mznzlifxpac"; 17 17 }; 18 18 } // (args.argsOverride or { }))
+2 -2
pkgs/os-specific/linux/kernel/linux-6.3.nix
··· 3 3 with lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "6.3.12"; 6 + version = "6.3.13"; 7 7 8 8 # modDirVersion needs to be x.y.z, will automatically add .0 if needed 9 9 modDirVersion = versions.pad 3 version; ··· 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; 16 - sha256 = "1mvcirkhqnf03cci3jiq077fs9b42a3xdk3zjkpyim3x43ydwzyb"; 16 + sha256 = "1ywijjhf19bciip75ppzjjh7bkadd449jr64yg2j5049w9h0aipa"; 17 17 }; 18 18 } // (args.argsOverride or { }))
+2 -2
pkgs/os-specific/linux/kernel/linux-6.4.nix
··· 3 3 with lib; 4 4 5 5 buildLinux (args // rec { 6 - version = "6.4.3"; 6 + version = "6.4.4"; 7 7 8 8 # modDirVersion needs to be x.y.z, will automatically add .0 if needed 9 9 modDirVersion = versions.pad 3 version; ··· 13 13 14 14 src = fetchurl { 15 15 url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz"; 16 - sha256 = "18c8ikghvlr6h9jajy11dldck4h57wl301j14rxg7xhd6qlysd3i"; 16 + sha256 = "0apzfnn04w6jda9yw5cbgj8784frvqrryb1iw5ad390lwwmlmg4w"; 17 17 }; 18 18 } // (args.argsOverride or { }))
+50
pkgs/servers/ebusd/default.nix
··· 1 + { lib, stdenv, pkgs, fetchFromGitHub, argparse, mosquitto, cmake, autoconf, automake, libtool, pkg-config, openssl }: 2 + 3 + stdenv.mkDerivation rec { 4 + pname = "ebusd"; 5 + version = "23.2"; 6 + 7 + src = fetchFromGitHub { 8 + owner = "john30"; 9 + repo = "ebusd"; 10 + rev = version; 11 + sha256 = "2CkcTTxEzVrEPtUVVDxXPPkYqZT6+gsCcfTrt83sFv8="; 12 + }; 13 + 14 + nativeBuildInputs = [ 15 + cmake 16 + autoconf 17 + automake 18 + libtool 19 + pkg-config 20 + ]; 21 + 22 + buildInputs = [ 23 + argparse 24 + mosquitto 25 + openssl 26 + ]; 27 + 28 + patches = [ 29 + ./patches/ebusd-cmake.patch 30 + ]; 31 + 32 + cmakeFlags = [ 33 + "-DCMAKE_INSTALL_SYSCONFDIR=${placeholder "out"}/etc" 34 + "-DCMAKE_INSTALL_BINDIR=${placeholder "out"}/bin" 35 + "-DCMAKE_INSTALL_LOCALSTATEDIR=${placeholder "TMPDIR"}" 36 + ]; 37 + 38 + postInstall = '' 39 + mv $out/usr/bin $out 40 + rmdir $out/usr 41 + ''; 42 + 43 + meta = with lib; { 44 + description = "ebusd"; 45 + homepage = "https://github.com/john30/ebusd"; 46 + license = licenses.gpl3Only; 47 + maintainers = with maintainers; [ nathan-gs ]; 48 + platforms = platforms.linux; 49 + }; 50 + }
+21
pkgs/servers/ebusd/patches/ebusd-cmake.patch
··· 1 + --- a/CMakeLists.txt 2 + +++ b/CMakeLists.txt 3 + @@ -184,16 +184,11 @@ 4 + add_subdirectory(src/lib/knx) 5 + add_subdirectory(src/tools) 6 + 7 + -if(EXISTS "${ROOT}/etc/debian_version") 8 + - install(FILES ${CMAKE_SOURCE_DIR}/contrib/debian/default/ebusd DESTINATION /etc/default/) 9 + - install(FILES ${CMAKE_SOURCE_DIR}/contrib/debian/init.d/ebusd DESTINATION /etc/init.d/) 10 + - install(FILES ${CMAKE_SOURCE_DIR}/contrib/debian/systemd/ebusd.service DESTINATION /lib/systemd/system/) 11 + -endif() 12 + if(HAVE_MQTT) 13 + FILE(GLOB MQTT_CFG_FILES "${CMAKE_SOURCE_DIR}/contrib/etc/ebusd/mqtt-*.cfg") 14 + - install(FILES ${MQTT_CFG_FILES} DESTINATION /etc/ebusd/) 15 + + install(FILES ${MQTT_CFG_FILES} DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/ebusd/) 16 + endif(HAVE_MQTT) 17 + if(HAVE_KNX) 18 + FILE(GLOB KNX_CFG_FILES "${CMAKE_SOURCE_DIR}/contrib/etc/ebusd/knx*.cfg") 19 + - install(FILES ${KNX_CFG_FILES} DESTINATION /etc/ebusd/) 20 + + install(FILES ${KNX_CFG_FILES} DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/ebusd/) 21 + endif(HAVE_KNX)
+1 -4
pkgs/tools/filesystems/ceph/default.nix
··· 172 172 inherit version; 173 173 hash = "sha256-aRO4JH2KKS74MVFipRkx4rQM6RaB8bbxj2lwRSAMSjA="; 174 174 }; 175 - nativeCheckInputs = oldAttrs.nativeCheckInputs ++ (with super; [ 176 - pytest-xdist 177 - ]); 178 - disabledTestPaths = (oldAttrs.disabledTestPaths or []) ++ [ 175 + disabledTestPaths = [ 179 176 "test/aaa_profiling" 180 177 "test/ext/mypy" 181 178 ];
+2 -2
pkgs/tools/graphics/maskromtool/default.nix
··· 9 9 10 10 stdenv.mkDerivation rec { 11 11 pname = "maskromtool"; 12 - version = "2023-06-17"; 12 + version = "2023-07-20"; 13 13 14 14 src = fetchFromGitHub { 15 15 owner = "travisgoodspeed"; 16 16 repo = "maskromtool"; 17 17 rev = "v${version}"; 18 - hash = "sha256-NumMO9whM5ZdEtxI3gjp2Ky2b8/rjPSiD9G/95xJk1o="; 18 + hash = "sha256-AUZh1GAGN5RUXyK+YvQfhAp124bSI0LvCSaTRutLuE4="; 19 19 }; 20 20 21 21 buildInputs = [
+3 -3
pkgs/tools/networking/amass/default.nix
··· 5 5 6 6 buildGoModule rec { 7 7 pname = "amass"; 8 - version = "3.23.3"; 8 + version = "4.0.1"; 9 9 10 10 src = fetchFromGitHub { 11 11 owner = "OWASP"; 12 12 repo = "Amass"; 13 13 rev = "v${version}"; 14 - hash = "sha256-aOir4ezLBNWoTaDeQDWoDdV/A+Qzbq09601297o6uDE="; 14 + hash = "sha256-FdOfTZG2zzO8Lp3/CbSw8ouDmveXDzbIBB34EuKiyXg="; 15 15 }; 16 16 17 - vendorHash = "sha256-zUl1q6rRjX958VXKnVB2YmLUpKMUtFvdh+hkIrTomes="; 17 + vendorHash = "sha256-ZA9XKloUk46pdJK0Lutk1upPfT9irwR0NtmntCkzmlA="; 18 18 19 19 outputs = [ 20 20 "out"
+42 -20
pkgs/tools/security/echidna/default.nix
··· 1 1 { lib 2 + , mkDerivation 2 3 , fetchFromGitHub 3 - # Haskell deps 4 - , mkDerivation, aeson, base, base16-bytestring, binary, brick, bytestring 5 - , containers, data-dword, data-has, directory, exceptions, extra, filepath 6 - , hashable, hevm, hpack, html-entities, lens, ListLike, MonadRandom, mtl 7 - , optparse-applicative, process, random, semver, tasty, tasty-hunit 8 - , tasty-quickcheck, text, transformers, unix, unliftio, unordered-containers 9 - , vector, vector-instances, vty, yaml 4 + , haskellPackages 5 + , haskell 6 + , slither-analyzer 10 7 }: 11 - mkDerivation rec { 8 + 9 + let haskellPackagesOverride = haskellPackages.override { 10 + overrides = self: super: { 11 + # following the revision specified in echidna/stack.yaml 12 + # TODO: 0.51.3 is not in haskellPackages yet 13 + hevm = haskell.lib.overrideCabal super.hevm (oa: { 14 + version = "0.51.3"; 15 + src = fetchFromGitHub { 16 + owner = "ethereum"; 17 + repo = "hevm"; 18 + rev = "release/0.51.3"; 19 + hash = "sha256-H6oURBGoQWSOuPhBB+UKg2UarVzXgv1tmfDBLnOtdhU="; 20 + }; 21 + libraryHaskellDepends = oa.libraryHaskellDepends 22 + ++ (with haskellPackages;[githash witch]); 23 + }); 24 + }; 25 + }; 26 + in mkDerivation rec { 12 27 pname = "echidna"; 13 - version = "2.0.5"; 28 + version = "2.2.1"; 14 29 15 30 src = fetchFromGitHub { 16 31 owner = "crytic"; 17 32 repo = "echidna"; 18 33 rev = "v${version}"; 19 - sha256 = "sha256-8bChe+qA4DowfuwsR5wLckb56fXi102g8vL2gAH/kYE="; 34 + sha256 = "sha256-5d9ttPR3rRHywBeLM85EGCEZLNZNZzOAhIN6AJToJyI="; 20 35 }; 21 36 22 37 isLibrary = true; 23 38 isExecutable = true; 24 - libraryHaskellDepends = [ 25 - aeson base base16-bytestring binary brick bytestring containers data-dword 26 - data-has directory exceptions extra filepath hashable hevm html-entities 27 - lens ListLike MonadRandom mtl optparse-applicative process random semver 28 - text transformers unix unliftio unordered-containers vector vector-instances 29 - vty yaml 39 + 40 + libraryToolDepends = with haskellPackagesOverride; [ 41 + haskellPackages.hpack 30 42 ]; 31 - libraryToolDepends = [ hpack ]; 32 - executableHaskellDepends = libraryHaskellDepends; 33 - testHaskellDepends = [ 43 + 44 + # Note: This can be extracted from package.yaml of echidna, the list is shorter because some are transitive. 45 + executableHaskellDepends = with haskellPackagesOverride; 46 + [aeson base base16-bytestring binary brick bytestring code-page containers data-dword data-has directory exceptions extra 47 + filepath hashable hevm html-conduit html-entities http-conduit lens ListLike MonadRandom mtl optics optparse-applicative 48 + process random semver text transformers unix unliftio unordered-containers vector vector-instances vty with-utf8 49 + xml-conduit yaml]; 50 + 51 + # Note: there is also a runtime dependency of slither-analyzer, let's include it also. 52 + executableSystemDepends = [ slither-analyzer ]; 53 + 54 + testHaskellDepends = with haskellPackagesOverride; [ 34 55 tasty tasty-hunit tasty-quickcheck 35 56 ]; 57 + 36 58 preConfigure = '' 37 59 hpack 38 60 # re-enable dynamic build for Linux ··· 46 68 description = "Ethereum smart contract fuzzer"; 47 69 homepage = "https://github.com/crytic/echidna"; 48 70 license = lib.licenses.agpl3Plus; 49 - maintainers = with lib.maintainers; [ arturcygan ]; 71 + maintainers = with lib.maintainers; [ arturcygan hellwolf ]; 50 72 platforms = lib.platforms.unix; 51 73 mainProgram = "echidna-test"; 52 74 }
+2 -2
pkgs/tools/security/exploitdb/default.nix
··· 6 6 7 7 stdenv.mkDerivation rec { 8 8 pname = "exploitdb"; 9 - version = "2023-07-18"; 9 + version = "2023-07-21"; 10 10 11 11 src = fetchFromGitLab { 12 12 owner = "exploit-database"; 13 13 repo = pname; 14 14 rev = "refs/tags/${version}"; 15 - hash = "sha256-fna7N9TCrq2Fz+/S0vNQRCx35EFTRr+OiYk6aXzWfyc="; 15 + hash = "sha256-HJKvIyWJSLsoVq2jpLDN7H1dsLE9+zv5bSZIh3l4W/4="; 16 16 }; 17 17 18 18 nativeBuildInputs = [
+1
pkgs/top-level/aliases.nix
··· 492 492 493 493 facette = throw "facette has been removed"; # Added 2020-01-06 494 494 faustStk = faustPhysicalModeling; # Added 2023-05-16 495 + faust1 = throw "faust1 has been removed, use faust2 instead"; # Added 2022-12-03 495 496 fast-neural-doodle = throw "fast-neural-doodle has been removed, as the upstream project has been abandoned"; # Added 2020-03-28 496 497 fastnlo = fastnlo_toolkit; # Added 2021-04-24 497 498 fbreader = throw "fbreader has been removed, as the upstream project has been archived"; # Added 2022-05-26
+6 -2
pkgs/top-level/all-packages.nix
··· 475 475 inherit (darwin.apple_sdk.frameworks) Security; 476 476 }; 477 477 478 + codeberg-cli = callPackage ../applications/version-management/codeberg-cli { 479 + inherit (darwin.apple_sdk.frameworks) Security CoreServices; 480 + }; 481 + 478 482 conftest = callPackage ../development/tools/conftest { }; 479 483 480 484 coldsnap = callPackage ../tools/admin/coldsnap { ··· 582 586 ea = callPackage ../tools/misc/ea { }; 583 587 584 588 each = callPackage ../tools/text/each { }; 589 + 590 + ebusd = callPackage ../servers/ebusd { }; 585 591 586 592 eclipse-mat = callPackage ../development/tools/eclipse-mat { }; 587 593 ··· 39667 39673 glee = callPackage ../tools/graphics/glee { }; 39668 39674 39669 39675 faust = res.faust2; 39670 - 39671 - faust1 = callPackage ../applications/audio/faust/faust1.nix { }; 39672 39676 39673 39677 faust2 = callPackage ../applications/audio/faust/faust2.nix { }; 39674 39678
+2
pkgs/top-level/python-packages.nix
··· 13057 13057 13058 13058 unrpa = callPackage ../development/python-modules/unrpa { }; 13059 13059 13060 + unstructured-inference = callPackage ../development/python-modules/unstructured-inference { }; 13061 + 13060 13062 untangle = callPackage ../development/python-modules/untangle { }; 13061 13063 13062 13064 untokenize = callPackage ../development/python-modules/untokenize { };