···

       
150
       
150
       
 
       


     

       
151
       
151
       
 
       
In the scenario you are unable to run the resulting binary: this is arguably the most complicated as it could be any combination of the previous reasons. This type of failure typically occurs when a library attempts to load or open a library it depends on that it does not declare in its `DT_NEEDED` section. As a first step, ensure that dependencies are patched with [`autoAddDriverRunpath`](https://search.nixos.org/packages?channel=unstable&type=packages&query=autoAddDriverRunpath). Failing that, try running the application with [`nixGL`](https://github.com/guibou/nixGL) or a similar wrapper tool. If that works, it likely means that the application is attempting to load a library that is not in the `RPATH` or `RUNPATH` of the binary.

     

       
152
       
152
       
 
       


     

       
153
       
153
       
-
       
## Running Docker or Podman containers with CUDA support {#running-docker-or-podman-containers-with-cuda-support}

     

       
153
       
153
       
+
       
## Running Docker or Podman containers with CUDA support {#cuda-docker-podman}

     

       
154
       
154
       
 
       


     

       
155
       
155
       
 
       
It is possible to run Docker or Podman containers with CUDA support. The recommended mechanism to perform this task is to use the [NVIDIA Container Toolkit](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/index.html).

     

       
156
       
156
       
 
       


     

···

       
2951
       
2951
       
 
       
    githubId = 535135;

     

       
2952
       
2952
       
 
       
    name = "Brennon Loveless";

     

       
2953
       
2953
       
 
       
  };

     

       
2954
       
2954
       
+
       
  bloxx12 = {

     

       
2955
       
2955
       
+
       
    email = "charlie@charlieroot.dev";

     

       
2956
       
2956
       
+
       
    github = "bloxx12";

     

       
2957
       
2957
       
+
       
    githubId = 75451918;

     

       
2958
       
2958
       
+
       
    name = "Charlie Root";

     

       
2959
       
2959
       
+
       
  };

     

       
2954
       
2960
       
 
       
  bluescreen303 = {

     

       
2955
       
2961
       
 
       
    email = "mathijs@bluescreen303.nl";

     

       
2956
       
2962
       
 
       
    github = "bluescreen303";

     
···

       
5867
       
5873
       
 
       
    github = "dsferruzza";

     

       
5868
       
5874
       
 
       
    githubId = 1931963;

     

       
5869
       
5875
       
 
       
    name = "David Sferruzza";

     

       
5876
       
5876
       
+
       
  };

     

       
5877
       
5877
       
+
       
  dsluijk = {

     

       
5878
       
5878
       
+
       
    name = "Dany Sluijk";

     

       
5879
       
5879
       
+
       
    email = "nix@dany.dev";

     

       
5880
       
5880
       
+
       
    github = "dsluijk";

     

       
5881
       
5881
       
+
       
    githubId = 8537327;

     

       
5870
       
5882
       
 
       
  };

     

       
5871
       
