···

       
422
       
422
       
 
       
      (if v then "True" else "False")

     

       
423
       
423
       
 
       
    else if isFunction v then

     

       
424
       
424
       
 
       
      abort "generators.toDhall: cannot convert a function to Dhall"

     

       
425
       
425
       
-
       
    else if isNull v then

     

       
425
       
425
       
+
       
    else if v == null then

     

       
426
       
426
       
 
       
      abort "generators.toDhall: cannot convert a null to Dhall"

     

       
427
       
427
       
 
       
    else

     

       
428
       
428
       
 
       
      builtins.toJSON v;

     

···

       
3
       
3
       
 
       
  pkgs = import ../../.. {};

     

       
4
       
4
       
 
       
  inherit (pkgs) lib;

     

       
5
       
5
       
 
       
  getDeps = _: pkg: {

     

       
6
       
6
       
-
       
    deps = builtins.filter (x: !isNull x) (map (x: x.pname or null) (pkg.propagatedBuildInputs or []));

     

       
6
       
6
       
+
       
    deps = builtins.filter (x: x != null) (map (x: x.pname or null) (pkg.propagatedBuildInputs or []));

     

       
7
       
7
       
 
       
    broken = (pkg.meta.hydraPlatforms or [null]) == [];

     

       
8
       
8
       
 
       
  };

     

       
9
       
9
       
 
       
in

     

···

       
179
       
179
       
 
       
            start_command=cmd,

     

       
180
       
180
       
 
       
            name=name,

     

       
181
       
181
       
 
       
            keep_vm_state=args.get("keep_vm_state", False),

     

       
182
       
182
       
-
       
            allow_reboot=args.get("allow_reboot", False),

     

       
183
       
182
       
 
       
        )

     

       
184
       
183
       
 
       


     

       
185
       
184
       
 
       
    def serial_stdout_on(self) -> None:

     

···

       
144
       
144
       
 
       
        self,

     

       
145
       
145
       
 
       
        monitor_socket_path: Path,

     

       
146
       
146
       
 
       
        shell_socket_path: Path,

     

       
147
       
147
       
-
       
        allow_reboot: bool = False,  # TODO: unused, legacy?

     

       
147
       
147
       
+
       
        allow_reboot: bool = False,

     

       
148
       
148
       
 
       
    ) -> str:

     

       
149
       
149
       
 
       
        display_opts = ""

     

       
150
       
150
       
 
       
        display_available = any(x in os.environ for x in ["DISPLAY", "WAYLAND_DISPLAY"])

     
···

       
152
       
152
       
 
       
            display_opts += " -nographic"

     

       
153
       
153
       
 
       


     

       
154
       
154
       
 
       
        # qemu options

     

       
155
       
155
       
-
       
        qemu_opts = ""

     

       
156
       
156
       
-
       
        qemu_opts += (

     

       
157
       
157
       
-
       
            ""

     

       
158
       
158
       
-
       
            if allow_reboot

     

       
159
       
159
       
-
       
            else " -no-reboot"

     

       
155
       
155
       
+
       
        qemu_opts = (

     

       
160
       
156
       
 
       
            " -device virtio-serial"

     

       
161
       
157
       
 
       
            " -device virtconsole,chardev=shell"

     

       
162
       
158
       
 
       
            " -device virtio-rng-pci"

     

       
163
       
159
       
 
       
            " -serial stdio"

     

       
164
       
160
       
 
       
        )

     

       
161
       
161
       
+
       
        if not allow_reboot:

     

       
162
       
162
       
+
       
            qemu_opts += " -no-reboot"

     

       
165
       
163
       
 
       
        # TODO: qemu script already catpures this env variable, legacy?

     

       
166
       
164
       
 
       
        qemu_opts += " " + os.environ.get("QEMU_OPTS", "")

     

       
167
       
165
       
 
       


     
···

       
195
       
193
       
 
       
        shared_dir: Path,

     

       
196
       
194
       
 
       
        monitor_socket_path: Path,

     

       
197
       
195
       
 
       
        shell_socket_path: Path,

     

       
196
       
196
       
+
       
        allow_reboot: bool,

     

       
198
       
197
       
 
       
    ) -> subprocess.Popen:

     

       
199
       
198
       
 
       
        return subprocess.Popen(

     

       
200
       
200
       
-
       
            self.cmd(monitor_socket_path, shell_socket_path),

     

       
199
       
199
       
+
       
            self.cmd(monitor_socket_path, shell_socket_path, allow_reboot),

     

       
201
       
200
       
 
       
            stdin=subprocess.PIPE,

     

       
202
       
201
       
 
       
            stdout=subprocess.PIPE,

     

       
203
       
202
       
 
       
            stderr=subprocess.STDOUT,

     
···

       
312
       
311
       
 
       


     

       
313
       
312
       
 
       
    start_command: StartCommand

     

       
314
       
313
       
 
       
    keep_vm_state: bool

     

       
315
       
315
       
-
       
    allow_reboot: bool

     

       
316
       
314
       
 
       


     

       
317
       
315
       
 
       
    process: Optional[subprocess.Popen]

     

       
318
       
316
       
 
       
    pid: Optional[int]

     
···

       
337
       
335
       
 
       
        start_command: StartCommand,

     

       
338
       
336
       
 
       
        name: str = "machine",

     

       
339
       
337
       
 
       
        keep_vm_state: bool = False,

     

       
340
       
340
       
-
       
        allow_reboot: bool = False,

     

       
341
       
338
       
 
       
        callbacks: Optional[List[Callable]] = None,

     

       
342
       
339
       
 
       
    ) -> None:

     

       
343
       
340
       
 
       
        self.out_dir = out_dir

     

       
344
       
341
       
 
       
        self.tmp_dir = tmp_dir

     

       
345
       
342
       
 
       
        self.keep_vm_state = keep_vm_state

     

       
346
       
346
       
-
       
        self.allow_reboot = allow_reboot

     

       
347
       
343
       
 
       
        self.name = name

     

       
348
       
344
       
 
       
        self.start_command = start_command

     

       
349
       
345
       
 
       
        self.callbacks = callbacks if callbacks is not None else []

     
···

       
874
       
870
       
 
       
        self.process.stdin.write(chars.encode())

     

       
875
       
871
       
 
       
        self.process.stdin.flush()

     

       
876
       
872
       
 
       


     

       
877
       
877
       
-
       
    def start(self) -> None:

     

       
873
       
873
       
+
       
    def start(self, allow_reboot: bool = False) -> None:

     

       
878
       
874
       
 
       
        if self.booted:

     

       
879
       
875
       
 
       
            return

     

       
880
       
876
       
 
       


     
···

       
898
       
894
       
 
       
            self.shared_dir,

     

       
899
       
895
       
 
       
            self.monitor_path,

     

       
900
       
896
       
 
       
            self.shell_path,

     

       
897
       
897
       
+
       
            allow_reboot,

     

       
901
       
898
       
 
       
        )

     

       
902
       
899
       
 
       
        self.monitor, _ = monitor_socket.accept()

     

       
903
       
900
       
 
       
        self.shell, _ = shell_socket.accept()

     
···

       
945
       
942
       
 
       
        self.log("forced crash")

     

       
946
       
943
       
 
       
        self.send_monitor_command("quit")

     

       
947
       
944
       
 
       
        self.wait_for_shutdown()

     

       
945
       
945
       
+
       


     

       
946
       
946
       
+
       
    def reboot(self) -> None:

     

       
947
       
947
       
+
       
        """Press Ctrl+Alt+Delete in the guest.

     

       
948
       
948
       
+
       


     

       
949
       
949
       
+
       
        Prepares the machine to be reconnected which is useful if the

     

       
950
       
950
       
+
       
        machine was started with `allow_reboot = True`

     

       
951
       
951
       
+
       
        """

     

       
952
       
952
       
+
       
        self.send_key(f"ctrl-alt-delete")

     

       
953
       
953
       
+
       
        self.connected = False

     

       
948
       
954
       
 
       


     

       
949
       
955
       
 
       
    def wait_for_x(self) -> None:

     

       
950
       