5883
       
 
       
  dstengele = {

     

       
5872
       
5884
       
 
       
    name = "Dennis Stengele";

     

···

       
343
       
343
       
 
       
  This change requires granting access to the repositories to this user or

     

       
344
       
344
       
 
       
  setting the appropriate one through `services.cgit.some-instance.user`.

     

       
345
       
345
       
 
       


     

       
346
       
346
       
+
       
- `gradle_6` was removed due to being [unsupported upstream as of 10 Feb 2023](https://endoflife.date/gradle).

     

       
347
       
347
       
+
       
  Additionally, it had numerous security vulnerabilities that were only patched

     

       
348
       
348
       
+
       
  in later versions, such as [CVE-2021-29429](https://nvd.nist.gov/vuln/detail/CVE-2021-32751),

     

       
349
       
349
       
+
       
  [CVE-2021-29427](https://nvd.nist.gov/vuln/detail/CVE-2021-29427), [CVE-2021-29428](https://nvd.nist.gov/vuln/detail/CVE-2021-29428), and [CVE-2021-32751](https://nvd.nist.gov/vuln/detail/CVE-2021-32751).

     

       
350
       
350
       
+
       


     

       
346
       
351
       
 
       
- `nvimpager` was updated to version 0.13.0, which changes the order of user and

     

       
347
       
352
       
 
       
  nvimpager settings: user commands in `-c` and `--cmd` now override the

     

       
348
       
353
       
 
       
  respective default settings because they are executed later.

     
···

       
573
       
578
       
 
       
- The `services.prometheus.exporters.minio` option has been removed, as it's upstream implementation was broken and unmaintained.

     

       
574
       
579
       
 
       
  Minio now has built-in [Prometheus metrics exposure](https://min.io/docs/minio/linux/operations/monitoring/collect-minio-metrics-using-prometheus.html), which can be used instead.

     

       
575
       
580
       
 
       


     

       
581
       
581
       
+
       
- The `services.prometheus.exporters.tor` option has been removed, as its upstream implementation was broken and unmaintained.

     

       
582
       
582
       
+
       


     

       
576
       
583
       
 
       
- The `services.patroni.raft` option has been removed, as Raft has been [deprecated by upstream since 3.0.0](https://github.com/patroni/patroni/blob/master/docs/releases.rst#version-300)

     

       
584
       
584
       
+
       


     

       
585
       
585
       
+
       
- The `jd-cli` package was removed due to an inactive upstream and a dependency on the shut down

     

       
586
       
586
       
+
       
  JCenter JAR repository.

     

       
587
       
587
       
+
       
  Java decompilers already packaged in Nixpkgs include `bytecode-viewer` (GUI), `cfr` (CLI), and `procyon` (CLI).

     

       
588
       
588
       
+
       


     

       
589
       
589
       
+
       
- The `jd-gui` package was removed due to an inactive upstream and a dependency on the end-of-life Gradle 6.

     

       
590
       
590
       
+
       
  Java decompilers already packaged in Nixpkgs include `bytecode-viewer` (GUI), `cfr` (CLI), and `procyon` (CLI).

     

       
577
       
591
       
 
       


     

       
578
       
592
       
 
       
- `services.roundcube.maxAttachmentSize` will multiply the value set with `1.37` to offset overhead introduced by the base64 encoding applied to attachments.

     

       
579
       
593
       
 
       


     

···

       
88
       
88
       
 
       
    "statsd"

     

       
89
       
89
       
 
       
    "surfboard"

     

       
90
       
90
       
 
       
    "systemd"

     

       
91
       
91
       
-
       
    "tor"

     

       
92
       
91
       
 
       
    "unbound"

     

       
93
       
92
       
 
       
    "unifi"

     

       
94
       
93
       
 
       
    "unpoller"

     
···

       
298
       
297
       
 
       
        (lib.mkRemovedOptionModule [ "minio" ] ''

     

       
299
       
298
       
 
       
          The Minio exporter has been removed, as it was broken and unmaintained.

     

       
300
       
299
       
 
       
          See the 24.11 release notes for more information.

     

       
300
       
300
       
+
       
        '')

     

       
301
       
301
       
+
       
        (lib.mkRemovedOptionModule [ "tor" ] ''

     

       
302
       
302
       
+
       
          The Tor exporter has been removed, as it was broken and unmaintained.

     

       
301
       
303
       
 
       
        '')

     

       
302
       
304
       
 
       
      ];

     

       
303
       
305
       
 
       
    };

     

···

       
1
       
1
       
-
       
{ config, lib, pkgs, options, ... }:

     

       
2
       
2
       
-
       


     

       
3
       
3
       
-
       
let

     

       
4
       
4
       
-
       
  cfg = config.services.prometheus.exporters.tor;

     

       
5
       
5
       
-
       
  inherit (lib) mkOption types concatStringsSep;

     

       
6
       
6
       
-
       
in

     

       
7
       
7
       
-
       
{

     

       
8
       
8
       
-
       
  port = 9130;

     

       
9
       
9
       
-
       
  extraOpts = {

     

       
10
       
10
       
-
       
    torControlAddress = mkOption {

     

       
11
       
11
       
-
       
      type = types.str;

     

       
12
       
12
       
-
       
      default = "127.0.0.1";

     

       
13
       
13
       
-
       
      description = ''

     

       
14
       
14
       
-
       
        Tor control IP address or hostname.

     

       
15
       
15
       
-
       
      '';

     

       
16
       
16
       
-
       
    };

     

       
17
       
17
       
-
       


     

       
18
       
18
       
-
       
    torControlPort = mkOption {

     

       
19
       
19
       
-
       
      type = types.port;

     

       
20
       
20
       
-
       
      default = 9051;

     

       
21
       
21
       
-
       
      description = ''

     

       
22
       
22
       
-
       
        Tor control port.

     

       
23
       
23
       
-
       
      '';

     

       
24
       
24
       
-
       
    };

     

       
25
       
25
       
-
       
  };

     

       
26
       
26
       
-
       
  serviceOpts = {

     

       
27
       
27
       
-
       
    serviceConfig = {

     

       
28
       
28
       
-
       
      ExecStart = ''

     

       
29
       
29
       
-
       
        ${pkgs.prometheus-tor-exporter}/bin/prometheus-tor-exporter \

     

       
30
       
30
       
-
       
          -b ${cfg.listenAddress} \

     

       
31
       
31
       
-
       
          -p ${toString cfg.port} \

     

       
32
       
32
       
-
       
          -a ${cfg.torControlAddress} \

     

       
33
       
33
       
-
       
          -c ${toString cfg.torControlPort} \

     

       
34
       
34
       
-
       
          ${concatStringsSep " \\\n  " cfg.extraFlags}

     

       
35
       
35
       
-
       
      '';

     

       
36
       
36
       
-
       
    };

     

       
37
       
37
       
-
       


     

       
38
       
38
       
-
       
    # CPython requires a process to either have $HOME defined or run as a UID

     

       
39
       
39
       
-
       
    # defined in /etc/passwd. The latter is false with DynamicUser, so define a

     

       
40
       
40
       
-
       
    # dummy $HOME. https://bugs.python.org/issue10496

     

       
41
       
41
       
-
       
    environment = { HOME = "/var/empty"; };

     

       
42
       
42
       
-
       
  };

     

       
43
       
43
       
-
       
}

     

···

       
1511
       
1511
       
 
       
      '';

     

       
1512
       
1512
       
 
       
    };

     

       
1513
       
1513
       
 
       


     

       
1514
       
1514
       
-
       
    tor = {

     

       
1515
       
1515
       
-
       
      exporterConfig = {

     

       
1516
       
1516
       
-
       
        enable = true;

     

       
1517
       
1517
       
-
       
      };

     

       
1518
       
1518
       
-
       
      metricProvider = {

     

       
1519
       
1519
       
-
       
        # Note: this does not connect the test environment to the Tor network.

     

       
1520
       
1520
       
-
       
        # Client, relay, bridge or exit connectivity are disabled by default.

     

       
1521
       
1521
       
-
       
        services.tor.enable = true;

     

       
1522
       
1522
       
-
       
        services.tor.settings.ControlPort = 9051;

     

       
1523
       
1523
       
-
       
      };

     

       
1524
       
1524
       
-
       
      exporterTest = ''

     

       
1525
       
1525
       
-
       
        wait_for_unit("tor.service")

     

       
1526
       
1526
       
-
       
        wait_for_open_port(9051)

     

       
1527
       
1527
       
-
       
        wait_for_unit("prometheus-tor-exporter.service")

     

       
1528
       
1528
       
-
       
        wait_for_open_port(9130)

     

       
1529
       
1529
       
-
       
        succeed("curl -sSf localhost:9130/metrics | grep 'tor_version{.\\+} 1'")

     

       
1530
       
1530
       
-
       
      '';

     

       
1531
       
1531
       
-
       
    };

     

       
1532
       
1532
       
-
       


     

       
1533
       
1514
       
 
       
    unpoller = {

     

       
1534
       
1515
       
 
       
      nodeName = "unpoller";

     

       
1535
       
1516
       
 
       
      exporterConfig.enable = true;

     

···

       
34
       
34
       
 
       


     

       
35
       
35
       
 
       
rustPlatform.buildRustPackage rec {

     

       
36
       
36
       
 
       
  pname = "spotify-player";

     

       
37
       
37
       
-
       
  version = "0.19.1";

     

       
37
       
37
       
+
       
  version = "0.20.0";

     

       
38
       
38
       
 
       


     

       
39
       
39
       
 
       
  src = fetchFromGitHub {

     

       
40
       
40
       
 
       
    owner = "aome510";

     

       
41
       
41
       
 
       
    repo = pname;

     

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

     

       
43
       
43
       
-
       
    hash = "sha256-R8F7s8FPnCe+shNUN/u0qcxFy3IbyfVo2xZ5/E/qwaw=";

     

       
43
       
43
       
+
       
    hash = "sha256-heycCm2Nwyo+DegMKeXZ+dF+ZqiFT/6P08/28buJc6I=";

     

       
44
       
44
       
 
       
  };

     

       
45
       
45
       
 
       


     

       
46
       
46
       
-
       
  cargoHash = "sha256-7vximGisIIXBrwHXSWQjO08OraaweG7ZT6v+gVdYGVc=";

     

       
46
       
46
       
+
       
  cargoHash = "sha256-U3a/6uF7vOV3QnxqPnooBdvjyyIPLnQXiXtTwKeHAxA=";

     

       
47
       
47
       
 
       


     

       
48
       
48
       
 
       
  nativeBuildInputs = [

     

       
49
       
49
       
 
       
    pkg-config

     

···

       
31
       
31
       
 
       
  archive_fmt = if stdenv.hostPlatform.isDarwin then "zip" else "tar.gz";

     

       
32
       
32
       
 
       


     

       
33
       
33
       
 
       
  sha256 = {

     

       
34
       
34
       
-
       
    x86_64-linux = "0w452wnzyb4wmr2qqq55dhfb1jd0zqmwf65fbmxdz7jn1jimjjrn";

     

       
35
       
35
       
-
       
    x86_64-darwin = "1b333snvrw8khryhi5scfhhkg43m3b6ds3nvs24nbvx8k7h69hmm";

     

       
36
       
36
       
-
       
    aarch64-linux = "12p5cdva14s9sfgyrzg3nylpmgdnmfavwx3xxxmblzq1gcal2g6i";

     

       
37
       
37
       
-
       
    aarch64-darwin = "1l59fcdvynkl5kyz9bn31mld6pi89nynk1zw645rczjm940pac7p";

     

       
38
       
38
       
-
       
    armv7l-linux = "07ylija6chg6jc2zcavdr9yw1laniigw57f2gilyjynv1cgjm76r";

     

       
34
       
34
       
+
       
    x86_64-linux = "12cfks56pz1fljv4zrh4q2k6vai2rpdyw5lbap9y8wa9f5pz0m55";

     

       
35
       
35
       
+
       
    x86_64-darwin = "0zxmlpilh83grcv6jk2avlxiy2w0a1vbwmv0fjzy6nvdma91j7lj";

     

       
36
       
36
       
+
       
    aarch64-linux = "1gx5xg54mmkiglwmv8fjppqb8bj0fqn9yg0r5q9kzdhh9702dxsg";

     

       
37
       
37
       
+
       
    aarch64-darwin = "13wnraa13msz7rxzwk232rwrnbmwx0dpq13aq68zjz80clsf4jgp";

     

       
38
       
38
       
+
       
    armv7l-linux = "06kngg0scrk8sz3j874iffyci70ng8j8l1v83k572vw847956850";

     

       
39
       
39
       
 
       
  }.${system} or throwSystem;

     

       
40
       
40
       
 
       
in

     

       
41
       
41
       
 
       
  callPackage ./generic.nix rec {

     

       
42
       
42
       
 
       
    # Please backport all compatible updates to the stable release.

     

       
43
       
43
       
 
       
    # This is important for the extension ecosystem.

     

       
44
       
44
       
-
       
    version = "1.94.2";

     

       
44
       
44
       
+
       
    version = "1.95.0";

     

       
45
       
45
       
 
       
    pname = "vscode" + lib.optionalString isInsiders "-insiders";

     

       
46
       
46
       
 
       


     

       
47
       
47
       
 
       
    # This is used for VS Code - Remote SSH test

     

       
48
       
48
       
-
       
    rev = "384ff7382de624fb94dbaf6da11977bba1ecd427";

     

       
48
       
48
       
+
       
    rev = "912bb683695358a54ae0c670461738984cbb5b95";

     

       
49
       
49
       
 
       


     

       
50
       
50
       
 
       
    executableName = "code" + lib.optionalString isInsiders "-insiders";

     

       
51
       
51
       
 
       
    longName = "Visual Studio Code" + lib.optionalString isInsiders " - Insiders";

     
···

       
69
       
69
       
 
       
      src = fetchurl {

     

       
70
       
70
       
 
       
        name = "vscode-server-${rev}.tar.gz";

     

       
71
       
71
       
 
       
        url = "https://update.code.visualstudio.com/commit:${rev}/server-linux-x64/stable";

     

       
72
       
72
       
-
       
        sha256 = "1mj9fg76b9x9r6ql21hbckpni179vfa9j8fiah9rd6ih7sb72048";

     

       
72
       
72
       
+
       
        sha256 = "1chk0xwsiw6pm6ihjlp9695n0l1wfipwv4h04v5dmm9dcwlarp1m";

     

       
73
       
73
       
 
       
      };

     

       
74
       
74
       
 
       
      stdenv = stdenvNoCC;

     

       
75
       
75
       
 
       
    };

     

···

       
24
       
24
       
 
       
, openjpegSupport ? !stdenv.hostPlatform.isMinGW, openjpeg

     

       
25
       
25
       
 
       
, libwebpSupport ? !stdenv.hostPlatform.isMinGW, libwebp

     

       
26
       
26
       
 
       
, libheifSupport ? true, libheif

     

       
27
       
27
       
+
       
, fftwSupport ? true, fftw

     

       
27
       
28
       
 
       
, potrace

     

       
28
       
29
       
 
       
, coreutils

     

       
29
       
30
       
 
       
, curl

     
···

       
76
       
77
       
 
       
    (lib.withFeature libjxlSupport "jxl")

     

       
77
       
78
       
 
       
    (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript.fonts}/share/fonts")

     

       
78
       
79
       
 
       
    (lib.withFeature ghostscriptSupport "gslib")

     

       
80
       
80
       
+
       
    (lib.withFeature fftwSupport "fftw")

     

       
79
       
81
       
 
       
  ] ++ lib.optionals stdenv.hostPlatform.isMinGW [

     

       
80
       
82
       
 
       
    # due to libxml2 being without DLLs ATM

     

       
81
       
83
       
 
       
    "--enable-static" "--disable-shared"

     
···

       
113
       
115
       
 
       
    ++ lib.optional lcms2Support lcms2

     

       
114
       
116
       
 
       
    ++ lib.optional libX11Support libX11

     

       
115
       
117
       
 
       
    ++ lib.optional libXtSupport libXt

     

       
116
       
116
       
-
       
    ++ lib.optional libwebpSupport libwebp;

     

       
118
       
118
       
+
       
    ++ lib.optional libwebpSupport libwebp

     

       
119
       
119
       
+
       
    ++ lib.optional fftwSupport fftw;

     

       
117
       
120
       
 
       


     

       
118
       
121
       
 
       
  postInstall = ''

     

       
119
       
122
       
 
       
    (cd "$dev/include" && ln -s ImageMagick* ImageMagick)

     
···

       
146
       
149
       
 
       
    description = "Software suite to create, edit, compose, or convert bitmap images";

     

       
147
       
150
       
 
       
    pkgConfigModules = [ "ImageMagick" "MagickWand" ];

     

       
148
       
151
       
 
       
    platforms = platforms.linux ++ platforms.darwin;

     

       
149
       
149
       
-
       
    maintainers = with maintainers; [ dotlambda rhendric ];

     

       
152
       
152
       
+
       
    maintainers = with maintainers; [ dotlambda rhendric bloxx12 ];

     

       
150
       
153
       
 
       
    license = licenses.asl20;

     

       
151
       
154
       
 
       
    mainProgram = "magick";

     

       
152
       
155
       
 
       
  };

     

···

       
22
       
22
       
 
       
  glib,

     

       
23
       
23
       
 
       
  glib-networking,

     

       
24
       
24
       
 
       
  gmp,

     

       
25
       
25
       
-
       
  gstreamer,

     

       
26
       
26
       
-
       
  gst-plugins-base,

     

       
27
       
27
       
-
       
  gst-plugins-bad,

     

       
28
       
28
       
-
       
  gst-plugins-good,

     

       
25
       
25
       
+
       
  gst_all_1,

     

       
29
       
26
       
 
       
  gtest,

     

       
30
       
27
       
 
       
  gtk3,

     

       
31
       
28
       
 
       
  hicolor-icon-theme,

     
···

       
36
       
33
       
 
       
  nlopt,

     

       
37
       
34
       
 
       
  opencascade-occt_7_6,

     

       
38
       
35
       
 
       
  openvdb,

     

       
36
       
36
       
+
       
  opencv,

     

       
39
       
37
       
 
       
  pcre,

     

       
40
       
38
       
 
       
  systemd,

     

       
41
       
39
       
 
       
  tbb_2021_11,

     
···

       
45
       
43
       
 
       
  withSystemd ? stdenv.hostPlatform.isLinux,

     

       
46
       
44
       
 
       
}:

     

       
47
       
45
       
 
       
let

     

       
48
       
48
       
-
       
  opencascade-occt = opencascade-occt_7_6;

     

       
49
       
49
       
-
       
  wxGTK31' = wxGTK31.overrideAttrs (old: {

     

       
50
       
50
       
-
       
    configureFlags = old.configureFlags ++ [

     

       
51
       
51
       
-
       
      # Disable noisy debug dialogs

     

       
52
       
52
       
-
       
      "--enable-debug=no"

     

       
53
       
53
       
-
       
    ];

     

       
54
       
54
       
-
       
  });

     

       
55
       
55
       
-
       
  openvdb_tbb_2021_8 = openvdb.overrideAttrs (old: {

     

       
46
       
46
       
+
       
  wxGTK' =

     

       
47
       
47
       
+
       
    (wxGTK31.override {

     

       
48
       
48
       
+
       
      withCurl = true;

     

       
49
       
49
       
+
       
      withPrivateFonts = true;

     

       
50
       
50
       
+
       
      withWebKit = true;

     

       
51
       
51
       
+
       
    }).overrideAttrs

     

       
52
       
52
       
+
       
      (old: {

     

       
53
       
53
       
+
       
        configureFlags = old.configureFlags ++ [

     

       
54
       
54
       
+
       
          # Disable noisy debug dialogs

     

       
55
       
55
       
+
       
          "--enable-debug=no"

     

       
56
       
56
       
+
       
        ];

     

       
57
       
57
       
+
       
      });

     

       
58
       
58
       
+
       


     

       
59
       
59
       
+
       
  openvdb' = openvdb.overrideAttrs (old: {

     

       
56
       
60
       
 
       
    buildInputs = [

     

       
57
       
61
       
 
       
      openexr

     

       
58
       
62
       
 
       
      boost179

     
···

       
65
       
69
       
 
       
in

     

       
66
       
70
       
 
       
stdenv.mkDerivation rec {

     

       
67
       
71
       
 
       
  pname = "bambu-studio";

     

       
68
       
68
       
-
       
  version = "01.09.00.70";

     

       
72
       
72
       
+
       
  version = "01.09.07.52";

     

       
69
       
73
       
 
       


     

       
70
       
74
       
 
       
  src = fetchFromGitHub {

     

       
71
       
75
       
 
       
    owner = "bambulab";

     

       
72
       
76
       
 
       
    repo = "BambuStudio";

     

       
73
       
77
       
 
       
    rev = "v${version}";

     

       
74
       
74
       
-
       
    hash = "sha256-RBctBhKo7mjxsP7OJhGfoU1eIiGVuMiAqwwSU+gsMds=";

     

       
78
       
78
       
+
       
    hash = "sha256-fhH4N29P/ysdHHbZt+FnBl3+QtTNhbVE3j4ZnFJyJH0=";

     

       
75
       
79
       
 
       
  };

     

       
76
       
80
       
 
       


     

       
77
       
81
       
 
       
  nativeBuildInputs = [

     
···

       
95
       
99
       
 
       
    glib

     

       
96
       
100
       
 
       
    glib-networking

     

       
97
       
101
       
 
       
    gmp

     

       
98
       
98
       
-
       
    gstreamer

     

       
99
       
99
       
-
       
    gst-plugins-base

     

       
100
       
100
       
-
       
    gst-plugins-bad

     

       
101
       
101
       
-
       
    gst-plugins-good

     

       
102
       
102
       
+
       
    gst_all_1.gstreamer

     

       
103
       
103
       
+
       
    gst_all_1.gst-plugins-base

     

       
104
       
104
       
+
       
    gst_all_1.gst-plugins-bad

     

       
105
       
105
       
+
       
    gst_all_1.gst-plugins-good

     

       
102
       
106
       
 
       
    gtk3

     

       
103
       
107
       
 
       
    hicolor-icon-theme

     

       
104
       
108
       
 
       
    ilmbase

     
···

       
106
       
110
       
 
       
    mesa.osmesa

     

       
107
       
111
       
 
       
    mpfr

     

       
108
       
112
       
 
       
    nlopt

     

       
109
       
109
       
-
       
    opencascade-occt

     

       
110
       
110
       
-
       
    openvdb_tbb_2021_8

     

       
113
       
113
       
+
       
    opencascade-occt_7_6

     

       
114
       
114
       
+
       
    openvdb'

     

       
111
       
115
       
 
       
    pcre

     

       
112
       
116
       
 
       
    tbb_2021_11

     

       
113
       
117
       
 
       
    webkitgtk_4_0

     

       
114
       
114
       
-
       
    wxGTK31'

     

       
118
       
118
       
+
       
    wxGTK'

     

       
115
       
119
       
 
       
    xorg.libX11

     

       
120
       
120
       
+
       
    opencv

     

       
116
       
121
       
 
       
  ] ++ lib.optionals withSystemd [ systemd ] ++ checkInputs;

     

       
117
       
122
       
 
       


     

       
118
       
123
       
 
       
  patches = [

     

       
119
       
124
       
 
       
    # Fix for webkitgtk linking

     

       
120
       
120
       
-
       
    ./0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch

     

       
125
       
125
       
+
       
    ./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch

     

       
121
       
126
       
 
       
    # Fix build with cgal-5.6.1+

     

       
122
       
122
       
-
       
    ./meshboolean-const.patch

     

       
127
       
127
       
+
       
    ./patches/meshboolean-const.patch

     

       
128
       
128
       
+
       
    # Fix an issue with

     

       
129
       
129
       
+
       
    ./patches/dont-link-opencv-world-bambu.patch

     

       
123
       
130
       
 
       
  ];

     

       
124
       
131
       
 
       


     

       
125
       
132
       
 
       
  doCheck = true;

     
···

       
136
       
143
       
 
       
  # Disable compiler warnings that clutter the build log.

     

       
137
       
144
       
 
       
  # It seems to be a known issue for Eigen:

     

       
138
       
145
       
 
       
  # http://eigen.tuxfamily.org/bz/show_bug.cgi?id=1221

     

       
139
       
139
       
-
       
  NIX_CFLAGS_COMPILE = "-Wno-ignored-attributes";

     

       
146
       
146
       
+
       
  NIX_CFLAGS_COMPILE = toString [

     

       
147
       
147
       
+
       
    "-Wno-ignored-attributes"

     

       
148
       
148
       
+
       
    "-I${opencv.out}/include/opencv4"

     

       
149
       
149
       
+
       
  ];

     

       
140
       
150
       
 
       


     

       
141
       
151
       
 
       
  # prusa-slicer uses dlopen on `libudev.so` at runtime

     

       
142
       
152
       
 
       
  NIX_LDFLAGS = lib.optionalString withSystemd "-ludev";

     
···

       
181
       
191
       
 
       
  meta = with lib; {

     

       
182
       
192
       
 
       
    description = "PC Software for BambuLab's 3D printers";

     

       
183
       
193
       
 
       
    homepage = "https://github.com/bambulab/BambuStudio";

     

       
194
       
194
       
+
       
    changelog = "https://github.com/bambulab/BambuStudio/releases/tag/v${version}";

     

       
184
       
195
       
 
       
    license = licenses.agpl3Plus;

     

       
185
       
185
       
-
       
    maintainers = with maintainers; [ zhaofengli ];

     

       
196
       
196
       
+
       
    maintainers = with maintainers; [

     

       
197
       
197
       
+
       
      zhaofengli

     

       
198
       
198
       
+
       
      dsluijk

     

       
199
       
199
       
+
       
    ];

     

       
186
       
200
       
 
       
    mainProgram = "bambu-studio";

     

       
187
       
201
       
 
       
    platforms = platforms.linux;

     

       
188
       
202
       
 
       
  };

     

···

       
2
       
2
       
 
       
  lib,

     

       
3
       
3
       
 
       
  fetchFromGitHub,

     

       
4
       
4
       
 
       
  bambu-studio,

     

       
5
       
5
       
-
       
  opencv,

     

       
6
       
5
       
 
       
}:

     

       
7
       
6
       
 
       
bambu-studio.overrideAttrs (

     

       
8
       
7
       
 
       
  finalAttrs: previousAttrs: {

     
···

       
16
       
15
       
 
       
      hash = "sha256-7fusdSYpZb4sYl5L/+81PzMd42Nsejj+kCZsq0f7eIk=";

     

       
17
       
16
       
 
       
    };

     

       
18
       
17
       
 
       


     

       
19
       
19
       
-
       
    patches =

     

       
20
       
20
       
-
       
      previousAttrs.patches

     

       
21
       
21
       
-
       
      ++ [

     

       
22
       
22
       
-
       
        # FIXME: only required for 2.1.1, can be removed in the next version

     

       
23
       
23
       
-
       
        ./0002-fix-build-for-gcc-13.diff

     

       
24
       
24
       
-
       


     

       
25
       
25
       
-
       
        ./dont-link-opencv-world.patch

     

       
26
       
26
       
-
       
      ];

     

       
27
       
27
       
-
       


     

       
28
       
28
       
-
       
    buildInputs =

     

       
29
       
29
       
-
       
      previousAttrs.buildInputs

     

       
30
       
30
       
-
       
      ++ [

     

       
31
       
31
       
-
       
        opencv

     

       
32
       
32
       
-
       
      ];

     

       
18
       
18
       
+
       
    patches =[

     

       
19
       
19
       
+
       
      # FIXME: only required for 2.1.1, can be removed in the next version

     

       
20
       
20
       
+
       
      ./patches/0002-fix-build-for-gcc-13.diff

     

       
21
       
21
       
+
       
      # Fix for webkitgtk linking

     

       
22
       
22
       
+
       
      ./patches/0001-not-for-upstream-CMakeLists-Link-against-webkit2gtk-.patch

     

       
23
       
23
       
+
       
      # Fix build with cgal-5.6.1+

     

       
24
       
24
       
+
       
      ./patches/meshboolean-const.patch

     

       
25
       
25
       
+
       
      ./patches/dont-link-opencv-world-orca.patch

     

       
26
       
26
       
+
       
    ];

     

       
33
       
27
       
 
       


     

       
34
       
28
       
 
       
    preFixup = ''

     

       
35
       
29
       
 
       
      gappsWrapperArgs+=(

     

···

       
1
       
1
       
+
       
diff --git a/src/libslic3r/CMakeLists.txt b/src/libslic3r/CMakeLists.txt

     

       
2
       
2
       
+
       
index 2cdc525..44e6602 100644

     

       
3
       
3
       
+
       
--- a/src/libslic3r/CMakeLists.txt

     

       
4
       
4
       
+
       
+++ b/src/libslic3r/CMakeLists.txt

     

       
5
       
5
       
+
       
@@ -533,7 +533,8 @@ target_link_libraries(libslic3r

     

       
6
       
6
       
+
       
     ${OCCT_LIBS}

     

       
7
       
7
       
+
       
     Clipper2

     

       
8
       
8
       
+
       
     mcut

     

       
9
       
9
       
+
       
-    opencv_world

     

       
10
       
10
       
+
       
+    opencv_core

     

       
11
       
11
       
+
       
+    opencv_imgproc

     

       
12
       
12
       
+
       
     )

     

       
13
       
13
       
+
       
 

     

       
14
       
14
       
+
       
 if(NOT WIN32)
     

···

       
1
       
1
       
-
       
{ stdenv, lib, fetchurl, darwin, aalib, ncurses, xorg, libmikmod }:

     

       
1
       
1
       
+
       
{ stdenv, lib, fetchurl, autoreconfHook, aalib, ncurses, xorg, libmikmod }:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
stdenv.mkDerivation rec {

     

       
4
       
4
       
 
       
  pname = "bb";

     
···

       
9
       
9
       
 
       
    sha256 = "1i411glxh7g4pfg4gw826lpwngi89yrbmxac8jmnsfvrfb48hgbr";

     

       
10
       
10
       
 
       
  };

     

       
11
       
11
       
 
       


     

       
12
       
12
       
+
       
  patches = [

     

       
13
       
13
       
+
       
    # add / update include files to get function prototypes

     

       
14
       
14
       
+
       
    ./included-files-updates.diff

     

       
15
       
15
       
+
       
  ];

     

       
16
       
16
       
+
       


     

       
17
       
17
       
+
       
  nativeBuildInputs = [ autoreconfHook ];

     

       
18
       
18
       
+
       


     

       
12
       
19
       
 
       
  buildInputs = [

     

       
13
       
20
       
 
       
    aalib ncurses libmikmod

     

       
14
       
21
       
 
       
    xorg.libXau xorg.libXdmcp xorg.libX11

     

       
15
       
15
       
-
       
  ] ++ lib.optional stdenv.hostPlatform.isDarwin darwin.apple_sdk.frameworks.CoreAudio;

     

       
22
       
22
       
+
       
  ];

     

       
16
       
23
       
 
       


     

       
17
       
17
       
-
       
  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       
18
       
18
       
-
       
    sed -i -e '/^#include <malloc.h>$/d' *.c

     

       
24
       
24
       
+
       
  # regparm attribute is not supported by clang

     

       
25
       
25
       
+
       
  postPatch = lib.optionalString stdenv.cc.isClang ''

     

       
26
       
26
       
+
       
    substituteInPlace config.h \

     

       
27
       
27
       
+
       
      --replace-fail "__attribute__ ((regparm(n)))" ""

     

       
19
       
28
       
 
       
  '';

     

       
20
       
20
       
-
       


     

       
21
       
21
       
-
       
  # error: 'regparm' is not valid on this platform

     

       
22
       
22
       
-
       
  env.NIX_CFLAGS_COMPILE = lib.optionalString (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64)

     

       
23
       
23
       
-
       
    "-D__STRICT_ANSI__";

     

       
24
       
29
       
 
       


     

       
25
       
30
       
 
       
  meta = with lib; {

     

       
26
       
31
       
 
       
    homepage    = "http://aa-project.sourceforge.net/bb";

     

···

       
1
       
1
       
+
       
diff --git a/bb.c b/bb.c

     

       
2
       
2
       
+
       
index 95850ef..6a7cc78 100644

     

       
3
       
3
       
+
       
--- a/bb.c

     

       
4
       
4
       
+
       
+++ b/bb.c

     

       
5
       
5
       
+
       
@@ -23,6 +23,7 @@

     

       
6
       
6
       
+
       
 

     

       
7
       
7
       
+
       
 #include <string.h>

     

       
8
       
8
       
+
       
 #include <stdlib.h>

     

       
9
       
9
       
+
       
+#include <time.h>

     

       
10
       
10
       
+
       
 #include <ctype.h>

     

       
11
       
11
       
+
       
 #include <aalib.h>

     

       
12
       
12
       
+
       
 #include "bb.h"

     

       
13
       
13
       
+
       
diff --git a/credits.c b/credits.c

     

       
14
       
14
       
+
       
index 8514579..b304d8c 100644

     

       
15
       
15
       
+
       
--- a/credits.c

     

       
16
       
16
       
+
       
+++ b/credits.c

     

       
17
       
17
       
+
       
@@ -24,7 +24,6 @@

     

       
18
       
18
       
+
       
 #include <math.h>

     

       
19
       
19
       
+
       
 #include <limits.h>

     

       
20
       
20
       
+
       
 #include <string.h>

     

       
21
       
21
       
+
       
-#include <malloc.h>

     

       
22
       
22
       
+
       
 #include <stdlib.h>

     

       
23
       
23
       
+
       
 #include "bb.h"

     

       
24
       
24
       
+
       
 #define STAR 1

     

       
25
       
25
       
+
       
diff --git a/credits2.c b/credits2.c

     

       
26
       
26
       
+
       
index 65d2431..9dcdf2d 100644

     

       
27
       
27
       
+
       
--- a/credits2.c

     

       
28
       
28
       
+
       
+++ b/credits2.c

     

       
29
       
29
       
+
       
@@ -25,7 +25,6 @@

     

       
30
       
30
       
+
       
 #include <math.h>

     

       
31
       
31
       
+
       
 #include <ctype.h>

     

       
32
       
32
       
+
       
 #include <string.h>

     

       
33
       
33
       
+
       
-#include <malloc.h>

     

       
34
       
34
       
+
       
 #include <stdlib.h>

     

       
35
       
35
       
+
       
 #include "bb.h"

     

       
36
       
36
       
+
       
 #define STATE (TIME-starttime)

     

       
37
       
37
       
+
       
diff --git a/main.c b/main.c

     

       
38
       
38
       
+
       
index ae852a7..c0648b4 100644

     

       
39
       
39
       
+
       
--- a/main.c

     

       
40
       
40
       
+
       
+++ b/main.c

     

       
41
       
41
       
+
       
@@ -21,6 +21,8 @@

     

       
42
       
42
       
+
       
  * 675 Mass Ave, Cambridge, MA 02139, USA.

     

       
43
       
43
       
+
       
  */

     

       
44
       
44
       
+
       
 

     

       
45
       
45
       
+
       
+#include <ctype.h>

     

       
46
       
46
       
+
       
+#include <string.h>

     

       
47
       
47
       
+
       
 #include <unistd.h>

     

       
48
       
48
       
+
       
 #include "timers.h"

     

       
49
       
49
       
+
       
 #include "bb.h"

     

       
50
       
50
       
+
       
diff --git a/messager.c b/messager.c

     

       
51
       
51
       
+
       
index 95cc410..5164577 100644

     

       
52
       
52
       
+
       
--- a/messager.c

     

       
53
       
53
       
+
       
+++ b/messager.c

     

       
54
       
54
       
+
       
@@ -22,7 +22,7 @@

     

       
55
       
55
       
+
       
  */

     

       
56
       
56
       
+
       
 

     

       
57
       
57
       
+
       
 #include <string.h>

     

       
58
       
58
       
+
       
-#include <malloc.h>

     

       
59
       
59
       
+
       
+#include <stdlib.h>

     

       
60
       
60
       
+
       
 #include "bb.h"

     

       
61
       
61
       
+
       
 

     

       
62
       
62
       
+
       
 static int cursor_x, cursor_y;

     

       
63
       
63
       
+
       
diff --git a/scene5.c b/scene5.c

     

       
64
       
64
       
+
       
index 8d3c798..4a79258 100644

     

       
65
       
65
       
+
       
--- a/scene5.c

     

       
66
       
66
       
+
       
+++ b/scene5.c

     

       
67
       
67
       
+
       
@@ -22,7 +22,7 @@

     

       
68
       
68
       
+
       
  */

     

       
69
       
69
       
+
       
 

     

       
70
       
70
       
+
       
 #include <string.h>

     

       
71
       
71
       
+
       
-#include <malloc.h>

     

       
72
       
72
       
+
       
+#include <stdlib.h>

     

       
73
       
73
       
+
       
 #include <math.h>

     

       
74
       
74
       
+
       
 #include "bb.h"

     

       
75
       
75
       
+
       
 #include "tex.h"

     

       
76
       
76
       
+
       
diff --git a/scene8.c b/scene8.c

     

       
77
       
77
       
+
       
index 2bcba1e..72ea231 100644

     

       
78
       
78
       
+
       
--- a/scene8.c

     

       
79
       
79
       
+
       
+++ b/scene8.c

     

       
80
       
80
       
+
       
@@ -22,7 +22,7 @@

     

       
81
       
81
       
+
       
  */

     

       
82
       
82
       
+
       
 

     

       
83
       
83
       
+
       
 #include <math.h>

     

       
84
       
84
       
+
       
-#include <malloc.h>

     

       
85
       
85
       
+
       
+#include <stdlib.h>

     

       
86
       
86
       
+
       
 #include "bb.h"

     

       
87
       
87
       
+
       
 #define STATE1 (TIME-starttime1)

     

       
88
       
88
       
+
       
 #define STATE (time-starttime)

     

       
89
       
89
       
+
       
diff --git a/textform.c b/textform.c

     

       
90
       
90
       
+
       
index 859d367..eb9d1cb 100644

     

       
91
       
91
       
+
       
--- a/textform.c

     

       
92
       
92
       
+
       
+++ b/textform.c

     

       
93
       
93
       
+
       
@@ -1,6 +1,6 @@

     

       
94
       
94
       
+
       
 #include <stdio.h>

     

       
95
       
95
       
+
       
 #include <string.h>

     

       
96
       
96
       
+
       
-#include <malloc.h>

     

       
97
       
97
       
+
       
+#include <stdlib.h>

     

       
98
       
98
       
+
       
 #include <aalib.h>

     

       
99
       
99
       
+
       
 #include "bb.h"

     

       
100
       
100
       
+
       
 #define MAXLINES 10000

     

       
101
       
101
       
+
       
diff --git a/timers.c b/timers.c

     

       
102
       
102
       
+
       
index ac822f7..6342c1b 100644

     

       
103
       
103
       
+
       
--- a/timers.c

     

       
104
       
104
       
+
       
+++ b/timers.c

     

       
105
       
105
       
+
       
@@ -45,12 +45,9 @@

     

       
106
       
106
       
+
       
 #include <time.h>

     

       
107
       
107
       
+
       
 #endif

     

       
108
       
108
       
+
       
    /*HAVE_TIME_H*/

     

       
109
       
109
       
+
       
-#include <malloc.h>

     

       
110
       
110
       
+
       
+#include <stdlib.h>

     

       
111
       
111
       
+
       
 #include <stdio.h>

     

       
112
       
112
       
+
       
 #include <unistd.h>

     

       
113
       
113
       
+
       
-#ifndef _MAC

     

       
114
       
114
       
+
       
-#include <malloc.h>

     

       
115
       
115
       
+
       
-#endif

     

       
116
       
116
       
+
       
 #ifdef __BEOS__

     

       
117
       
117
       
+
       
 #include <OS.h>

     

       
118
       
118
       
+
       
 #endif

     

       
119
       
119
       
+
       
diff --git a/uncompfn.c b/uncompfn.c

     

       
120
       
120
       
+
       
index d8eaaea..bc707f8 100644

     

       
121
       
121
       
+
       
--- a/uncompfn.c

     

       
122
       
122
       
+
       
+++ b/uncompfn.c

     

       
123
       
123
       
+
       
@@ -21,7 +21,7 @@

     

       
124
       
124
       
+
       
  * 675 Mass Ave, Cambridge, MA 02139, USA.

     

       
125
       
125
       
+
       
  */

     

       
126
       
126
       
+
       
 

     

       
127
       
127
       
+
       
-#include <malloc.h>

     

       
128
       
128
       
+
       
+#include <stdlib.h>

     

       
129
       
129
       
+
       
 #include <aalib.h>

     

       
130
       
130
       
+
       
 #include "bb.h"

     

       
131
       
131
       
+
       
 

     

       
132
       
132
       
+
       
diff --git a/zoom.c b/zoom.c

     

       
133
       
133
       
+
       
index 7450095..4b37b2d 100644

     

       
134
       
134
       
+
       
--- a/zoom.c

     

       
135
       
135
       
+
       
+++ b/zoom.c

     

       
136
       
136
       
+
       
@@ -31,9 +31,6 @@

     

       
137
       
137
       
+
       
 #else

     

       
138
       
138
       
+
       
 #include <stdlib.h>

     

       
139
       
139
       
+
       
 #include <stdio.h>

     

       
140
       
140
       
+
       
-#ifndef _MAC

     

       
141
       
141
       
+
       
-#include <malloc.h>

     

       
142
       
142
       
+
       
-#endif

     

       
143
       
143
       
+
       
 #ifdef __DJGPP__

     

       
144
       
144
       
+
       
 #include "aconfig.dos"

     

       
145
       
145
       
+
       
 #else

     

···

       
10
       
10
       
 
       


     

       
11
       
11
       
 
       
buildPythonApplication rec {

     

       
12
       
12
       
 
       
  pname = "gallery-dl";

     

       
13
       
13
       
-
       
  version = "1.27.6";

     

       
13
       
13
       
+
       
  version = "1.27.7";

     

       
14
       
14
       
 
       
  format = "setuptools";

     

       
15
       
15
       
 
       


     

       
16
       
16
       
 
       
  src = fetchPypi {

     

       
17
       
17
       
 
       
    inherit version;

     

       
18
       
18
       
 
       
    pname = "gallery_dl";

     

       
19
       
19
       
-
       
    hash = "sha256-bxh15aZIupTaHnYM65MAYuYtKx0z2OIQl3WKEU1gO4Q=";

     

       
19
       
19
       
+
       
    hash = "sha256-9YcxD7AH4U2dOhAiUnknwwGFy9pplFFQ7Rn4cOvDdEc=";

     

       
20
       
20
       
 
       
  };

     

       
21
       
21
       
 
       


     

       
22
       
22
       
 
       
  propagatedBuildInputs = [

     
···

       
25
       
25
       
 
       
  ];

     

       
26
       
26
       
 
       


     

       
27
       
27
       
 
       
  nativeCheckInputs = [ pytestCheckHook ];

     

       
28
       
28
       
+
       


     

       
29
       
29
       
+
       
  disabledTests = [

     

       
30
       
30
       
+
       
    # requires network access

     

       
31
       
31
       
+
       
    "test_init"

     

       
32
       
32
       
+
       
  ];

     

       
28
       
33
       
 
       


     

       
29
       
34
       
 
       
  pytestFlagsArray = [

     

       
30
       
35
       
 
       
    # requires network access

     

···

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
stdenv.mkDerivation rec {

     

       
4
       
4
       
 
       
  pname = "gremlin-console";

     

       
5
       
5
       
-
       
  version = "3.7.2";

     

       
5
       
5
       
+
       
  version = "3.7.3";

     

       
6
       
6
       
 
       
  src = fetchzip {

     

       
7
       
7
       
 
       
    url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip";

     

       
8
       
8
       
-
       
    sha256 = "sha256-lIrqMvI/sYGu36X3jNptoIz7mPVomk8YCIR/6y8mpEc=";

     

       
8
       
8
       
+
       
    sha256 = "sha256-27S1ukq9rHncFuPBZmwIP/bKuPYm3AxdBK3PliYTGEQ=";

     

       
9
       
9
       
 
       
  };

     

       
10
       
10
       
 
       


     

       
11
       
11
       
 
       
  nativeBuildInputs = [ makeWrapper ];

     

···

       
1
       
1
       
-
       
{ lib, stdenv, fetchurl, qmake, wrapQtAppsHook, ffmpeg, qtmultimedia, qwt }:

     

       
1
       
1
       
+
       
{ lib, stdenv, fetchurl, qmake, wrapQtAppsHook, ffmpeg_6, qtmultimedia, qwt }:

     

       
2
       
2
       
 
       


     

       
3
       
3
       
 
       
stdenv.mkDerivation rec {

     

       
4
       
4
       
 
       
  pname = "qctools";

     
···

       
13
       
13
       
 
       


     

       
14
       
14
       
 
       
  nativeBuildInputs = [ qmake wrapQtAppsHook ];

     

       
15
       
15
       
 
       


     

       
16
       
16
       
-
       
  buildInputs = [ ffmpeg qtmultimedia qwt ];

     

       
16
       
16
       
+
       
  buildInputs = [ ffmpeg_6 qtmultimedia qwt ];

     

       
17
       
17
       
 
       


     

       
18
       
18
       
 
       
  installPhase = ''

     

       
19
       
19
       
 
       
    runHook preInstall

     
···

       
30
       
30
       
 
       
    runHook postInstall

     

       
31
       
31
       
 
       
  '';

     

       
32
       
32
       
 
       


     

       
33
       
33
       
-
       
  meta = with lib; {

     

       
33
       
33
       
+
       
  meta = {

     

       
34
       
34
       
 
       
    description = "Audiovisual analytics and filtering of video files";

     

       
35
       
35
       
 
       
    homepage = "https://mediaarea.net/QCTools";

     

       
36
       
36
       
-
       
    license = licenses.gpl3Only;

     

       
37
       
37
       
-
       
    maintainers = with maintainers; [ orivej ];

     

       
38
       
38
       
-
       
    platforms = platforms.linux;

     

       
36
       
36
       
+
       
    license = lib.licenses.gpl3Only;

     

       
37
       
37
       
+
       
    maintainers = with lib.maintainers; [ orivej ];

     

       
38
       
38
       
+
       
    platforms = lib.platforms.linux;

     

       
39
       
39
       
 
       
  };

     

       
40
       
40
       
 
       
}

     

···

       
1
       
1
       
+
       
Upstream PR: https://github.com/r00t0v3rr1d3/armitage/pull/1

     

       
2
       
2
       
+
       
diff --git a/armitage/build.gradle b/armitage/build.gradle

     

       
3
       
3
       
+
       
index 43a5d08..50ae084 100644

     

       
4
       
4
       
+
       
--- a/armitage/build.gradle

     

       
5
       
5
       
+
       
+++ b/armitage/build.gradle

     

       
6
       
6
       
+
       
@@ -19,7 +19,7 @@ jar {

     

       
7
       
7
       
+
       
     from {

     

       
8
       
8
       
+
       
         configurations.compileClasspath.filter { it.exists() }.collect { it.isDirectory() ? it : zipTree(it) }

     

       
9
       
9
       
+
       
     }

     

       
10
       
10
       
+
       
-    archiveName 'armitage.jar'

     

       
11
       
11
       
+
       
+    archiveFileName.set 'armitage.jar'

     

       
12
       
12
       
+
       
 }

     

       
13
       
13
       
+
       
 

     

       
14
       
14
       
+
       
 dependencies {

     

       
15
       
15
       
+
       
diff --git a/cortana/build.gradle b/cortana/build.gradle

     

       
16
       
16
       
+
       
index c7d08bb..aa54635 100644

     

       
17
       
17
       
+
       
--- a/cortana/build.gradle

     

       
18
       
18
       
+
       
+++ b/cortana/build.gradle

     

       
19
       
19
       
+
       
@@ -19,7 +19,8 @@ jar {

     

       
20
       
20
       
+
       
     from {

     

       
21
       
21
       
+
       
         configurations.compileClasspath.filter { it.exists() }.collect { it.isDirectory() ? it : zipTree(it) }

     

       
22
       
22
       
+
       
     }

     

       
23
       
23
       
+
       
-    archiveName 'cortana.jar'

     

       
24
       
24
       
+
       
+    duplicatesStrategy DuplicatesStrategy.INCLUDE

     

       
25
       
25
       
+
       
+    archiveFileName.set 'cortana.jar'

     

       
26
       
26
       
+
       
 }

     

       
27
       
27
       
+
       
 

     

       
28
       
28
       
+
       
 dependencies {

     

···

       
3
       
3
       
 
       
, fetchurl

     

       
4
       
4
       
 
       
, fetchFromGitHub

     

       
5
       
5
       
 
       
, jdk11

     

       
6
       
6
       
-
       
, gradle_6

     

       
6
       
6
       
+
       
, gradle

     

       
7
       
7
       
 
       
, metasploit

     

       
8
       
8
       
 
       
, makeWrapper

     

       
9
       
9
       
 
       
, makeDesktopItem

     
···

       
14
       
14
       
 
       
let

     

       
15
       
15
       
 
       
  pname = "armitage";

     

       
16
       
16
       
 
       
  version = "unstable-2022-12-05";

     

       
17
       
17
       
-
       


     

       
18
       
18
       
-
       
  gradle = gradle_6;

     

       
19
       
17
       
 
       


     

       
20
       
18
       
 
       
  src = fetchFromGitHub {

     

       
21
       
19
       
 
       
    owner = "r00t0v3rr1d3";

     
···

       
45
       
43
       
 
       
      url = "https://gitlab.com/kalilinux/packages/armitage/-/raw/042beb7494a10227761ecb3ddabf4019bbb78681/debian/patches/fix-meterpreter.patch";

     

       
46
       
44
       
 
       
      hash = "sha256-p4fs5xFdC2apW0U8x8u9S4p5gq3Eiv+0E4CGccQZYKY=";

     

       
47
       
45
       
 
       
    })

     

       
46
       
46
       
+
       
    # Update for Gradle 8 (https://github.com/r00t0v3rr1d3/armitage/pull/1)

     

       
47
       
47
       
+
       
    ./gradle-8.patch

     

       
48
       
48
       
 
       
  ];

     

       
49
       
49
       
 
       


     

       
50
       
50
       
 
       
in

     

···

       
7
       
7
       
 
       


     

       
8
       
8
       
 
       
buildGoModule rec {

     

       
9
       
9
       
 
       
  pname = "atproto-goat";

     

       
10
       
10
       
-
       
  version = "0-unstable-2024-10-08";

     

       
10
       
10
       
+
       
  version = "0-unstable-2024-10-29";

     

       
11
       
11
       
 
       


     

       
12
       
12
       
 
       
  src = fetchFromGitHub {

     

       
13
       
13
       
 
       
    owner = "bluesky-social";

     

       
14
       
14
       
 
       
    repo = "indigo";

     

       
15
       
15
       
-
       
    rev = "06bacb465af714feb77609566aba15ab1ed41e24";

     

       
16
       
16
       
-
       
    hash = "sha256-wWsE3sAGZQmOBVqTgy4RjoU8zmtuvyQIj9DjwSbtmKw=";

     

       
15
       
15
       
+
       
    rev = "983ce4a481a32a3eb2944c4c76e885d0f6006f83";

     

       
16
       
16
       
+
       
    hash = "sha256-Jo3pI4uRyKh3yV03ijOcg+Uyu75Spmy/VS116MVgleU=";

     

       
17
       
17
       
 
       
  };

     

       
18
       
18
       
 
       


     

       
19
       
19
       
 
       
  postPatch = ''

     

···

       
8
       
8
       
 
       
  version = "0-unstable-2024-08-14";

     

       
9
       
9
       
 
       
  pyproject = false;

     

       
10
       
10
       
 
       


     

       
11
       
11
       
-
       
  src = lib.fileset.toSource {

     

       
12
       
12
       
-
       
    root = ./.;

     

       
13
       
13
       
-
       
    fileset = lib.fileset.unions [

     

       
14
       
14
       
-
       
      ./auto-patchelf.py

     

       
15
       
15
       
-
       
    ];

     

       
16
       
16
       
-
       
  };

     

       
11
       
11
       
+
       
  src = ./src;

     

       
17
       
12
       
 
       


     

       
18
       
13
       
 
       
  dependencies = with python3Packages; [

     

       
19
       
14
       
 
       
    pyelftools

     

···

       
62
       
62
       
 
       
in

     

       
63
       
63
       
 
       
py.pkgs.buildPythonApplication rec {

     

       
64
       
64
       
 
       
  pname = "awscli2";

     

       
65
       
65
       
-
       
  version = "2.17.64"; # N.B: if you change this, check if overrides are still up-to-date

     

       
65
       
65
       
+
       
  version = "2.18.15"; # N.B: if you change this, check if overrides are still up-to-date

     

       
66
       
66
       
 
       
  pyproject = true;

     

       
67
       
67
       
 
       


     

       
68
       
68
       
 
       
  src = fetchFromGitHub {

     

       
69
       
69
       
 
       
    owner = "aws";

     

       
70
       
70
       
 
       
    repo = "aws-cli";

     

       
71
       
71
       
 
       
    rev = "refs/tags/${version}";

     

       
72
       
72
       
-
       
    hash = "sha256-Hq86KhAIATSz3dF1zO6aSdZQAfLs4EcRqWglAOJUVGk=";

     

       
72
       
72
       
+
       
    hash = "sha256-dm4Z3WsFq5GQN6gvi5OS9J96PqhGx8Qz2OsHwUBrsAs=";

     

       
73
       
73
       
 
       
  };

     

       
74
       
74
       
 
       


     

       
75
       
75
       
-
       
  patches = [ ];

     

       
76
       
76
       
-
       


     

       
77
       
75
       
 
       
  postPatch = ''

     

       
78
       
76
       
 
       
    substituteInPlace pyproject.toml \

     

       
79
       
79
       
-
       
      --replace-fail 'awscrt>=0.19.18,<=0.21.2' 'awscrt>=0.19.18' \

     

       
80
       
80
       
-
       
      --replace-fail 'cryptography>=40.0.0,<40.0.2' 'cryptography>=43.0.0' \

     

       
77
       
77
       
+
       
      --replace-fail 'awscrt>=0.19.18,<=0.22.0' 'awscrt>=0.22.0' \

     

       
78
       
78
       
+
       
      --replace-fail 'cryptography>=40.0.0,<43.0.2' 'cryptography>=43.0.0' \

     

       
81
       
79
       
 
       
      --replace-fail 'distro>=1.5.0,<1.9.0' 'distro>=1.5.0' \

     

       
82
       
80
       
 
       
      --replace-fail 'docutils>=0.10,<0.20' 'docutils>=0.10' \

     

       
83
       
81
       
 
       
      --replace-fail 'prompt-toolkit>=3.0.24,<3.0.39' 'prompt-toolkit>=3.0.24'

     

···

       
7
       
7
       
 
       


     

       
8
       
8
       
 
       
python3.pkgs.buildPythonApplication rec {

     

       
9
       
9
       
 
       
  pname = "bitbake-language-server";

     

       
10
       
10
       
-
       
  version = "0.0.14";

     

       
10
       
10
       
+
       
  version = "0.0.15";

     

       
11
       
11
       
 
       
  format = "pyproject";

     

       
12
       
12
       
 
       


     

       
13
       
13
       
 
       
  src = fetchFromGitHub {

     

       
14
       
14
       
 
       
    owner = "Freed-Wu";

     

       
15
       
15
       
 
       
    repo = pname;

     

       
16
       
16
       
 
       
    rev = version;

     

       
17
       
17
       
-
       
    hash = "sha256-aGj9lW420A+iTQWSCdIITAJj3p89VUkPvdhQ/0M6uXo=";

     

       
17
       
17
       
+
       
    hash = "sha256-NLDQ2P5peweugkoNYskpCyCEgBwVFA7RTs8+NvH8fj8=";

     

       
18
       
18
       
 
       
  };

     

       
19
       
19
       
 
       


     

       
20
       
20
       
 
       
  nativeBuildInputs = with python3.pkgs; [

     

···

       
1
       
1
       
+
       
diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       
2
       
2
       
+
       
index 1a30d61..bea8d7c 100644

     

       
3
       
3
       
+
       
--- a/CMakeLists.txt

     

       
4
       
4
       
+
       
+++ b/CMakeLists.txt

     

       
5
       
5
       
+
       
@@ -50,13 +50,6 @@ include(FetchContent)

     

       
6
       
6
       
+
       
 

     

       
7
       
7
       
+
       
 set(CMAKE_VERBOSE_MAKEFILE ON)

     

       
8
       
8
       
+
       
 

     

       
9
       
9
       
+
       
-#========================================== PRE-CHECKS ============================================#

     

       
10
       
10
       
+
       
-include(FindGit)

     

       
11
       
11
       
+
       
-find_package(Git)

     

       
12
       
12
       
+
       
-

     

       
13
       
13
       
+
       
-if (NOT Git_FOUND)

     

       
14
       
14
       
+
       
-    message(FATAL_ERROR "Required package 'Git' not found on system.")

     

       
15
       
15
       
+
       
-endif ()

     

       
16
       
16
       
+
       
 

     

       
17
       
17
       
+
       
 #======================================== LIB IMPORTS =============================================#

     

       
18
       
18
       
+
       
 # ======= #

     

       
19
       
19
       
+
       
@@ -68,28 +61,9 @@ include_directories(${OPENSSL_INCLUDE_DIR})

     

       
20
       
20
       
+
       
 # ============== #

     

       
21
       
21
       
+
       
 # JSON-C library #

     

       
22
       
22
       
+
       
 # ============== #

     

       
23
       
23
       
+
       
-set(JSONC_DOWNLOAD_PATH "${TEMP_DIR_PATH}/libjsonc")

     

       
24
       
24
       
+
       
-set(JSONC_INSTALL_PATH "${CMAKE_EXTERNAL_OUTPUT_DIRECTORY}")

     

       
25
       
25
       
+
       
-

     

       
26
       
26
       
+
       
-add_custom_target(make-jsonc-install-dir ALL

     

       
27
       
27
       
+
       
-        COMMAND ${CMAKE_COMMAND} -E make_directory ${JSONC_INSTALL_PATH}

     

       
28
       
28
       
+
       
-)

     

       
29
       
29
       
+
       
-

     

       
30
       
30
       
+
       
-ExternalProject_Add(libjsonc

     

       
31
       
31
       
+
       
-        PREFIX         "${JSONC_DOWNLOAD_PATH}"

     

       
32
       
32
       
+
       
-        SOURCE_DIR     "${JSONC_DOWNLOAD_PATH}/src/libjsonc-build"

     

       
33
       
33
       
+
       
-        GIT_REPOSITORY "https://github.com/json-c/json-c.git"

     

       
34
       
34
       
+
       
-        CMAKE_ARGS     "-DBUILD_STATIC_LIBS=ON"

     

       
35
       
35
       
+
       
-                       "-DBUILD_SHARED_LIBS=OFF"

     

       
36
       
36
       
+
       
-                       "-DCMAKE_INSTALL_PREFIX:PATH=${JSONC_INSTALL_PATH}"

     

       
37
       
37
       
+
       
-                       "-DHAVE_ARC4RANDOM=OFF"

     

       
38
       
38
       
+
       
-                       "-DCMAKE_BUILD_TYPE=release"

     

       
39
       
39
       
+
       
-)

     

       
40
       
40
       
+
       
-

     

       
41
       
41
       
+
       
-set(JSONC_LIBRARIES

     

       
42
       
42
       
+
       
-        ${CMAKE_EXTERNAL_OUTPUT_DIRECTORY}/lib/libjson-c.a

     

       
43
       
43
       
+
       
-        bsd

     

       
44
       
44
       
+
       
-)

     

       
45
       
45
       
+
       
+find_package(PkgConfig REQUIRED)

     

       
46
       
46
       
+
       
+pkg_check_modules(JSONC REQUIRED json-c)

     

       
47
       
47
       
+
       
+include_directories(${JSONC_INCLUDE_DIRS})

     

       
48
       
48
       
+
       
 

     

       
49
       
49
       
+
       
 # ============ #

     

       
50
       
50
       
+
       
 # Curl library #

     

       
51
       
51
       
+
       
@@ -408,7 +382,7 @@ add_subdirectory(docs)

     

       
52
       
52
       
+
       
 #endforeach()

     

       
53
       
53
       
+
       
 

     

       
54
       
54
       
+
       
 add_executable(ctune ${SOURCE_FILES})

     

       
55
       
55
       
+
       
-add_dependencies(ctune ctune_logger libjsonc)

     

       
56
       
56
       
+
       
+add_dependencies(ctune ctune_logger)

     

       
57
       
57
       
+
       
 include_directories(${CMAKE_EXTERNAL_OUTPUT_DIRECTORY}/include)

     

       
58
       
58
       
+
       
 

     

       
59
       
59
       
+
       
 add_dependencies(ctune ${CTUNE_PLUGIN_LIST_AUDIO_PLAYER})

     

···

       
1
       
1
       
+
       
{

     

       
2
       
2
       
+
       
  stdenv,

     

       
3
       
3
       
+
       
  lib,

     

       
4
       
4
       
+
       
  fetchFromGitHub,

     

       
5
       
5
       
+
       
  openssl,

     

       
6
       
6
       
+
       
  curl,

     

       
7
       
7
       
+
       
  ffmpeg,

     

       
8
       
8
       
+
       
  vlc,

     

       
9
       
9
       
+
       
  SDL2,

     

       
10
       
10
       
+
       
  lame,

     

       
11
       
11
       
+
       
  json_c,

     

       
12
       
12
       
+
       
  cmake,

     

       
13
       
13
       
+
       
  pkg-config,

     

       
14
       
14
       
+
       
  ncurses,

     

       
15
       
15
       
+
       
  libuuid,

     

       
16
       
16
       
+
       
  pandoc,

     

       
17
       
17
       
+
       
}:

     

       
18
       
18
       
+
       
stdenv.mkDerivation (finalAttrs: {

     

       
19
       
19
       
+
       
  pname = "ctune";

     

       
20
       
20
       
+
       
  version = "1.3.2";

     

       
21
       
21
       
+
       


     

       
22
       
22
       
+
       
  src = fetchFromGitHub {

     

       
23
       
23
       
+
       
    owner = "An7ar35";

     

       
24
       
24
       
+
       
    repo = "ctune";

     

       
25
       
25
       
+
       
    rev = "refs/tags/v${finalAttrs.version}";

     

       
26
       
26
       
+
       
    hash = "sha256-fy7Wb4R6HDa+cLxI5YWq67gxw1XS/iDDN4M3Rn7GYeI=";

     

       
27
       
27
       
+
       
  };

     

       
28
       
28
       
+
       


     

       
29
       
29
       
+
       
  nativeBuildInputs = [

     

       
30
       
30
       
+
       
    cmake

     

       
31
       
31
       
+
       
    pkg-config

     

       
32
       
32
       
+
       
    pandoc

     

       
33
       
33
       
+
       
  ];

     

       
34
       
34
       
+
       


     

       
35
       
35
       
+
       
  buildInputs = [

     

       
36
       
36
       
+
       
    openssl

     

       
37
       
37
       
+
       
    curl

     

       
38
       
38
       
+
       
    ffmpeg

     

       
39
       
39
       
+
       
    vlc

     

       
40
       
40
       
+
       
    SDL2

     

       
41
       
41
       
+
       
    lame

     

       
42
       
42
       
+
       
    json_c

     

       
43
       
43
       
+
       
    ncurses

     

       
44
       
44
       
+
       
    libuuid

     

       
45
       
45
       
+
       
  ];

     

       
46
       
46
       
+
       


     

       
47
       
47
       
+
       
  strictDeps = true;

     

       
48
       
48
       
+
       


     

       
49
       
49
       
+
       
  cmakeFlags = [

     

       
50
       
50
       
+
       
    # Avoid a wrong nested install path location

     

       
51
       
51
       
+
       
    # Set to "$out" instead of "$out/$out"

     

       
52
       
52
       
+
       
    "-DCMAKE_INSTALL_PREFIX=''"

     

       
53
       
53
       
+
       
  ];

     

       
54
       
54
       
+
       


     

       
55
       
55
       
+
       
  patches = [ ./cmake_disable_git_clone.patch ];

     

       
56
       
56
       
+
       


     

       
57
       
57
       
+
       
  meta = {

     

       
58
       
58
       
+
       
    description = "A nice terminal nCurses (tui) internet radio player for Linux, browse and search from api.radio-browser.info";

     

       
59
       
59
       
+
       
    homepage = " https://github.com/An7ar35/ctune";

     

       
60
       
60
       
+
       
    changelog = "https://github.com/An7ar35/ctune/blob/master/CHANGELOG.md";

     

       
61
       
61
       
+
       
    license = lib.licenses.agpl3Plus;

     

       
62
       
62
       
+
       
    maintainers = with lib.maintainers; [ theobori ];

     

       
63
       
63
       
+
       
    mainProgram = "ctune";

     

       
64
       
64
       
+
       
    platforms = lib.platforms.linux;

     

       
65
       
65
       
+
       
  };

     

       
66
       
66
       
+
       
})

     

···

       
1
       
1
       
 
       
GEM

     

       
2
       
2
       
 
       
  remote: https://rubygems.org/

     

       
3
       
3
       
 
       
  specs:

     

       
4
       
4
       
-
       
    facter (4.8.0)

     

       
4
       
4
       
+
       
    facter (4.10.0)

     

       
5
       
5
       
 
       
      hocon (~> 1.3)

     

       
6
       
6
       
 
       
      thor (>= 1.0.1, < 1.3)

     

       
7
       
7
       
 
       
    hocon (1.4.0)

     

···

       
5
       
5
       
 
       
    platforms = [];

     

       
6
       
6
       
 
       
    source = {

     

       
7
       
7
       
 
       
      remotes = ["https://rubygems.org"];

     

       
8
       
8
       
-
       
      sha256 = "1130mzk90pi0y9fnraqqak7gcfg61dhx92axwnhchbpw09akfl09";

     

       
8
       
8
       
+
       
      sha256 = "17d561xf4s5016fm9jkfkkafn6660g04fz1yp5xfvkb0j4xj32mp";

     

       
9
       
9
       
 
       
      type = "gem";

     

       
10
       
10
       
 
       
    };

     

       
11
       
11
       
-
       
    version = "4.8.0";

     

       
11
       
11
       
+
       
    version = "4.10.0";

     

       
12
       
12
       
 
       
  };

     

       
13
       
13
       
 
       
  hocon = {

     

       
14
       
14
       
 
       
    groups = ["default"];

     

···

       
1
       
1
       
+
       
{

     

       
2
       
2
       
+
       
  lib,

     

       
3
       
3
       
+
       
  rustPlatform,

     

       
4
       
4
       
+
       
  fetchFromGitHub,

     

       
5
       
5
       
+
       
}:

     

       
6
       
6
       
+
       


     

       
7
       
7
       
+
       
rustPlatform.buildRustPackage rec {

     

       
8
       
8
       
+
       
  pname = "hexyl";

     

       
9
       
9
       
+
       
  version = "0.15.0";

     

       
10
       
10
       
+
       


     

       
11
       
11
       
+
       
  src = fetchFromGitHub {

     

       
12
       
12
       
+
       
    owner = "sharkdp";

     

       
13
       
13
       
+
       
    repo = "hexyl";

     

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

     

       
15
       
15
       
+
       
    hash = "sha256-v/mB0W/AyoJSoK00pqxpfMGZR/4DkkTCnPU6eorl/GI=";

     

       
16
       
16
       
+
       
  };

     

       
17
       
17
       
+
       


     

       
18
       
18
       
+
       
  cargoHash = "sha256-QaOp7dCXfkIpxAJ+J+Pt9op3uj+LYoYvR78BmHBgnqE=";

     

       
19
       
19
       
+
       


     

       
20
       
20
       
+
       
  meta = {

     

       
21
       
21
       
+
       
    description = "Command-line hex viewer";

     

       
22
       
22
       
+
       
    longDescription = ''

     

       
23
       
23
       
+
       
      `hexyl` is a simple hex viewer for the terminal. It uses a colored

     

       
24
       
24
       
+
       
      output to distinguish different categories of bytes (NULL bytes,

     

       
25
       
25
       
+
       
      printable ASCII characters, ASCII whitespace characters, other ASCII

     

       
26
       
26
       
+
       
      characters and non-ASCII).

     

       
27
       
27
       
+
       
    '';

     

       
28
       
28
       
+
       
    homepage = "https://github.com/sharkdp/hexyl";

     

       
29
       
29
       
+
       
    changelog = "https://github.com/sharkdp/hexyl/blob/v${version}/CHANGELOG.md";

     

       
30
       
30
       
+
       
    license = with lib.licenses; [

     

       
31
       
31
       
+
       
      asl20

     

       
32
       
32
       
+
       
      mit

     

       
33
       
33
       
+
       
    ];

     

       
34
       
34
       
+
       
    maintainers = with lib.maintainers; [

     

       
35
       
35
       
+
       
      dywedir

     

       
36
       
36
       
+
       
      figsoda

     

       
37
       
37
       
+
       
      SuperSandro2000

     

       
38
       
38
       
+
       
    ];

     

       
39
       
39
       
+
       
    mainProgram = "hexyl";

     

       
40
       
40
       
+
       
  };

     

       
41
       
41
       
+
       
}

     

···

       
90
       
90
       
 
       
      ++ lib.optionals mediaSupport [ ffmpeg ]

     

       
91
       
91
       
 
       
  );

     

       
92
       
92
       
 
       


     

       
93
       
93
       
-
       
  version = "13.5.7";

     

       
93
       
93
       
+
       
  version = "13.5.9";

     

       
94
       
94
       
 
       


     

       
95
       
95
       
 
       
  sources = {

     

       
96
       
96
       
 
       
    x86_64-linux = fetchurl {

     
···

       
102
       
102
       
 
       
        "https://tor.eff.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"

     

       
103
       
103
       
 
       
        "https://tor.calyxinstitute.org/dist/mullvadbrowser/${version}/mullvad-browser-linux-x86_64-${version}.tar.xz"

     

       
104
       
104
       
 
       
      ];

     

       
105
       
105
       
-
       
      hash = "sha256-Te6Cw3fUs4XGz07lL54bKUU9HYC5soaKFlbWGujd/oU=";

     

       
105
       
105
       
+
       
      hash = "sha256-hyFYI42IfFY0vqkqInkLQAWSY8flsmWGN8CaXBwXbGA=";

     

       
106
       
106
       
 
       
    };

     

       
107
       
107
       
 
       
  };

     

       
108
       
108
       
 
       


     

···

       
4
       
4
       
 
       


     

       
5
       
5
       
 
       
buildGoModule rec {

     

       
6
       
6
       
 
       
  pname = "orbiton";

     

       
7
       
7
       
-
       
  version = "2.65.12";

     

       
7
       
7
       
+
       
  version = "2.67.1";

     

       
8
       
8
       
 
       


     

       
9
       
9
       
 
       
  src = fetchFromGitHub {

     

       
10
       
10
       
 
       
    owner = "xyproto";

     

       
11
       
11
       
 
       
    repo = "orbiton";

     

       
12
       
12
       
 
       
    rev = "v${version}";

     

       
13
       
13
       
-
       
    hash = "sha256-1KVw2dj//6vwUUj1jVWe2J/9F6J8BQsvCAEbJZnW26c=";

     

       
13
       
13
       
+
       
    hash = "sha256-/5USD588kr3uB/Zs1ASKVgxH4kAWZCNBrZL7qqx49gU=";

     

       
14
       
14
       
 
       
  };

     

       
15
       
15
       
 
       


     

       
16
       
16
       
 
       
  vendorHash = null;

     

       
17
       
17
       
 
       


     

       
18
       
18
       
-
       
  postPatch = lib.optionalString stdenv.hostPlatform.isDarwin ''

     

       
19
       
19
       
-
       
    substituteInPlace Makefile \

     

       
20
       
20
       
-
       
      --replace "-Wl,--as-needed" ""

     

       
21
       
21
       
-
       


     

       
22
       
22
       
-
       
    # Requires impure pbcopy and pbpaste

     

       
23
       
23
       
-
       
    substituteInPlace v2/pbcopy_test.go \

     

       
24
       
24
       
-
       
      --replace TestPBcopy SkipTestPBcopy

     

       
25
       
25
       
-
       
  '';

     

       
26
       
26
       
-
       


     

       
27
       
18
       
 
       
  nativeBuildInputs = [ installShellFiles makeWrapper pkg-config ];

     

       
28
       
19
       
 
       


     

       
29
       
20
       
 
       
  buildInputs = lib.optional withGui vte;

     

       
30
       
21
       
 
       


     

       
31
       
22
       
 
       
  preBuild = "cd v2";

     

       
23
       
23
       
+
       


     

       
24
       
24
       
+
       
  checkFlags = [

     

       
25
       
25
       
+
       
    "-skip=TestPBcopy" # Requires impure pbcopy and pbpaste

     

       
26
       
26
       
+
       
  ];

     

       
32
       
27
       
 
       


     

       
33
       
28
       
 
       
  postInstall = ''

     

       
34
       
29
       
 
       
    cd ..

     

···

       
1
       
1
       
 
       
source 'https://rubygems.org'

     

       
2
       
2
       
-
       
gem 'pdk', '3.2.0'

     

       
2
       
2
       
+
       
gem 'pdk', '3.3.0'

     

···

       
1
       
1
       
 
       
GEM

     

       
2
       
2
       
 
       
  remote: https://rubygems.org/

     

       
3
       
3
       
 
       
  specs:

     

       
4
       
4
       
-
       
    addressable (2.8.6)

     

       
5
       
5
       
-
       
      public_suffix (>= 2.0.2, < 6.0)

     

       
6
       
6
       
-
       
    childprocess (4.1.0)

     

       
7
       
7
       
-
       
    cri (2.15.11)

     

       
4
       
4
       
+
       
    addressable (2.8.7)

     

       
5
       
5
       
+
       
      public_suffix (>= 2.0.2, < 7.0)

     

       
6
       
6
       
+
       
    childprocess (5.1.0)

     

       
7
       
7
       
+
       
      logger (~> 1.5)

     

       
8
       
8
       
+
       
    cri (2.15.12)

     

       
8
       
9
       
 
       
    deep_merge (1.2.2)

     

       
9
       
10
       
 
       
    diff-lcs (1.5.1)

     

       
10
       
11
       
 
       
    ffi (1.17.0)

     

       
11
       
12
       
 
       
    hitimes (2.0.0)

     

       
12
       
12
       
-
       
    json-schema (4.3.0)

     

       
13
       
13
       
+
       
    json-schema (4.3.1)

     

       
13
       
14
       
 
       
      addressable (>= 2.8)

     

       
14
       
15
       
 
       
    json_pure (2.6.3)

     

       
15
       
15
       
-
       
    minitar (0.9)

     

       
16
       
16
       
+
       
    logger (1.6.1)

     

       
17
       
17
       
+
       
    minitar (0.12.1)

     

       
16
       
18
       
 
       
    pastel (0.8.0)

     

       
17
       
19
       
 
       
      tty-color (~> 0.5)

     

       
18
       
20
       
 
       
    pathspec (1.1.3)

     

       
19
       
19
       
-
       
    pdk (3.2.0)

     

       
21
       
21
       
+
       
    pdk (3.3.0)

     

       
20
       
22
       
 
       
      bundler (>= 2.1.0, < 3.0.0)

     

       
21
       
21
       
-
       
      childprocess (~> 4.1.0)

     

       
23
       
23
       
+
       
      childprocess (~> 5.0)

     

       
22
       
24
       
 
       
      cri (~> 2.15.11)

     

       
23
       
25
       
 
       
      deep_merge (~> 1.2.2)

     

       
24
       
26
       
 
       
      diff-lcs (>= 1.5.0)

     
···

       
28
       
30
       
 
       
      json_pure (~> 2.6.3)

     

       
29
       
31
       
 
       
      minitar (~> 0.8)

     

       
30
       
32
       
 
       
      pathspec (~> 1.1)

     

       
33
       
33
       
+
       
      puppet-modulebuilder (~> 1.0)

     

       
31
       
34
       
 
       
      tty-prompt (~> 0.23)

     

       
32
       
35
       
 
       
      tty-spinner (~> 0.9)

     

       
33
       
36
       
 
       
      tty-which (~> 0.5)

     

       
34
       
34
       
-
       
    public_suffix (5.0.5)

     

       
37
       
37
       
+
       
    public_suffix (6.0.1)

     

       
38
       
38
       
+
       
    puppet-modulebuilder (1.1.0)

     

       
39
       
39
       
+
       
      minitar (~> 0.9)

     

       
40
       
40
       
+
       
      pathspec (>= 0.2.1, < 3.0.0)

     

       
35
       
41
       
 
       
    tty-color (0.6.0)

     

       
36
       
42
       
 
       
    tty-cursor (0.7.1)

     

       
37
       
43
       
 
       
    tty-prompt (0.23.1)

     
···

       
51
       
57
       
 
       
  ruby

     

       
52
       
58
       
 
       


     

       
53
       
59
       
 
       
DEPENDENCIES

     

       
54
       
54
       
-
       
  pdk (= 3.2.0)

     

       
60
       
60
       
+
       
  pdk (= 3.3.0)

     

       
55
       
61
       
 
       


     

       
56
       
62
       
 
       
BUNDLED WITH

     

       
57
       
57
       
-
       
   2.5.9

     

       
63
       
63
       
+
       
   2.5.16