956
       
 
       
        """Wait until it is possible to connect to the X server.  Note that

     

···

       
65
       
65
       
 
       
    };

     

       
66
       
66
       
 
       
  };

     

       
67
       
67
       
 
       


     

       
68
       
68
       
-
       
  filterDTBs = src: if isNull cfg.filter

     

       
68
       
68
       
+
       
  filterDTBs = src: if cfg.filter == null

     

       
69
       
69
       
 
       
    then "${src}/dtbs"

     

       
70
       
70
       
 
       
    else

     

       
71
       
71
       
 
       
      pkgs.runCommand "dtbs-filtered" {} ''

     
···

       
93
       
93
       
 
       
  # Fill in `dtboFile` for each overlay if not set already.

     

       
94
       
94
       
 
       
  # Existence of one of these is guarded by assertion below

     

       
95
       
95
       
 
       
  withDTBOs = xs: flip map xs (o: o // { dtboFile =

     

       
96
       
96
       
-
       
    if isNull o.dtboFile then

     

       
97
       
97
       
-
       
      if !isNull o.dtsFile then compileDTS o.name o.dtsFile

     

       
96
       
96
       
+
       
    if o.dtboFile == null then

     

       
97
       
97
       
+
       
      if o.dtsFile != null then compileDTS o.name o.dtsFile

     

       
98
       
98
       
 
       
      else compileDTS o.name (pkgs.writeText "dts" o.dtsText)

     

       
99
       
99
       
 
       
    else o.dtboFile; } );

     

       
100
       
100
       
 
       


     
···

       
181
       
181
       
 
       
  config = mkIf (cfg.enable) {

     

       
182
       
182
       
 
       


     

       
183
       
183
       
 
       
    assertions = let

     

       
184
       
184
       
-
       
      invalidOverlay = o: isNull o.dtsFile && isNull o.dtsText && isNull o.dtboFile;

     

       
184
       
184
       
+
       
      invalidOverlay = o: (o.dtsFile == null) && (o.dtsText == null) && (o.dtboFile == null);

     

       
185
       
185
       
 
       
    in lib.singleton {

     

       
186
       
186
       
 
       
      assertion = lib.all (o: !invalidOverlay o) cfg.overlays;

     

       
187
       
187
       
 
       
      message = ''

     

···

       
19
       
19
       
 
       
  ];

     

       
20
       
20
       
 
       


     

       
21
       
21
       
 
       
  mkArgs = rule:

     

       
22
       
22
       
-
       
    if (isNull rule.args) then ""

     

       
22
       
22
       
+
       
    if (rule.args == null) then ""

     

       
23
       
23
       
 
       
    else if (length rule.args == 0) then "args"

     

       
24
       
24
       
 
       
    else "args ${concatStringsSep " " rule.args}";

     

       
25
       
25
       
 
       


     
···

       
27
       
27
       
 
       
    let

     

       
28
       
28
       
 
       
      opts = mkOpts rule;

     

       
29
       
29
       
 
       


     

       
30
       
30
       
-
       
      as = optionalString (!isNull rule.runAs) "as ${rule.runAs}";

     

       
30
       
30
       
+
       
      as = optionalString (rule.runAs != null) "as ${rule.runAs}";

     

       
31
       
31
       
 
       


     

       
32
       
32
       
-
       
      cmd = optionalString (!isNull rule.cmd) "cmd ${rule.cmd}";

     

       
32
       
32
       
+
       
      cmd = optionalString (rule.cmd != null) "cmd ${rule.cmd}";

     

       
33
       
33
       
 
       


     

       
34
       
34
       
 
       
      args = mkArgs rule;

     

       
35
       
35
       
 
       
    in

     

···

       
793
       
793
       
 
       
    };

     

       
794
       
794
       
 
       
  }));

     

       
795
       
795
       
 
       


     

       
796
       
796
       
-
       
  motd = if isNull config.users.motdFile

     

       
796
       
796
       
+
       
  motd = if config.users.motdFile == null

     

       
797
       
797
       
 
       
         then pkgs.writeText "motd" config.users.motd

     

       
798
       
798
       
 
       
         else config.users.motdFile;

     

       
799
       
799
       
 
       


     
···

       
1233
       
1233
       
 
       
  config = {

     

       
1234
       
1234
       
 
       
    assertions = [

     

       
1235
       
1235
       
 
       
      {

     

       
1236
       
1236
       
-
       
        assertion = isNull config.users.motd || isNull config.users.motdFile;

     

       
1236
       
1236
       
+
       
        assertion = config.users.motd == null || config.users.motdFile == null;

     

       
1237
       
1237
       
 
       
        message = ''

     

       
1238
       
1238
       
 
       
          Only one of users.motd and users.motdFile can be set.

     

       
1239
       
1239
       
 
       
        '';

     

···

       
270
       
270
       
 
       
          '';

     

       
271
       
271
       
 
       
        })]);

     

       
272
       
272
       
 
       


     

       
273
       
273
       
-
       
      environment.etc.${cfg.etcClusterAdminKubeconfig}.source = mkIf (!isNull cfg.etcClusterAdminKubeconfig)

     

       
273
       
273
       
+
       
      environment.etc.${cfg.etcClusterAdminKubeconfig}.source = mkIf (cfg.etcClusterAdminKubeconfig != null)

     

       
274
       
274
       
 
       
        clusterAdminKubeconfig;

     

       
275
       
275
       
 
       


     

       
276
       
276
       
 
       
      environment.systemPackages = mkIf (top.kubelet.enable || top.proxy.enable) [

     

···

       
5
       
5
       
 
       
  cfg = config.services.undervolt;

     

       
6
       
6
       
 
       


     

       
7
       
7
       
 
       
  mkPLimit = limit: window:

     

       
8
       
8
       
-
       
    if (isNull limit && isNull window) then null

     

       
9
       
9
       
-
       
    else assert asserts.assertMsg (!isNull limit && !isNull window) "Both power limit and window must be set";

     

       
8
       
8
       
+
       
    if (limit == null && window == null) then null

     

       
9
       
9
       
+
       
    else assert asserts.assertMsg (limit != null && window != null) "Both power limit and window must be set";

     

       
10
       
10
       
 
       
      "${toString limit} ${toString window}";

     

       
11
       
11
       
 
       
  cliArgs = lib.cli.toGNUCommandLine {} {

     

       
12
       
12
       
 
       
    inherit (cfg)

     

···

       
362
       
362
       
 
       
  config = mkIf cfg.enable {

     

       
363
       
363
       
 
       
    assertions = [

     

       
364
       
364
       
 
       
      {

     

       
365
       
365
       
-
       
        assertion = cfg.openFirewall -> !isNull cfg.config;

     

       
365
       
365
       
+
       
        assertion = cfg.openFirewall -> cfg.config != null;

     

       
366
       
366
       
 
       
        message = "openFirewall can only be used with a declarative config";

     

       
367
       
367
       
 
       
      }

     

       
368
       
368
       
 
       
    ];

     

···

       
513
       
513
       
 
       
        ${indentLines 2 devices}

     

       
514
       
514
       
 
       
        }

     

       
515
       
515
       
 
       


     

       
516
       
516
       
-
       
        ${optionalString (!isNull defaults) ''

     

       
516
       
516
       
+
       
        ${optionalString (defaults != null) ''

     

       
517
       
517
       
 
       
          defaults {

     

       
518
       
518
       
 
       
          ${indentLines 2 defaults}

     

       
519
       
519
       
 
       
          }

     

       
520
       
520
       
 
       
        ''}

     

       
521
       
521
       
-
       
        ${optionalString (!isNull blacklist) ''

     

       
521
       
521
       
+
       
        ${optionalString (blacklist != null) ''

     

       
522
       
522
       
 
       
          blacklist {

     

       
523
       
523
       
 
       
          ${indentLines 2 blacklist}

     

       
524
       
524
       
 
       
          }

     

       
525
       
525
       
 
       
        ''}

     

       
526
       
526
       
-
       
        ${optionalString (!isNull blacklist_exceptions) ''

     

       
526
       
526
       
+
       
        ${optionalString (blacklist_exceptions != null) ''

     

       
527
       
527
       
 
       
          blacklist_exceptions {

     

       
528
       
528
       
 
       
          ${indentLines 2 blacklist_exceptions}

     

       
529
       
529
       
 
       
          }

     

       
530
       
530
       
 
       
        ''}

     

       
531
       
531
       
-
       
        ${optionalString (!isNull overrides) ''

     

       
531
       
531
       
+
       
        ${optionalString (overrides != null) ''

     

       
532
       
532
       
 
       
          overrides {

     

       
533
       
533
       
 
       
          ${indentLines 2 overrides}

     

       
534
       
534
       
 
       
          }

     

···

       
9
       
9
       
 
       
    listToValue = concatMapStringsSep ", " (generators.mkValueStringDefault { });

     

       
10
       
10
       
 
       
  };

     

       
11
       
11
       
 
       


     

       
12
       
12
       
-
       
  pkg = if isNull cfg.package then

     

       
12
       
12
       
+
       
  pkg = if cfg.package == null then

     

       
13
       
13
       
 
       
    pkgs.radicale

     

       
14
       
14
       
 
       
  else

     

       
15
       
15
       
 
       
    cfg.package;

     
···

       
117
       
117
       
 
       
      }

     

       
118
       
118
       
 
       
    ];

     

       
119
       
119
       
 
       


     

       
120
       
120
       
-
       
    warnings = optional (isNull cfg.package && versionOlder config.system.stateVersion "17.09") ''

     

       
120
       
120
       
+
       
    warnings = optional (cfg.package == null && versionOlder config.system.stateVersion "17.09") ''

     

       
121
       
121
       
 
       
      The configuration and storage formats of your existing Radicale

     

       
122
       
122
       
 
       
      installation might be incompatible with the newest version.

     

       
123
       
123
       
 
       
      For upgrade instructions see

     

       
124
       
124
       
 
       
      https://radicale.org/2.1.html#documentation/migration-from-1xx-to-2xx.

     

       
125
       
125
       
 
       
      Set services.radicale.package to suppress this warning.

     

       
126
       
126
       
-
       
    '' ++ optional (isNull cfg.package && versionOlder config.system.stateVersion "20.09") ''

     

       
126
       
126
       
+
       
    '' ++ optional (cfg.package == null && versionOlder config.system.stateVersion "20.09") ''

     

       
127
       
127
       
 
       
      The configuration format of your existing Radicale installation might be

     

       
128
       
128
       
 
       
      incompatible with the newest version.  For upgrade instructions see

     

       
129
       
129
       
 
       
      https://github.com/Kozea/Radicale/blob/3.0.6/NEWS.md#upgrade-checklist.

     

···

       
132
       
132
       
 
       


     

       
133
       
133
       
 
       
      requires = lib.mkIf (!(isPathType cfg.repository)) [ "network-online.target" ];

     

       
134
       
134
       
 
       


     

       
135
       
135
       
-
       
      environment.GIT_SSH_COMMAND = lib.mkIf (!(isNull cfg.sshKeyFile))

     

       
135
       
135
       
+
       
      environment.GIT_SSH_COMMAND = lib.mkIf (cfg.sshKeyFile != null)

     

       
136
       
136
       
 
       
        "${pkgs.openssh}/bin/ssh -i ${lib.escapeShellArg cfg.sshKeyFile}";

     

       
137
       
137
       
 
       


     

       
138
       
138
       
 
       
      restartIfChanged = false;

     

···

       
16
       
16
       
 
       
        if (any (str: k == str) secretKeys) then v

     

       
17
       
17
       
 
       
        else if isString v then "'${v}'"

     

       
18
       
18
       
 
       
        else if isBool v then boolToString v

     

       
19
       
19
       
-
       
        else if isNull v then "null"

     

       
19
       
19
       
+
       
        else if v == null then "null"

     

       
20
       
20
       
 
       
        else toString v

     

       
21
       
21
       
 
       
      ;

     

       
22
       
22
       
 
       
    in

     

···

       
10
       
10
       
 
       
  format = pkgs.formats.ini {

     

       
11
       
11
       
 
       
    mkKeyValue = key: value:

     

       
12
       
12
       
 
       
      let

     

       
13
       
13
       
-
       
        value' = if builtins.isNull value then

     

       
14
       
14
       
-
       
          ""

     

       
15
       
15
       
-
       
        else if builtins.isBool value then

     

       
16
       
16
       
-
       
          if value == true then "true" else "false"

     

       
17
       
17
       
-
       
        else

     

       
18
       
18
       
-
       
          toString value;

     

       
13
       
13
       
+
       
        value' = lib.optionalString (value != null)

     

       
14
       
14
       
+
       
          (if builtins.isBool value then

     

       
15
       
15
       
+
       
            if value == true then "true" else "false"

     

       
16
       
16
       
+
       
          else

     

       
17
       
17
       
+
       
            toString value);

     

       
19
       
18
       
 
       
      in "${key} = ${value'}";

     

       
20
       
19
       
 
       
  };

     

       
21
       
20
       
 
       


     

···

       
13
       
13
       
 
       
    };

     

       
14
       
14
       
 
       


     

       
15
       
15
       
 
       
  testScript = ''

     

       
16
       
16
       
+
       
      machine.start(allow_reboot = True)

     

       
17
       
17
       
+
       


     

       
16
       
18
       
 
       
      machine.wait_for_unit("multi-user.target")

     

       
17
       
19
       
 
       
      machine.wait_until_succeeds("pgrep -f 'agetty.*tty1'")

     

       
18
       
20
       
 
       
      machine.screenshot("postboot")

     
···

       
53
       
55
       
 
       
          machine.screenshot("getty")

     

       
54
       
56
       
 
       


     

       
55
       
57
       
 
       
      with subtest("Check whether ctrl-alt-delete works"):

     

       
56
       
56
       
-
       
          machine.send_key("ctrl-alt-delete")

     

       
57
       
57
       
-
       
          machine.wait_for_shutdown()

     

       
58
       
58
       
+
       
          boot_id1 = machine.succeed("cat /proc/sys/kernel/random/boot_id").strip()

     

       
59
       
59
       
+
       
          assert boot_id1 != ""

     

       
60
       
60
       
+
       


     

       
61
       
61
       
+
       
          machine.reboot()

     

       
62
       
62
       
+
       


     

       
63
       
63
       
+
       
          boot_id2 = machine.succeed("cat /proc/sys/kernel/random/boot_id").strip()

     

       
64
       
64
       
+
       
          assert boot_id2 != ""

     

       
65
       
65
       
+
       


     

       
66
       
66
       
+
       
          assert boot_id1 != boot_id2

     

       
58
       
67
       
 
       
  '';

     

       
59
       
68
       
 
       
})

     

···

       
58
       
58
       
 
       
}:

     

       
59
       
59
       
 
       
stdenv.mkDerivation rec {

     

       
60
       
60
       
 
       
  pname = "ardour";

     

       
61
       
61
       
-
       
  version = "7.1";

     

       
61
       
61
       
+
       
  version = "7.3";

     

       
62
       
62
       
 
       


     

       
63
       
63
       
 
       
  # We can't use `fetchFromGitea` here, as attempting to fetch release archives from git.ardour.org

     

       
64
       
64
       
 
       
  # result in an empty archive. See https://tracker.ardour.org/view.php?id=7328 for more info.

     

       
65
       
65
       
 
       
  src = fetchgit {

     

       
66
       
66
       
 
       
    url = "git://git.ardour.org/ardour/ardour.git";

     

       
67
       
67
       
 
       
    rev = version;

     

       
68
       
68
       
-
       
    hash = "sha256-eLF9n71tjdPA+ks0B8UonmPZqRgcZEA7ok79+m9PioU=";

     

       
68
       
68
       
+
       
    hash = "sha256-fDZGmKQ6qgENkq8NY/J67Jym+IXoOYs8DT4xyPXLcC4=";

     

       
69
       
69
       
 
       
  };

     

       
70
       
70
       
 
       


     

       
71
       
71
       
 
       
  bundledContent = fetchzip {

     

···

       
20
       
20
       
 
       
, cddbSupport ? true, libcddb ? null

     

       
21
       
21
       
 
       
, cdioSupport ? true, libcdio ? null, libcdio-paranoia ? null

     

       
22
       
22
       
 
       
, cueSupport ? true, libcue ? null

     

       
23
       
23
       
-
       
, discidSupport ? (!stdenv.isDarwin), libdiscid ? null

     

       
23
       
23
       
+
       
, discidSupport ? false, libdiscid ? null

     

       
24
       
24
       
 
       
, ffmpegSupport ? true, ffmpeg ? null

     

       
25
       
25
       
 
       
, flacSupport ? true, flac ? null

     

       
26
       
26
       
 
       
, madSupport ? true, libmad ? null

     

···

       
73
       
73
       
 
       
        error = sourceArgs.error or args.error or null;

     

       
74
       
74
       
 
       
        hasSource = lib.hasAttr variant args;

     

       
75
       
75
       
 
       
        pname = builtins.replaceStrings [ "@" ] [ "at" ] ename;

     

       
76
       
76
       
-
       
        broken = ! isNull error;

     

       
76
       
76
       
+
       
        broken = error != null;

     

       
77
       
77
       
 
       
      in

     

       
78
       
78
       
 
       
      if hasSource then

     

       
79
       
79
       
 
       
        lib.nameValuePair ename (

     

       
80
       
80
       
 
       
          self.callPackage ({ melpaBuild, fetchurl, ... }@pkgargs:

     

       
81
       
81
       
 
       
          melpaBuild {

     

       
82
       
82
       
 
       
            inherit pname ename commit;

     

       
83
       
83
       
-
       
            version = if isNull version then "" else

     

       
84
       
84
       
-
       
              lib.concatStringsSep "." (map toString

     

       
83
       
83
       
+
       
            version = lib.optionalString (version != null)

     

       
84
       
84
       
+
       
              (lib.concatStringsSep "." (map toString

     

       
85
       
85
       
 
       
                # Hack: Melpa archives contains versions with parse errors such as [ 4 4 -4 413 ] which should be 4.4-413

     

       
86
       
86
       
 
       
                # This filter method is still technically wrong, but it's computationally cheap enough and tapers over the issue

     

       
87
       
87
       
-
       
                (builtins.filter (n: n >= 0) version));

     

       
87
       
87
       
+
       
                (builtins.filter (n: n >= 0) version)));

     

       
88
       
88
       
 
       
            # TODO: Broken should not result in src being null (hack to avoid eval errors)

     

       
89
       
89
       
-
       
            src = if (isNull sha256 || broken) then null else

     

       
89
       
89
       
+
       
            src = if (sha256 == null || broken) then null else

     

       
90
       
90
       
 
       
              lib.getAttr fetcher (fetcherGenerators args sourceArgs);

     

       
91
       
91
       
-
       
            recipe = if isNull commit then null else

     

       
91
       
91
       
+
       
            recipe = if commit == null then null else

     

       
92
       
92
       
 
       
              fetchurl {

     

       
93
       
93
       
 
       
                name = pname + "-recipe";

     

       
94
       
94
       
 
       
                url = "https://raw.githubusercontent.com/melpa/melpa/${commit}/recipes/${ename}";

     

       
95
       
95
       
 
       
                inherit sha256;

     

       
96
       
96
       
 
       
              };

     

       
97
       
97
       
-
       
            packageRequires = lib.optionals (! isNull deps)

     

       
97
       
97
       
+
       
            packageRequires = lib.optionals (deps != null)

     

       
98
       
98
       
 
       
              (map (dep: pkgargs.${dep} or self.${dep} or null)

     

       
99
       
99
       
 
       
                   deps);

     

       
100
       
100
       
 
       
            meta = (sourceArgs.meta or {}) // {

     

···

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
mkDerivation rec {

     

       
6
       
6
       
 
       
  pname = "okteta";

     

       
7
       
7
       
-
       
  version = "0.26.9";

     

       
7
       
7
       
+
       
  version = "0.26.10";

     

       
8
       
8
       
 
       


     

       
9
       
9
       
 
       
  src = fetchurl {

     

       
10
       
10
       
 
       
    url = "mirror://kde/stable/okteta/${version}/src/${pname}-${version}.tar.xz";

     

       
11
       
11
       
-
       
    sha256 = "sha256-FoVMTU6Ug4IZrjEVpCujhf2lyH3GyYZayQ03dPjQX/s=";

     

       
11
       
11
       
+
       
    sha256 = "sha256-KKYU9+DDK0kXperKfgxuysqHsTGRq1NKtAT1Vps8M/o=";

     

       
12
       
12
       
 
       
  };

     

       
13
       
13
       
 
       


     

       
14
       
14
       
 
       
  nativeBuildInputs = [ qtscript extra-cmake-modules kdoctools ];

     

···

       
753
       
753
       
 
       
        mktplcRef = {

     

       
754
       
754
       
 
       
          name = "vscode-eslint";

     

       
755
       
755
       
 
       
          publisher = "dbaeumer";

     

       
756
       
756
       
-
       
          version = "2.2.6";

     

       
757
       
757
       
-
       
          sha256 = "sha256-1yZeyLrXuubhKzobWcd00F/CdU824uJDTkB6qlHkJlQ=";

     

       
756
       
756
       
+
       
          version = "2.4.0";

     

       
757
       
757
       
+
       
          sha256 = "sha256-7MUQJkLPOF3oO0kpmfP3bWbS3aT7J0RF7f74LW55BQs=";

     

       
758
       
758
       
 
       
        };

     

       
759
       
759
       
 
       
        meta = with lib; {

     

       
760
       
760
       
 
       
          changelog = "https://marketplace.visualstudio.com/items/dbaeumer.vscode-eslint/changelog";

     
···

       
927
       
927
       
 
       
        mktplcRef = {

     

       
928
       
928
       
 
       
          name = "gitlens";

     

       
929
       
929
       
 
       
          publisher = "eamodio";

     

       
930
       
930
       
-
       
          version = "2023.3.1505";

     

       
931
       
931
       
-
       
          sha256 = "sha256-USAbI2x6UftNfIEJy2Pbqa/BTYJnUBCNjsdm0Pfrz0o=";

     

       
930
       
930
       
+
       
          # Stable versions are listed on the GitHub releases page and use a

     

       
931
       
931
       
+
       
          # semver scheme, contrary to preview versions which are listed on

     

       
932
       
932
       
+
       
          # the VSCode Marketplace and use a calver scheme. We should avoid

     

       
933
       
933
       
+
       
          # using preview versions, because they expire after two weeks.

     

       
934
       
934
       
+
       
          version = "13.3.2";

     

       
935
       
935
       
+
       
          sha256 = "sha256-4o4dmjio/I531szcoeGPVtfrNAyRAPJRrmsNny/PY2w=";

     

       
932
       
936
       
 
       
        };

     

       
933
       
937
       
 
       
        meta = with lib; {

     

       
934
       
938
       
 
       
          changelog = "https://marketplace.visualstudio.com/items/eamodio.gitlens/changelog";

     

···

       
2
       
2
       
 
       
#  -  <https://github.com/msteen/nixos-vsliveshare/blob/master/pkgs/vsliveshare/default.nix>

     

       
3
       
3
       
 
       
#  -  <https://github.com/NixOS/nixpkgs/issues/41189>

     

       
4
       
4
       
 
       
{ lib, gccStdenv, vscode-utils

     

       
5
       
5
       
-
       
, jq, autoPatchelfHook, bash, makeWrapper

     

       
6
       
6
       
-
       
, dotnet-sdk_3, curl, gcc, icu, libkrb5, libsecret, libunwind, libX11, lttng-ust, openssl, util-linux, zlib

     

       
7
       
7
       
-
       
, desktop-file-utils, xprop, xsel

     

       
5
       
5
       
+
       
, autoPatchelfHook, bash, makeWrapper

     

       
6
       
6
       
+
       
, curl, gcc, libsecret, libunwind, libX11, lttng-ust, util-linux

     

       
7
       
7
       
+
       
, desktop-file-utils, xsel

     

       
8
       
8
       
 
       
}:

     

       
9
       
9
       
 
       


     

       
10
       
10
       
 
       
let

     

       
11
       
11
       
 
       
  # https://docs.microsoft.com/en-us/visualstudio/liveshare/reference/linux#install-prerequisites-manually

     

       
12
       
12
       
 
       
  libs = [

     

       
13
       
13
       
-
       
    # .NET Core

     

       
14
       
14
       
-
       
    openssl

     

       
15
       
15
       
-
       
    libkrb5

     

       
16
       
16
       
-
       
    zlib

     

       
17
       
17
       
-
       
    icu

     

       
18
       
18
       
-
       


     

       
19
       
13
       
 
       
    # Credential Storage

     

       
20
       
14
       
 
       
    libsecret

     

       
21
       
15
       
 
       


     
···

       
36
       
30
       
 
       
  mktplcRef = {

     

       
37
       
31
       
 
       
    name = "vsliveshare";

     

       
38
       
32
       
 
       
    publisher = "ms-vsliveshare";

     

       
39
       
39
       
-
       
    version = "1.0.5043";

     

       
40
       
40
       
-
       
    sha256 = "OdFOFvidUV/trySHvF8iELPNVP2kq8+vZQ4q4Nf7SiQ=";

     

       
33
       
33
       
+
       
    version = "1.0.5834";

     

       
34
       
34
       
+
       
    sha256 = "sha256-+KfivY8W1VtUxhdXuUKI5e1elo6Ert1Tsf4xVXsKB3Y=";

     

       
41
       
35
       
 
       
  };

     

       
42
       
42
       
-
       
}).overrideAttrs({ nativeBuildInputs ? [], buildInputs ? [], ... }: {

     

       
43
       
43
       
-
       
  nativeBuildInputs = nativeBuildInputs ++ [

     

       
44
       
44
       
-
       
    jq

     

       
45
       
45
       
-
       
    autoPatchelfHook

     

       
46
       
46
       
-
       
    makeWrapper

     

       
47
       
47
       
-
       
  ];

     

       
36
       
36
       
+
       
}).overrideAttrs({ buildInputs ? [], ... }: {

     

       
48
       
37
       
 
       
  buildInputs = buildInputs ++ libs;

     

       
49
       
38
       
 
       


     

       
50
       
39
       
 
       
  # Using a patch file won't work, because the file changes too often, causing the patch to fail on most updates.

     

       
51
       
40
       
 
       
  # Rather than patching the calls to functions, we modify the functions to return what we want,

     

       
52
       
41
       
 
       
  # which is less likely to break in the future.

     

       
53
       
42
       
 
       
  postPatch = ''

     

       
54
       
54
       
-
       
    sed -i \

     

       
55
       
55
       
-
       
      -e 's/updateExecutablePermissionsAsync() {/& return;/' \

     

       
56
       
56
       
-
       
      -e 's/isInstallCorrupt(traceSource, manifest) {/& return false;/' \

     

       
57
       
57
       
-
       
      out/prod/extension-prod.js

     

       
58
       
58
       
-
       


     

       
59
       
59
       
-
       
    declare ext_unique_id

     

       
60
       
60
       
-
       
    ext_unique_id="$(basename "$out")"

     

       
61
       
61
       
-
       


     

       
62
       
62
       
-
       
    # Fix extension attempting to write to 'modifiedInternalSettings.json'.

     

       
63
       
63
       
-
       
    # Move this write to the tmp directory indexed by the nix store basename.

     

       
64
       
64
       
-
       
    substituteInPlace out/prod/extension-prod.js \

     

       
65
       
65
       
-
       
      --replace "path.resolve(constants_1.EXTENSION_ROOT_PATH, './modifiedInternalSettings.json')" \

     

       
66
       
66
       
-
       
                "path.join(os.tmpdir(), '$ext_unique_id-modifiedInternalSettings.json')"

     

       
67
       
67
       
-
       


     

       
68
       
68
       
-
       
    # Fix extension attempting to write to 'vsls-agent.lock'.

     

       
69
       
69
       
-
       
    # Move this write to the tmp directory indexed by the nix store basename.

     

       
70
       
70
       
-
       
    substituteInPlace out/prod/extension-prod.js \

     

       
71
       
71
       
-
       
      --replace "path + '.lock'" \

     

       
72
       
72
       
-
       
                "__webpack_require__('path').join(__webpack_require__('os').tmpdir(), '$ext_unique_id-vsls-agent.lock')"

     

       
73
       
73
       
-
       


     

       
74
       
74
       
-
       
    # Hardcode executable paths

     

       
75
       
75
       
-
       
    echo '#!/bin/sh' >node_modules/@vsliveshare/vscode-launcher-linux/check-reqs.sh

     

       
76
       
76
       
-
       
    substituteInPlace node_modules/@vsliveshare/vscode-launcher-linux/install.sh \

     

       
77
       
77
       
-
       
      --replace desktop-file-install ${desktop-file-utils}/bin/desktop-file-install

     

       
78
       
78
       
-
       
    substituteInPlace node_modules/@vsliveshare/vscode-launcher-linux/uninstall.sh \

     

       
79
       
79
       
-
       
      --replace update-desktop-database ${desktop-file-utils}/bin/update-desktop-database

     

       
80
       
80
       
-
       
    substituteInPlace node_modules/@vsliveshare/vscode-launcher-linux/vsls-launcher \

     

       
81
       
81
       
-
       
      --replace /bin/bash ${bash}/bin/bash

     

       
82
       
82
       
-
       
    substituteInPlace out/prod/extension-prod.js \

     

       
83
       
83
       
-
       
      --replace xprop ${xprop}/bin/xprop \

     

       
43
       
43
       
+
       
    substituteInPlace extension.js \

     

       
84
       
44
       
 
       
      --replace "'xsel'" "'${xsel}/bin/xsel'"

     

       
85
       
85
       
-
       
  '';

     

       
86
       
86
       
-
       


     

       
87
       
87
       
-
       
  postInstall = ''

     

       
88
       
88
       
-
       
    cd $out/share/vscode/extensions/ms-vsliveshare.vsliveshare

     

       
89
       
89
       
-
       


     

       
90
       
90
       
-
       
    bash -s <<ENDSUBSHELL

     

       
91
       
91
       
-
       
    shopt -s extglob

     

       
92
       
92
       
-
       


     

       
93
       
93
       
-
       
    # A workaround to prevent the journal filling up due to diagnostic logging.

     

       
94
       
94
       
-
       
    # See: https://github.com/MicrosoftDocs/live-share/issues/1272

     

       
95
       
95
       
-
       
    # See: https://unix.stackexchange.com/questions/481799/how-to-prevent-a-process-from-writing-to-the-systemd-journal

     

       
96
       
96
       
-
       
    gcc -fPIC -shared -ldl -o dotnet_modules/noop-syslog.so ${./noop-syslog.c}

     

       
97
       
97
       
-
       


     

       
98
       
98
       
-
       
    # Normally the copying of the right executables is done externally at a later time,

     

       
99
       
99
       
-
       
    # but we want it done at installation time.

     

       
100
       
100
       
-
       
    cp dotnet_modules/exes/linux-x64/* dotnet_modules

     

       
101
       
101
       
-
       


     

       
102
       
102
       
-
       
    # The required executables are already copied over,

     

       
103
       
103
       
-
       
    # and the other runtimes won't be used and thus are just a waste of space.

     

       
104
       
104
       
-
       
    rm -r dotnet_modules/exes dotnet_modules/runtimes/!(linux-x64|unix)

     

       
105
       
105
       
-
       


     

       
106
       
106
       
-
       
    # Not all executables and libraries are executable, so make sure that they are.

     

       
107
       
107
       
-
       
    jq <package.json '.executables.linux[]' -r | xargs chmod +x

     

       
108
       
108
       
-
       


     

       
109
       
109
       
-
       
    # Lock the extension downloader.

     

       
110
       
110
       
-
       
    touch install-linux.Lock externalDeps-linux.Lock

     

       
111
       
111
       
-
       
    ENDSUBSHELL

     

       
112
       
112
       
-
       
  '';

     

       
113
       
113
       
-
       


     

       
114
       
114
       
-
       
  postFixup = ''

     

       
115
       
115
       
-
       
    # We cannot use `wrapProgram`, because it will generate a relative path,

     

       
116
       
116
       
-
       
    # which will break when copying over the files.

     

       
117
       
117
       
-
       
    mv dotnet_modules/vsls-agent{,-wrapped}

     

       
118
       
118
       
-
       
    makeWrapper $PWD/dotnet_modules/vsls-agent{-wrapped,} \

     

       
119
       
119
       
-
       
      --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath libs}" \

     

       
120
       
120
       
-
       
      --set LD_PRELOAD $PWD/dotnet_modules/noop-syslog.so \

     

       
121
       
121
       
-
       
      --set DOTNET_ROOT ${dotnet-sdk_3}

     

       
122
       
45
       
 
       
  '';

     

       
123
       
46
       
 
       


     

       
124
       
47
       
 
       
  meta = with lib; {

     

···

       
1
       
1
       
-
       
void syslog(int priority, const char *format, ...) { }

     

···

       
1
       
1
       
-
       
{ lib, stdenv

     

       
1
       
1
       
+
       
{ lib

     

       
2
       
2
       
+
       
, stdenv

     

       
2
       
3
       
 
       
, fetchurl

     

       
4
       
4
       
+
       
, fetchpatch2

     

       
3
       
5
       
 
       
, meson

     

       
4
       
6
       
 
       
, ninja

     

       
5
       
7
       
 
       
, gtk3

     
···

       
31
       
33
       
 
       
, gobject-introspection

     

       
32
       
34
       
 
       
, itstool

     

       
33
       
35
       
 
       
, libsecret

     

       
36
       
36
       
+
       
, libportal-gtk3

     

       
34
       
37
       
 
       
, gsettings-desktop-schemas

     

       
35
       
38
       
 
       
, python3

     

       
36
       
39
       
 
       
}:

     
···

       
39
       
42
       
 
       


     

       
40
       
43
       
 
       
stdenv.mkDerivation rec {

     

       
41
       
44
       
 
       
  pname = "shotwell";

     

       
42
       
42
       
-
       
  version = "0.31.5";

     

       
45
       
45
       
+
       
  version = "0.31.7";

     

       
43
       
46
       
 
       


     

       
44
       
47
       
 
       
  src = fetchurl {

     

       
45
       
48
       
 
       
    url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz";

     

       
46
       
46
       
-
       
    sha256 = "sha256-OwSPxs6ZsjLR4OqbjbB0CDyGyI07bWMTaiz4IXqkXBk=";

     

       
49
       
49
       
+
       
    sha256 = "sha256-gPCj2HVS+L3vpeNig77XZ9AFdtqMyWpEo9NKQjXEmeA=";

     

       
47
       
50
       
 
       
  };

     

       
48
       
51
       
 
       


     

       
52
       
52
       
+
       
  patches = [

     

       
53
       
53
       
+
       
    # Fix build with vala 0.56.4, can be removed on next update

     

       
54
       
54
       
+
       
    # https://gitlab.gnome.org/GNOME/shotwell/-/merge_requests/69

     

       
55
       
55
       
+
       
    (fetchpatch2 {

     

       
56
       
56
       
+
       
      url = "https://gitlab.gnome.org/GNOME/shotwell/-/commit/cd82759231e5ece2fa0dea40397c9051d15fd5c2.patch";

     

       
57
       
57
       
+
       
      hash = "sha256-Vy2kvUlmPdEEuPB1RTcI5pGYNveeiQ+lId0YVlWo4wU=";

     

       
58
       
58
       
+
       
    })

     

       
59
       
59
       
+
       
  ];

     

       
60
       
60
       
+
       


     

       
49
       
61
       
 
       
  nativeBuildInputs = [

     

       
50
       
62
       
 
       
    meson

     

       
51
       
63
       
 
       
    ninja

     
···

       
86
       
98
       
 
       
    gcr

     

       
87
       
99
       
 
       
    gnome.adwaita-icon-theme

     

       
88
       
100
       
 
       
    libsecret

     

       
101
       
101
       
+
       
    libportal-gtk3

     

       
89
       
102
       
 
       
  ];

     

       
90
       
103
       
 
       


     

       
91
       
104
       
 
       
  postPatch = ''

     

···

       
6
       
6
       
 
       
, qmake

     

       
7
       
7
       
 
       
, qtbase

     

       
8
       
8
       
 
       
, qttools

     

       
9
       
9
       
-
       
, qtwayland

     

       
10
       
9
       
 
       
, openssl

     

       
11
       
10
       
 
       
, libscrypt

     

       
12
       
11
       
 
       
, wrapQtAppsHook

     
···

       
23
       
22
       
 
       
    sha256 = "sha256-VQ1ZkXaZ5sUbtWa/GreTr5uXvnZ2Go6owJ2ZBK25zns=";

     

       
24
       
23
       
 
       
  };

     

       
25
       
24
       
 
       


     

       
26
       
26
       
-
       
  buildInputs = [ qtbase qtwayland libX11 libXtst openssl libscrypt ];

     

       
25
       
25
       
+
       
  buildInputs = [ qtbase libX11 libXtst openssl libscrypt ];

     

       
27
       
26
       
 
       
  nativeBuildInputs = [ qmake qttools wrapQtAppsHook ];

     

       
28
       
27
       
 
       


     

       
29
       
28
       
 
       
  # Upstream install is mostly defunct. It hardcodes target.path and doesn't

     

···

       
20
       
20
       
 
       
}:

     

       
21
       
21
       
 
       


     

       
22
       
22
       
 
       
let

     

       
23
       
23
       
-
       
  version = "3.0.0-571";

     

       
23
       
23
       
+
       
  version = "3.1.0-9572";

     

       
24
       
24
       
 
       
  srcs = {

     

       
25
       
25
       
 
       
    x86_64-linux = fetchurl {

     

       
26
       
26
       
-
       
      url = "https://dldir1.qq.com/qqfile/qq/QQNT/c005c911/linuxqq_${version}_amd64.deb";

     

       
27
       
27
       
-
       
      sha256 = "sha256-8KcUhZwgeFzGyrQITWnJUzEPGZOCj0LIHLmRuKqkgmQ=";

     

       
26
       
26
       
+
       
      url = "https://dldir1.qq.com/qqfile/qq/QQNT/4b2e3220/linuxqq_${version}_amd64.deb";

     

       
27
       
27
       
+
       
      sha256 = "sha256-xqbyyU4JSlYbAkJ/tqLoVPKfQvxYnMySRx7yV1EtDhM=";

     

       
28
       
28
       
 
       
    };

     

       
29
       
29
       
 
       
    aarch64-linux = fetchurl {

     

       
30
       
30
       
-
       
      url = "https://dldir1.qq.com/qqfile/qq/QQNT/c005c911/linuxqq_${version}_arm64.deb";

     

       
31
       
31
       
-
       
      sha256 = "sha256-LvE+Pryq4KLu+BFYVrGiTwBdgOrBguPHQd73MMFlfiY=";

     

       
30
       
30
       
+
       
      url = "https://dldir1.qq.com/qqfile/qq/QQNT/4b2e3220/linuxqq_${version}_arm64.deb";

     

       
31
       
31
       
+
       
      sha256 = "sha256-ItZqhV9OmycdfRhlzP2llrzcIZvaiUC/LJiDJ/kNIkE=";

     

       
32
       
32
       
 
       
    };

     

       
33
       
33
       
 
       
  };

     

       
34
       
34
       
 
       
  src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");

     

···

       
41
       
41
       
 
       


     

       
42
       
42
       
 
       
let

     

       
43
       
43
       
 
       
  inherit (stdenv.hostPlatform) system;

     

       
44
       
44
       
-
       
  throwSystem = throw "Unsupported system: ${system}";

     

       
44
       
44
       
+
       
  throwSystem = throw "slack does not support system: ${system}";

     

       
45
       
45
       
 
       


     

       
46
       
46
       
 
       
  pname = "slack";

     

       
47
       
47
       
 
       


     

···

       
220
       
220
       
 
       
    changelog = "https://github.com/kotatogram/kotatogram-desktop/releases/tag/k{version}";

     

       
221
       
221
       
 
       
    maintainers = with maintainers; [ ilya-fedin ];

     

       
222
       
222
       
 
       
    # never built on aarch64-darwin since first introduction in nixpkgs

     

       
223
       
223
       
-
       
    broken = (stdenv.isDarwin && stdenv.isAarch64) || (stdenv.isLinux && stdenv.isAarch64);

     

       
223
       
223
       
+
       
    broken = stdenv.isDarwin && stdenv.isAarch64;

     

       
224
       
224
       
 
       
  };

     

       
225
       
225
       
 
       
}

     

···

       
5
       
5
       
 
       


     

       
6
       
6
       
 
       
  thunderbird-102 = (buildMozillaMach rec {

     

       
7
       
7
       
 
       
    pname = "thunderbird";

     

       
8
       
8
       
-
       
    version = "102.8.0";

     

       
8
       
8
       
+
       
    version = "102.9.0";

     

       
9
       
9
       
 
       
    application = "comm/mail";

     

       
10
       
10
       
 
       
    applicationName = "Mozilla Thunderbird";

     

       
11
       
11
       
 
       
    binaryName = pname;

     

       
12
       
12
       
 
       
    src = fetchurl {

     

       
13
       
13
       
 
       
      url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz";

     

       
14
       
14
       
-
       
      sha512 = "2431eb8799184b261609c96bed3c9368bec9035a831aa5f744fa89e48aedb130385b268dd90f03bbddfec449dc3e5fad1b5f8727fe9e11e1d1f123a81b97ddf8";

     

       
14
       
14
       
+
       
      sha512 = "0de88cef22e7b239804e27705b577dd34a86487512bb2af29804b358d056628c14034a34cbbdded75612bda984fac2c04d116cca8040b9212a7fb0206c07c440";

     

       
15
       
15
       
 
       
    };

     

       
16
       
16
       
 
       
    extraPatches = [

     

       
17
       
17
       
 
       
      # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`.

     

···

       
13
       
13
       
 
       
, librsvg

     

       
14
       
14
       
 
       
, libspnav

     

       
15
       
15
       
 
       
, libuuid

     

       
16
       
16
       
-
       
, opencascade

     

       
16
       
16
       
+
       
, opencascade-occt

     

       
17
       
17
       
 
       
, pkg-config

     

       
18
       
18
       
 
       
, podofo

     

       
19
       
19
       
 
       
, python3

     
···

       
44
       
44
       
 
       
    librsvg

     

       
45
       
45
       
 
       
    libspnav

     

       
46
       
46
       
 
       
    libuuid

     

       
47
       
47
       
-
       
    opencascade

     

       
47
       
47
       
+
       
    opencascade-occt

     

       
48
       
48
       
 
       
    podofo

     

       
49
       
49
       
 
       
    python3

     

       
50
       
50
       
 
       
    sqlite

     
···

       
57
       
57
       
 
       
    wrapGAppsHook

     

       
58
       
58
       
 
       
  ];

     

       
59
       
59
       
 
       


     

       
60
       
60
       
-
       
  CASROOT = opencascade;

     

       
60
       
60
       
+
       
  CASROOT = opencascade-occt;

     

       
61
       
61
       
 
       


     

       
62
       
62
       
 
       
  installFlags = [

     

       
63
       
63
       
 
       
    "INSTALL=${coreutils}/bin/install"

     

···

       
1
       
1
       
 
       
{ stdenv, fetchurl, lib, expat, octave, libxml2, texinfo, zip }:

     

       
2
       
2
       
 
       
stdenv.mkDerivation rec {

     

       
3
       
3
       
 
       
  pname = "gama";

     

       
4
       
4
       
-
       
  version = "2.23";

     

       
4
       
4
       
+
       
  version = "2.24";

     

       
5
       
5
       
 
       


     

       
6
       
6
       
 
       
  src = fetchurl {

     

       
7
       
7
       
 
       
    url = "mirror://gnu/${pname}/${pname}-${version}.tar.gz";

     

       
8
       
8
       
-
       
    sha256 = "sha256-OKVAgmHdhQoS3kCwclE9ljON3H2NVCCvpR2hgwfqnA0=";

     

       
8
       
8
       
+
       
    sha256 = "sha256-AIRqBSO71c26TeQwxjfAGIy8YQddF4tq+ZnWztroyRM=";

     

       
9
       
9
       
 
       
  };

     

       
10
       
10
       
 
       


     

       
11
       
11
       
 
       
  buildInputs = [ expat ];

     

···

       
70
       
70
       
 
       
    substituteInPlace plugins/micromega/sos.ml --replace "; csdp" "; ${csdp}/bin/csdp"

     

       
71
       
71
       
 
       
    substituteInPlace plugins/micromega/coq_micromega.ml --replace "System.is_in_system_path \"csdp\"" "true"

     

       
72
       
72
       
 
       
  '';

     

       
73
       
73
       
-
       
  ocamlPackages = if !isNull customOCamlPackages then customOCamlPackages

     

       
73
       
73
       
+
       
  ocamlPackages = if customOCamlPackages != null then customOCamlPackages

     

       
74
       
74
       
 
       
    else with versions; switch coq-version [

     

       
75
       
75
       
 
       
      { case = range "8.16" "8.17"; out = ocamlPackages_4_14; }

     

       
76
       
76
       
 
       
      { case = range "8.14" "8.15"; out = ocamlPackages_4_12; }

     

···

       
76
       
76
       
 
       


     

       
77
       
77
       
 
       
let

     

       
78
       
78
       
 
       
  defaultPathOriginal = "/bin:/usr/bin:/sbin:/usr/sbin:/usr/local/bin:/usr/local/sbin";

     

       
79
       
79
       
-
       
  privileged-un-utils = if ((isNull newuidmapPath) && (isNull newgidmapPath)) then null else

     

       
79
       
79
       
+
       
  privileged-un-utils = if ((newuidmapPath == null) && (newgidmapPath == null)) then null else

     

       
80
       
80
       
 
       
  (runCommandLocal "privileged-un-utils" { } ''

     

       
81
       
81
       
 
       
    mkdir -p "$out/bin"

     

       
82
       
82
       
 
       
    ln -s ${lib.escapeShellArg newuidmapPath} "$out/bin/newuidmap"

     
···

       
212
       
212
       
 
       
        rm "$file"

     

       
213
       
213
       
 
       
      done

     

       
214
       
214
       
 
       
    ''}

     

       
215
       
215
       
-
       
    ${lib.optionalString enableSuid (lib.warnIf (isNull starterSuidPath) "${projectName}: Null starterSuidPath when enableSuid produces non-SUID-ed starter-suid and run-time permission denial." ''

     

       
215
       
215
       
+
       
    ${lib.optionalString enableSuid (lib.warnIf (starterSuidPath == null) "${projectName}: Null starterSuidPath when enableSuid produces non-SUID-ed starter-suid and run-time permission denial." ''

     

       
216
       
216
       
 
       
      chmod +x $out/libexec/${projectName}/bin/starter-suid

     

       
217
       
217
       
 
       
    '')}

     

       
218
       
218
       
-
       
    ${lib.optionalString (enableSuid && !isNull starterSuidPath) ''

     

       
218
       
218
       
+
       
    ${lib.optionalString (enableSuid && (starterSuidPath != null)) ''

     

       
219
       
219
       
 
       
      mv "$out"/libexec/${projectName}/bin/starter-suid{,.orig}

     

       
220
       
220
       
 
       
      ln -s ${lib.escapeShellArg starterSuidPath} "$out/libexec/${projectName}/bin/starter-suid"

     

       
221
       
221
       
 
       
    ''}

     

···

       
1
       
1
       
-
       
{ pcre, pcre2, picom, lib, fetchFromGitHub }:

     

       
1
       
1
       
+
       
{ pcre, pcre2, libXinerama, picom, lib, fetchFromGitHub }:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
picom.overrideAttrs (oldAttrs: rec {

     

       
4
       
4
       
 
       
  pname = "picom-next";

     

       
5
       
5
       
-
       
  version = "unstable-2022-12-23";

     

       
6
       
6
       
-
       
  buildInputs = [ pcre2 ] ++ lib.remove pcre oldAttrs.buildInputs;

     

       
5
       
5
       
+
       
  version = "unstable-2023-01-29";

     

       
6
       
6
       
+
       
  buildInputs = [ pcre2 ] ++ lib.remove libXinerama (lib.remove pcre oldAttrs.buildInputs);

     

       
7
       
7
       
 
       
  src = fetchFromGitHub {

     

       
8
       
8
       
 
       
    owner = "yshui";

     

       
9
       
9
       
 
       
    repo = "picom";

     

       
10
       
10
       
-
       
    rev = "60ac2b64db78363fe04189cc734daea3d721d87e";

     

       
11
       
11
       
-
       
    sha256 = "09s8kgczks01xbvg3qxqi2rz3lkzgdfyvhrj30mg6n11b6xfgi0d";

     

       
10
       
10
       
+
       
    rev = "cee12875625465292bc11bf09dc8ab117cae75f4";

     

       
11
       
11
       
+
       
    sha256 = "sha256-lVwBwOvzn4ro1jInRuNvn1vQuwUHUp4MYrDaFRmW9pc=";

     

       
12
       
12
       
 
       
  };

     

       
13
       
13
       
 
       
  meta.maintainers = with lib.maintainers; oldAttrs.meta.maintainers ++ [ GKasparov ];

     

       
14
       
14
       
 
       
})

     

···

       
52
       
52
       
 
       
      inherit release releaseRev;

     

       
53
       
53
       
 
       
      location = { inherit domain owner repo; };

     

       
54
       
54
       
 
       
    } // optionalAttrs (args?fetcher) {inherit fetcher;});

     

       
55
       
55
       
-
       
  fetched = fetch (if !isNull version then version else defaultVersion);

     

       
55
       
55
       
+
       
  fetched = fetch (if version != null then version else defaultVersion);

     

       
56
       
56
       
 
       
  display-pkg = n: sep: v:

     

       
57
       
57
       
 
       
    let d = displayVersion.${n} or (if sep == "" then ".." else true); in

     

       
58
       
58
       
 
       
    n + optionalString (v != "" && v != null) (switch d [

     

···

       
8
       
8
       
 
       
        fmt = if args?sha256 then "zip" else "tarball";

     

       
9
       
9
       
 
       
        pr  = match "^#(.*)$" rev;

     

       
10
       
10
       
 
       
        url = switch-if [

     

       
11
       
11
       
-
       
          { cond = isNull pr && !isNull (match "^github.*" domain);

     

       
11
       
11
       
+
       
          { cond = pr == null && (match "^github.*" domain) != null;

     

       
12
       
12
       
 
       
            out = "https://${domain}/${owner}/${repo}/archive/${rev}.${ext}"; }

     

       
13
       
13
       
-
       
          { cond = !isNull pr && !isNull (match "^github.*" domain);

     

       
13
       
13
       
+
       
          { cond = pr != null && (match "^github.*" domain) != null;

     

       
14
       
14
       
 
       
            out = "https://api.${domain}/repos/${owner}/${repo}/${fmt}/pull/${head pr}/head"; }

     

       
15
       
15
       
-
       
          { cond = isNull pr && !isNull (match "^gitlab.*" domain);

     

       
15
       
15
       
+
       
          { cond = pr == null && (match "^gitlab.*" domain) != null;

     

       
16
       
16
       
 
       
            out = "https://${domain}/${owner}/${repo}/-/archive/${rev}/${repo}-${rev}.${ext}"; }

     

       
17
       
17
       
-
       
          { cond = !isNull (match "(www.)?mpi-sws.org" domain);

     

       
17
       
17
       
+
       
          { cond = (match "(www.)?mpi-sws.org" domain) != null;

     

       
18
       
18
       
 
       
            out = "https://www.mpi-sws.org/~${owner}/${repo}/download/${repo}-${rev}.${ext}";}

     

       
19
       
19
       
 
       
        ] (throw "meta-fetch: no fetcher found for domain ${domain} on ${rev}");

     

       
20
       
20
       
 
       
        fetch = x: if args?sha256 then fetchzip (x // { inherit sha256; }) else fetchTarball x;

     

···

       
89
       
89
       
 
       
  renderSection = sectionName: attrs:

     

       
90
       
90
       
 
       
    lib.pipe attrs [

     

       
91
       
91
       
 
       
      (lib.mapAttrsToList renderLine)

     

       
92
       
92
       
-
       
      (builtins.filter (v: !isNull v))

     

       
92
       
92
       
+
       
      (builtins.filter (v: v != null))

     

       
93
       
93
       
 
       
      (builtins.concatStringsSep "\n")

     

       
94
       
94
       
 
       
      (section: ''

     

       
95
       
95
       
 
       
        [${sectionName}]

     

···

       
49
       
49
       
 
       
    runHook preInstall

     

       
50
       
50
       
 
       
    bash install.sh -d $out/share/themes -t all \

     

       
51
       
51
       
 
       
      ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} \

     

       
52
       
52
       
-
       
      ${lib.optionalString (!isNull border-radius) ("--round " + builtins.toString border-radius + "px")}

     

       
52
       
52
       
+
       
      ${lib.optionalString (border-radius != null) ("--round " + builtins.toString border-radius + "px")}

     

       
53
       
53
       
 
       
    ${lib.optionalString withWallpapers ''

     

       
54
       
54
       
 
       
      mkdir -p $out/share/backgrounds

     

       
55
       
55
       
 
       
      cp src/wallpaper/{1080p,2k,4k}.jpg $out/share/backgrounds

     

···

       
2
       
2
       
 
       
, lib

     

       
3
       
3
       
 
       
, fetchurl

     

       
4
       
4
       
 
       
, unzip

     

       
5
       
5
       
-
       
, version ? "2.18.0"

     

       
5
       
5
       
+
       
, runCommand

     

       
6
       
6
       
+
       
, darwin

     

       
7
       
7
       
+
       
# we need a way to build other dart versions

     

       
8
       
8
       
+
       
# than the latest, because flutter might want

     

       
9
       
9
       
+
       
# another version

     

       
10
       
10
       
+
       
, version ? "2.19.3"

     

       
6
       
11
       
 
       
, sources ? let

     

       
7
       
12
       
 
       
    base = "https://storage.googleapis.com/dart-archive/channels";

     

       
8
       
13
       
 
       
    x86_64 = "x64";

     

       
9
       
14
       
 
       
    i686 = "ia32";

     

       
10
       
15
       
 
       
    aarch64 = "arm64";

     

       
11
       
11
       
-
       
    # Make sure that if the user overrides version parameter they're

     

       
12
       
12
       
-
       
    # also need to override sources, to avoid mistakes

     

       
13
       
13
       
-
       
    version = "2.18.0";

     

       
14
       
14
       
-
       
  in

     

       
16
       
16
       
+
       
in

     

       
15
       
17
       
 
       
  {

     

       
16
       
18
       
 
       
    "${version}-aarch64-darwin" = fetchurl {

     

       
17
       
19
       
 
       
      url = "${base}/stable/release/${version}/sdk/dartsdk-macos-${aarch64}-release.zip";

     
···

       
39
       
41
       
 
       
assert version != null && version != "";

     

       
40
       
42
       
 
       
assert sources != null && (builtins.isAttrs sources);

     

       
41
       
43
       
 
       


     

       
42
       
42
       
-
       
stdenv.mkDerivation {

     

       
44
       
44
       
+
       
stdenv.mkDerivation (finalAttrs: {

     

       
43
       
45
       
 
       
  pname = "dart";

     

       
44
       
46
       
 
       
  inherit version;

     

       
45
       
47
       
 
       


     
···

       
56
       
58
       
 
       
  '';

     

       
57
       
59
       
 
       


     

       
58
       
60
       
 
       
  libPath = lib.makeLibraryPath [ stdenv.cc.cc ];

     

       
61
       
61
       
+
       
  dontStrip = true;

     

       
62
       
62
       
+
       
  passthru.tests = {

     

       
63
       
63
       
+
       
    testCreate = runCommand "dart-test-create" { nativeBuildInputs = [ finalAttrs.finalPackage ]; } ''

     

       
64
       
64
       
+
       
      PROJECTNAME="dart_test_project"

     

       
65
       
65
       
+
       
      dart create --no-pub $PROJECTNAME

     

       
59
       
66
       
 
       


     

       
60
       
60
       
-
       
  dontStrip = true;

     

       
67
       
67
       
+
       
      [[ -d $PROJECTNAME ]]

     

       
68
       
68
       
+
       
      [[ -f $PROJECTNAME/bin/$PROJECTNAME.dart ]]

     

       
69
       
69
       
+
       
      touch $out

     

       
70
       
70
       
+
       
    '';

     

       
71
       
71
       
+
       


     

       
72
       
72
       
+
       
    testCompile = runCommand "dart-test-compile" {

     

       
73
       
73
       
+
       
      nativeBuildInputs = [ finalAttrs.finalPackage ]

     

       
74
       
74
       
+
       
        ++ lib.optionals stdenv.isDarwin [ darwin.cctools darwin.sigtool ];

     

       
75
       
75
       
+
       
    } ''

     

       
76
       
76
       
+
       
      HELLO_MESSAGE="Hello, world!"

     

       
77
       
77
       
+
       
      echo "void main() => print('$HELLO_MESSAGE');" > hello.dart

     

       
78
       
78
       
+
       
      dart compile exe hello.dart

     

       
79
       
79
       
+
       
      PROGRAM_OUT=$(./hello.exe)

     

       
61
       
80
       
 
       


     

       
81
       
81
       
+
       
      [[ "$PROGRAM_OUT" == "$HELLO_MESSAGE" ]]

     

       
82
       
82
       
+
       
      touch $out

     

       
83
       
83
       
+
       
    '';

     

       
84
       
84
       
+
       
  };

     

       
62
       
85
       
 
       
  meta = with lib; {

     

       
63
       
86
       
 
       
    homepage = "https://www.dartlang.org/";

     

       
64
       
87
       
 
       
    maintainers = with maintainers; [ grburst ];

     
···

       
72
       
95
       
 
       
    sourceProvenance = with sourceTypes; [ binaryNativeCode ];

     

       
73
       
96
       
 
       
    license = licenses.bsd3;

     

       
74
       
97
       
 
       
  };

     

       
75
       
75
       
-
       
}

     

       
98
       
98
       
+
       
})

     

···

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
callPackage ./generic.nix (args // rec {

     

       
4
       
4
       
 
       
  release = "8.5";

     

       
5
       
5
       
-
       
  version = "${release}.18";

     

       
5
       
5
       
+
       
  version = "${release}.19";

     

       
6
       
6
       
 
       


     

       
7
       
7
       
 
       
  # Note: when updating, the hash in pkgs/development/libraries/tk/8.5.nix must also be updated!

     

       
8
       
8
       
 
       


     

       
9
       
9
       
 
       
  src = fetchurl {

     

       
10
       
10
       
 
       
    url = "mirror://sourceforge/tcl/tcl${version}-src.tar.gz";

     

       
11
       
11
       
-
       
    sha256 = "1jfkqp2fr0xh6xvaqx134hkfa5kh7agaqbxm6lhjbpvvc1xfaaq3";

     

       
11
       
11
       
+
       
    sha256 = "066vlr9k5f44w9gl9382hlxnryq00d5p6c7w5vq1fgc7v9b49w6k";

     

       
12
       
12
       
 
       
  };

     

       
13
       
13
       
 
       
})

     

···

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
stdenv.mkDerivation rec {

     

       
4
       
4
       
 
       
  pname = "libdiscid";

     

       
5
       
5
       
-
       
  version = "0.6.2";

     

       
5
       
5
       
+
       
  version = "0.6.4";

     

       
6
       
6
       
 
       


     

       
7
       
7
       
 
       
  nativeBuildInputs = [ cmake pkg-config ];

     

       
8
       
8
       
 
       


     

       
9
       
9
       
 
       
  buildInputs = lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.IOKit ];

     

       
10
       
10
       
 
       


     

       
11
       
11
       
 
       
  src = fetchurl {

     

       
12
       
12
       
-
       
    url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${pname}-${version}.tar.gz";

     

       
13
       
13
       
-
       
    sha256 = "1f9irlj3dpb5gyfdnb1m4skbjvx4d4hwiz2152f83m0d9jn47r7r";

     

       
12
       
12
       
+
       
    url = "http://ftp.musicbrainz.org/pub/musicbrainz/${pname}/${pname}-${version}.tar.gz";

     

       
13
       
13
       
+
       
    sha256 = "sha256-3V6PHJrq1ELiO3SanMkzY3LmLoitcHmitiiVsDkMsoI=";

     

       
14
       
14
       
 
       
  };

     

       
15
       
15
       
 
       


     

       
16
       
16
       
 
       
  NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework CoreFoundation -framework IOKit";

     

···

       
11
       
11
       
 
       


     

       
12
       
12
       
 
       
stdenv.mkDerivation  rec {

     

       
13
       
13
       
 
       
  pname = "mpich";

     

       
14
       
14
       
-
       
  version = "4.1";

     

       
14
       
14
       
+
       
  version = "4.1.1";

     

       
15
       
15
       
 
       


     

       
16
       
16
       
 
       
  src = fetchurl {

     

       
17
       
17
       
 
       
    url = "https://www.mpich.org/static/downloads/${version}/mpich-${version}.tar.gz";

     

       
18
       
18
       
-
       
    sha256 = "sha256-ix7GO8RMfKoq+7RXvFs81KcNvka6unABI9Z8SNxatqA=";

     

       
18
       
18
       
+
       
    sha256 = "sha256-7jBHGzXvh/TIj4caXirTgRzZxN8y/U8ThEMHL/QoTKI=";

     

       
19
       
19
       
 
       
  };

     

       
20
       
20
       
 
       


     

       
21
       
21
       
 
       
  configureFlags = [

     

···

       
11
       
11
       
 
       


     

       
12
       
12
       
 
       
  src = fetchurl {

     

       
13
       
13
       
 
       
    url = "mirror://sourceforge/tcl/tk${tcl.version}-src.tar.gz";

     

       
14
       
14
       
-
       
    sha256 = "0an3wqkjzlyyq6l9l3nawz76axsrsppbyylx0zk9lkv7llrala03";

     

       
14
       
14
       
+
       
    sha256 = "1yhgcalldrjlc5q614rlzg1crgd3b52dhrk1pncdaxvl2vgg2yj0";

     

       
15
       
15
       
 
       
  };

     

       
16
       
16
       
 
       


     

       
17
       
17
       
 
       
  patches = lib.optionals stdenv.isDarwin [

     

···

       
45
       
45
       
 
       
  nativeBuildInputs = [

     

       
46
       
46
       
 
       
    cmake

     

       
47
       
47
       
 
       
    python3

     

       
48
       
48
       
-
       
    python3.pkgs.Mako

     

       
48
       
48
       
+
       
    python3.pkgs.mako

     

       
49
       
49
       
 
       
  ];

     

       
50
       
50
       
 
       


     

       
51
       
51
       
 
       
  doCheck = true;

     

···

       
9
       
9
       
 
       
  depsBuildBuild = [ nim_builder ] ++ depsBuildBuild;

     

       
10
       
10
       
 
       
  nativeBuildInputs = [ nim ] ++ nativeBuildInputs;

     

       
11
       
11
       
 
       


     

       
12
       
12
       
-
       
  configurePhase = if isNull configurePhase then ''

     

       
12
       
12
       
+
       
  configurePhase = if (configurePhase == null) then ''

     

       
13
       
13
       
 
       
    runHook preConfigure

     

       
14
       
14
       
 
       
    export NIX_NIM_BUILD_INPUTS=''${pkgsHostTarget[@]} $NIX_NIM_BUILD_INPUTS

     

       
15
       
15
       
 
       
    nim_builder --phase:configure

     
···

       
17
       
17
       
 
       
  '' else

     

       
18
       
18
       
 
       
    configurePhase;

     

       
19
       
19
       
 
       


     

       
20
       
20
       
-
       
  buildPhase = if isNull buildPhase then ''

     

       
20
       
20
       
+
       
  buildPhase = if (buildPhase == null) then ''

     

       
21
       
21
       
 
       
    runHook preBuild

     

       
22
       
22
       
 
       
    nim_builder --phase:build

     

       
23
       
23
       
 
       
    runHook postBuild

     

       
24
       
24
       
 
       
  '' else

     

       
25
       
25
       
 
       
    buildPhase;

     

       
26
       
26
       
 
       


     

       
27
       
27
       
-
       
  checkPhase = if isNull checkPhase then ''

     

       
27
       
27
       
+
       
  checkPhase = if (checkPhase == null) then ''

     

       
28
       
28
       
 
       
    runHook preCheck

     

       
29
       
29
       
 
       
    nim_builder --phase:check

     

       
30
       
30
       
 
       
    runHook postCheck

     

       
31
       
31
       
 
       
  '' else

     

       
32
       
32
       
 
       
    checkPhase;

     

       
33
       
33
       
 
       


     

       
34
       
34
       
-
       
  installPhase = if isNull installPhase then ''

     

       
34
       
34
       
+
       
  installPhase = if (installPhase == null) then ''

     

       
35
       
35
       
 
       
    runHook preInstall

     

       
36
       
36
       
 
       
    nim_builder --phase:install

     

       
37
       
37
       
 
       
    runHook postInstall

     

···

       
14
       
14
       
 
       
, ppx_expect

     

       
15
       
15
       
 
       
}:

     

       
16
       
16
       
 
       


     

       
17
       
17
       
-
       
buildDunePackage {

     

       
17
       
17
       
+
       
buildDunePackage rec {

     

       
18
       
18
       
 
       
  pname = "data-encoding";

     

       
19
       
19
       
-
       
  version = "0.5.3";

     

       
19
       
19
       
+
       
  version = "0.6";

     

       
20
       
20
       
+
       


     

       
21
       
21
       
+
       
  duneVersion = "3";

     

       
22
       
22
       
+
       
  minimalOCamlVersion = "4.10";

     

       
20
       
23
       
 
       


     

       
21
       
24
       
 
       
  src = fetchFromGitLab {

     

       
22
       
25
       
 
       
    owner = "nomadic-labs";

     

       
23
       
26
       
 
       
    repo = "data-encoding";

     

       
24
       
24
       
-
       
    rev = "v0.5.3";

     

       
25
       
25
       
-
       
    sha256 = "sha256-HMNpjh5x7vU/kXQNRjJtOvShEENoNuxjNNPBJfm+Rhg=";

     

       
27
       
27
       
+
       
    rev = "v${version}";

     

       
28
       
28
       
+
       
    hash = "sha256-oQEV7lTG+/q1UcPsepPM4yN4qia6tEtRPkTkTVdGXE0=";

     

       
26
       
29
       
 
       
  };

     

       
27
       
30
       
 
       


     

       
28
       
31
       
 
       
  propagatedBuildInputs = [

     

···

       
4
       
4
       
 
       
  pname = "lru";

     

       
5
       
5
       
 
       
  version = "0.3.1";

     

       
6
       
6
       
 
       


     

       
7
       
7
       
+
       
  duneVersion = "3";

     

       
8
       
8
       
+
       


     

       
7
       
9
       
 
       
  src = fetchurl {

     

       
8
       
10
       
 
       
    url = "https://github.com/pqwy/lru/releases/download/v${version}/lru-${version}.tbz";

     

       
9
       
11
       
 
       
    hash = "sha256-bL4j0np9WyRPhpwLiBQNR/cPQTpkYu81wACTJdSyNv0=";

     

···

       
1
       
1
       
 
       
{ lib, buildDunePackage, ocaml, fetchurl, seq, qcheck-alcotest }:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
buildDunePackage rec {

     

       
4
       
4
       
-
       
  minimumOCamlVersion = "4.03";

     

       
4
       
4
       
+
       
  minimalOCamlVersion = "4.03";

     

       
5
       
5
       
 
       
  pname = "psq";

     

       
6
       
6
       
-
       
  version = "0.2.0";

     

       
6
       
6
       
+
       
  version = "0.2.1";

     

       
7
       
7
       
 
       


     

       
8
       
8
       
-
       
  useDune2 = true;

     

       
8
       
8
       
+
       
  duneVersion = "3";

     

       
9
       
9
       
 
       


     

       
10
       
10
       
 
       
  src = fetchurl {

     

       
11
       
11
       
-
       
    url = "https://github.com/pqwy/psq/releases/download/v${version}/psq-v${version}.tbz";

     

       
12
       
12
       
-
       
    sha256 = "1j4lqkq17rskhgcrpgr4n1m1a2b1x35mlxj6f9g05rhpmgvgvknk";

     

       
11
       
11
       
+
       
    url = "https://github.com/pqwy/psq/releases/download/v${version}/psq-${version}.tbz";

     

       
12
       
12
       
+
       
    hash = "sha256-QgBfUz6r50sXme4yuJBWVM1moivtSvK9Jmso2EYs00Q=";

     

       
13
       
13
       
 
       
  };

     

       
14
       
14
       
 
       


     

       
15
       
15
       
 
       
  propagatedBuildInputs = [ seq ];

     

···

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
buildDunePackage rec {

     

       
4
       
4
       
 
       
  pname = "terminal_size";

     

       
5
       
5
       
-
       
  version = "0.1.4";

     

       
5
       
5
       
+
       
  version = "0.2.0";

     

       
6
       
6
       
 
       


     

       
7
       
7
       
-
       
  useDune2 = true;

     

       
7
       
7
       
+
       
  duneVersion = "3";

     

       
8
       
8
       
 
       


     

       
9
       
9
       
 
       
  src = fetchurl {

     

       
10
       
10
       
-
       
    url = "https://github.com/cryptosense/terminal_size/releases/download/v${version}/terminal_size-v${version}.tbz";

     

       
11
       
11
       
-
       
    sha256 = "fdca1fee7d872c4a8e5ab003d9915b6782b272e2a3661ca877f2d78dd25371a7";

     

       
10
       
10
       
+
       
    url = "https://github.com/cryptosense/terminal_size/releases/download/v${version}/terminal_size-${version}.tbz";

     

       
11
       
11
       
+
       
    hash = "sha256-1rYs0oxAcayFypUoCIdFwSTJCU7+rpFyJRRzb5lzsPs=";

     

       
12
       
12
       
 
       
  };

     

       
13
       
13
       
 
       


     

       
14
       
14
       
 
       
  checkInputs = [ alcotest ];

     

···

       
12
       
12
       
 
       


     

       
13
       
13
       
 
       
buildPythonPackage rec {

     

       
14
       
14
       
 
       
  pname = "aioesphomeapi";

     

       
15
       
15
       
-
       
  version = "13.5.0";

     

       
15
       
15
       
+
       
  version = "13.5.1";

     

       
16
       
16
       
 
       
  format = "setuptools";

     

       
17
       
17
       
 
       


     

       
18
       
18
       
 
       
  disabled = pythonOlder "3.9";

     
···

       
21
       
21
       
 
       
    owner = "esphome";

     

       
22
       
22
       
 
       
    repo = pname;

     

       
23
       
23
       
 
       
    rev = "refs/tags/v${version}";

     

       
24
       
24
       
-
       
    hash = "sha256-e0gkjri3PknwY2Si6vJV8S2LNZI/0EBDC7mliI33aTU=";

     

       
24
       
24
       
+
       
    hash = "sha256-ifk1psowUGVG7XafipLq5T2+5K5+psDDsX/u/GYDXdU=";

     

       
25
       
25
       
 
       
  };

     

       
26
       
26
       
 
       


     

       
27
       
27
       
 
       
  propagatedBuildInputs = [

     

···

       
35
       
35
       
 
       
    cffi

     

       
36
       
36
       
 
       
  ] ++ lib.optionals gurobiSupport ([

     

       
37
       
37
       
 
       
    gurobipy

     

       
38
       
38
       
-
       
  ] ++ lib.optional (builtins.isNull gurobiHome) gurobi);

     

       
38
       
38
       
+
       
  ] ++ lib.optional (gurobiHome == null) gurobi);

     

       
39
       
39
       
 
       


     

       
40
       
40
       
 
       
  # Source files have CRLF terminators, which make patch error out when supplied

     

       
41
       
41
       
 
       
  # with diffs made on *nix machines

     
···

       
58
       
58
       
 
       


     

       
59
       
59
       
 
       
  # Make MIP use the Gurobi solver, if configured to do so

     

       
60
       
60
       
 
       
  makeWrapperArgs = lib.optional gurobiSupport

     

       
61
       
61
       
-
       
    "--set GUROBI_HOME ${if builtins.isNull gurobiHome then gurobi.outPath else gurobiHome}";

     

       
61
       
61
       
+
       
    "--set GUROBI_HOME ${if gurobiHome == null then gurobi.outPath else gurobiHome}";

     

       
62
       
62
       
 
       


     

       
63
       
63
       
 
       
  # Tests that rely on Gurobi are activated only when Gurobi support is enabled

     

       
64
       
64
       
 
       
  disabledTests = lib.optional (!gurobiSupport) "gurobi";