commit 6ce4f409b0d496e52c0f18e5331f30c1af6d6a9d · pyrox.dev/nixpkgs

+16 -115

.github/workflows/check-by-name.yml

···

       1
       1
        
       # Checks pkgs/by-name (see pkgs/by-name/README.md)

     

       2
       2
        
       # using the nixpkgs-check-by-name tool (see pkgs/test/nixpkgs-check-by-name)

     

       3
       3
       +
       #

     

       4
       4
       +
       # When you make changes to this workflow, also update pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh adequately

     

       3
       5
        
       name: Check pkgs/by-name

     

       4
       6
        
       

     

       5
       7
        
       # The pre-built tool is fetched from a channel,

     
···

       21
       23
        
           # The default of 6 hours is definitely too long

     

       22
       24
        
           timeout-minutes: 10

     

       23
       25
        
           steps:

     

       26
       26
       +
             # This step has to be in this file,

     

       27
       27
       +
             # because it's needed to determine which revision of the repository to fetch,

     

       28
       28
       +
             # and we can only use other files from the repository once it's fetched.

     

       24
       29
        
             - name: Resolving the merge commit

     

       25
       30
        
               env:

     

       26
       31
        
                 GH_TOKEN: ${{ github.token }}

     
···

       80
       85
        
                 ref: ${{ env.mergedSha }}

     

       81
       86
        
                 # Fetches the merge commit and its parents

     

       82
       87
        
                 fetch-depth: 2

     

       83
       83
       -
             - name: Determining PR git hashes

     

       88
       88
       +
             - name: Checking out base branch

     

       84
       89
        
               run: |

     

       85
       85
       -
                 # For pull_request_target this is the same as $GITHUB_SHA

     

       86
       86
       -
                 echo "baseSha=$(git rev-parse HEAD^1)" >> "$GITHUB_ENV"

     

       87
       87
       -
       

     

       88
       88
       -
                 echo "headSha=$(git rev-parse HEAD^2)" >> "$GITHUB_ENV"

     

       90
       90
       +
                 base=$(mktemp -d)

     

       91
       91
       +
                 git worktree add "$base" "$(git rev-parse HEAD^1)"

     

       92
       92
       +
                 echo "base=$base" >> "$GITHUB_ENV"

     

       89
       93
        
             - uses: cachix/install-nix-action@7ac1ec25491415c381d9b62f0657c7a028df52a7 # v24

     

       90
       90
       -
             - name: Determining channel to use for dependencies

     

       91
       91
       -
               run: |

     

       92
       92
       -
                 echo "Determining the preferred channel to use for PR base branch $GITHUB_BASE_REF"

     

       93
       93
       -
                 if [[ "$GITHUB_BASE_REF" =~ ^(release|staging|staging-next)-([0-9][0-9]\.[0-9][0-9])$ ]]; then

     

       94
       94
       -
                     # Use the release channel for all PRs to release-XX.YY, staging-XX.YY and staging-next-XX.YY

     

       95
       95
       -
                     channel=nixos-${BASH_REMATCH[2]}

     

       96
       96
       -
                     echo "PR is for a release branch, preferred channel is $channel"

     

       97
       97
       -
                 else

     

       98
       98
       -
                     # Use the nixos-unstable channel for all other PRs

     

       99
       99
       -
                     channel=nixos-unstable

     

       100
       100
       -
                     echo "PR is for a non-release branch, preferred channel is $channel"

     

       101
       101
       -
                 fi

     

       102
       102
       -
                 # Check that the channel exists. It doesn't exist for fresh release branches

     

       103
       103
       -
                 if ! curl -fSs "https://channels.nixos.org/$channel"; then

     

       104
       104
       -
                   # Fall back to nixos-unstable, makes sense for fresh release branches

     

       105
       105
       -
                   echo "Preferred channel $channel could not be fetched, falling back to nixos-unstable"

     

       106
       106
       -
                   channel=nixos-unstable

     

       107
       107
       -
                 fi

     

       108
       108
       -
                 echo "channel=$channel" >> "$GITHUB_ENV"

     

       109
       109
       -
             - name: Fetching latest version of channel

     

       110
       110
       -
               run: |

     

       111
       111
       -
                 echo "Fetching latest version of channel $channel"

     

       112
       112
       -
                 # This is probably the easiest way to get Nix to output the path to a downloaded channel!

     

       113
       113
       -
                 nixpkgs=$(nix-instantiate --find-file nixpkgs -I nixpkgs=channel:"$channel")

     

       114
       114
       -
                 # This file only exists in channels

     

       115
       115
       -
                 rev=$(<"$nixpkgs"/.git-revision)

     

       116
       116
       -
                 echo "Channel $channel is at revision $rev"

     

       117
       117
       -
                 echo "nixpkgs=$nixpkgs" >> "$GITHUB_ENV"

     

       118
       118
       -
                 echo "rev=$rev" >> "$GITHUB_ENV"

     

       119
       119
       -
             - name: Fetching pre-built nixpkgs-check-by-name from the channel

     

       120
       120
       -
               run: |

     

       121
       121
       -
                 echo "Fetching pre-built nixpkgs-check-by-name from channel $channel at revision $rev"

     

       122
       122
       -
                 # Passing --max-jobs 0 makes sure that we won't build anything

     

       123
       123
       -
                 nix-build "$nixpkgs" -A tests.nixpkgs-check-by-name --max-jobs 0

     

       94
       94
       +
             - name: Fetching the tool

     

       95
       95
       +
               run: pkgs/test/nixpkgs-check-by-name/scripts/fetch-tool.sh "$GITHUB_BASE_REF" result

     

       124
       96
        
             - name: Running nixpkgs-check-by-name

     

       125
       97
        
               run: |

     

       126
       126
       -
                 echo "Checking whether the check succeeds on the base branch $GITHUB_BASE_REF"

     

       127
       127
       -
                 git checkout -q "$baseSha"

     

       128
       128
       -
                 if baseOutput=$(result/bin/nixpkgs-check-by-name . 2>&1); then

     

       129
       129
       -
                   baseSuccess=1

     

       98
       98
       +
                 if result/bin/nixpkgs-check-by-name --base "$base" .; then

     

       99
       99
       +
                   exit 0

     

       130
       100
        
                 else

     

       131
       131
       -
                   baseSuccess=

     

       101
       101
       +
                   exitCode=$?

     

       102
       102
       +
                   echo "To run locally: ./maintainers/scripts/check-by-name.sh $GITHUB_BASE_REF https://github.com/$GITHUB_REPOSITORY.git"

     

       103
       103
       +
                   exit "$exitCode"

     

       132
       104
        
                 fi

     

       133
       133
       -
                 printf "%s\n" "$baseOutput"

     

       134
       134
       -
       

     

       135
       135
       -
                 echo "Checking whether the check would succeed after merging this pull request"

     

       136
       136
       -
                 git checkout -q "$mergedSha"

     

       137
       137
       -
                 if mergedOutput=$(result/bin/nixpkgs-check-by-name . 2>&1); then

     

       138
       138
       -
                   mergedSuccess=1

     

       139
       139
       -
                   exitCode=0

     

       140
       140
       -
                 else

     

       141
       141
       -
                   mergedSuccess=

     

       142
       142
       -
                   exitCode=1

     

       143
       143
       -
                 fi

     

       144
       144
       -
                 printf "%s\n" "$mergedOutput"

     

       145
       145
       -
       

     

       146
       146
       -
                 resultToEmoji() {

     

       147
       147
       -
                   if [[ -n "$1" ]]; then

     

       148
       148
       -
                     echo ":heavy_check_mark:"

     

       149
       149
       -
                   else

     

       150
       150
       -
                     echo ":x:"

     

       151
       151
       -
                   fi

     

       152
       152
       -
                 }

     

       153
       153
       -
       

     

       154
       154
       -
                 # Print a markdown summary in GitHub actions

     

       155
       155
       -
                 {

     

       156
       156
       -
                   echo "| Nixpkgs version | Check result |"

     

       157
       157
       -
                   echo "| --- | --- |"

     

       158
       158
       -
                   echo "| Latest base commit | $(resultToEmoji "$baseSuccess") |"

     

       159
       159
       -
                   echo "| After merging this PR | $(resultToEmoji "$mergedSuccess") |"

     

       160
       160
       -
                   echo ""

     

       161
       161
       -
       

     

       162
       162
       -
                   if [[ -n "$baseSuccess" ]]; then

     

       163
       163
       -
                     if [[ -n "$mergedSuccess" ]]; then

     

       164
       164
       -
                       echo "The check succeeds on both the base branch and after merging this PR"

     

       165
       165
       -
                     else

     

       166
       166
       -
                       echo "The check succeeds on the base branch, but would fail after merging this PR:"

     

       167
       167
       -
                       echo "\`\`\`"

     

       168
       168
       -
                       echo "$mergedOutput"

     

       169
       169
       -
                       echo "\`\`\`"

     

       170
       170
       -
                       echo ""

     

       171
       171
       -
                     fi

     

       172
       172
       -
                   else

     

       173
       173
       -
                     if [[ -n "$mergedSuccess" ]]; then

     

       174
       174
       -
                       echo "The check fails on the base branch, but this PR fixes it, nicely done!"

     

       175
       175
       -
                     else

     

       176
       176
       -
                       echo "The check fails on both the base branch and after merging this PR, unknown if only this PRs changes would satisfy the check, the base branch needs to be fixed first."

     

       177
       177
       -
                       echo ""

     

       178
       178
       -
                       echo "Failure on the base branch:"

     

       179
       179
       -
                       echo "\`\`\`"

     

       180
       180
       -
                       echo "$baseOutput"

     

       181
       181
       -
                       echo "\`\`\`"

     

       182
       182
       -
                       echo ""

     

       183
       183
       -
                       echo "Failure after merging this PR:"

     

       184
       184
       -
                       echo "\`\`\`"

     

       185
       185
       -
                       echo "$mergedOutput"

     

       186
       186
       -
                       echo "\`\`\`"

     

       187
       187
       -
                       echo ""

     

       188
       188
       -
                     fi

     

       189
       189
       -
                   fi

     

       190
       190
       -
       

     

       191
       191
       -
                   echo "### Details"

     

       192
       192
       -
                   echo "- nixpkgs-check-by-name tool:"

     

       193
       193
       -
                   echo "  - Channel: $channel"

     

       194
       194
       -
                   echo "  - Nixpkgs commit: [$rev](https://github.com/${GITHUB_REPOSITORY}/commit/$rev)"

     

       195
       195
       -
                   echo "  - Store path: \`$(realpath result)\`"

     

       196
       196
       -
                   echo "- Tested Nixpkgs:"

     

       197
       197
       -
                   echo "  - Base branch: $GITHUB_BASE_REF"

     

       198
       198
       -
                   echo "  - Latest base branch commit: [$baseSha](https://github.com/${GITHUB_REPOSITORY}/commit/$baseSha)"

     

       199
       199
       -
                   echo "  - Latest PR commit: [$headSha](https://github.com/${GITHUB_REPOSITORY}/commit/$headSha)"

     

       200
       200
       -
                   echo "  - Merge commit: [$mergedSha](https://github.com/${GITHUB_REPOSITORY}/commit/$mergedSha)"

     

       201
       201
       -
                 } >> "$GITHUB_STEP_SUMMARY"

     

       202
       202
       -
       

     

       203
       203
       -
                 exit "$exitCode"

maintainers/maintainer-list.nix

···

       2722
       2722
        
           githubId = 53131727;

     

       2723
       2723
        
           name = "Bryan Albuquerque";

     

       2724
       2724
        
         };

     

       2725
       2725
       +
         bryango = {

     

       2726
       2726
       +
           name = "Bryan Lai";

     

       2727
       2727
       +
           email = "bryanlais@gmail.com";

     

       2728
       2728
       +
           github = "bryango";

     

       2729
       2729
       +
           githubId = 26322692;

     

       2730
       2730
       +
         };

     

       2725
       2731
        
         bryanhonof = {

     

       2726
       2732
        
           name = "Bryan Honof";

     

       2727
       2733
        
           email = "bryanhonof@gmail.com";

maintainers/scripts/README.md

···

       9
       9
        
       

     

       10
       10
        
       ## Metadata

     

       11
       11
        
       

     

       12
       12
       +
       ### `check-by-name.sh`

     

       13
       13
       +
       

     

       14
       14
       +
       An alias for `pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh`, see [documentation](../../pkgs/test/nixpkgs-check-by-name/scripts/README.md).

     

       15
       15
       +
       

     

       12
       16
        
       ### `get-maintainer.sh`

     

       13
       17
        
       

     

       14
       18
        
       `get-maintainer.sh [selector] value` returns a JSON object describing

maintainers/scripts/check-by-name.sh

···

       1
       1
       +
       ../../pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh

nixos/modules/module-list.nix

···

       1259
       1259
        
         ./services/web-apps/changedetection-io.nix

     

       1260
       1260
        
         ./services/web-apps/chatgpt-retrieval-plugin.nix

     

       1261
       1261
        
         ./services/web-apps/cloudlog.nix

     

       1262
       1262
       +
         ./services/web-apps/code-server.nix

     

       1262
       1263
        
         ./services/web-apps/convos.nix

     

       1263
       1264
        
         ./services/web-apps/dex.nix

     

       1264
       1265
        
         ./services/web-apps/discourse.nix

+259

nixos/modules/services/web-apps/code-server.nix

···

       1
       1
       +
       { config, lib, pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         cfg = config.services.code-server;

     

       5
       5
       +
         defaultUser = "code-server";

     

       6
       6
       +
         defaultGroup = defaultUser;

     

       7
       7
       +
       in {

     

       8
       8
       +
         options = {

     

       9
       9
       +
           services.code-server = {

     

       10
       10
       +
             enable = lib.mkEnableOption (lib.mdDoc "code-server");

     

       11
       11
       +
       

     

       12
       12
       +
             package = lib.mkPackageOptionMD pkgs "code-server" {

     

       13
       13
       +
               example = ''

     

       14
       14
       +
                 pkgs.vscode-with-extensions.override {

     

       15
       15
       +
                   vscode = pkgs.code-server;

     

       16
       16
       +
                   vscodeExtensions = with pkgs.vscode-extensions; [

     

       17
       17
       +
                     bbenoist.nix

     

       18
       18
       +
                     dracula-theme.theme-dracula

     

       19
       19
       +
                   ];

     

       20
       20
       +
                 }

     

       21
       21
       +
               '';

     

       22
       22
       +
             };

     

       23
       23
       +
       

     

       24
       24
       +
             extraPackages = lib.mkOption {

     

       25
       25
       +
               default = [ ];

     

       26
       26
       +
               description = lib.mdDoc ''

     

       27
       27
       +
                 Additional packages to add to the code-server {env}`PATH`.

     

       28
       28
       +
               '';

     

       29
       29
       +
               example = lib.literalExpression "[ pkgs.go ]";

     

       30
       30
       +
               type = lib.types.listOf lib.types.package;

     

       31
       31
       +
             };

     

       32
       32
       +
       

     

       33
       33
       +
             extraEnvironment = lib.mkOption {

     

       34
       34
       +
               type = lib.types.attrsOf lib.types.str;

     

       35
       35
       +
               description = lib.mdDoc ''

     

       36
       36
       +
                 Additional environment variables to pass to code-server.

     

       37
       37
       +
               '';

     

       38
       38
       +
               default = { };

     

       39
       39
       +
               example = { PKG_CONFIG_PATH = "/run/current-system/sw/lib/pkgconfig"; };

     

       40
       40
       +
             };

     

       41
       41
       +
       

     

       42
       42
       +
             extraArguments = lib.mkOption {

     

       43
       43
       +
               default = [ ];

     

       44
       44
       +
               description = lib.mdDoc ''

     

       45
       45
       +
                 Additional arguments to pass to code-server.

     

       46
       46
       +
               '';

     

       47
       47
       +
               example = lib.literalExpression ''[ "--log=info" ]'';

     

       48
       48
       +
               type = lib.types.listOf lib.types.str;

     

       49
       49
       +
             };

     

       50
       50
       +
       

     

       51
       51
       +
             host = lib.mkOption {

     

       52
       52
       +
               default = "localhost";

     

       53
       53
       +
               description = lib.mdDoc ''

     

       54
       54
       +
                 The host name or IP address the server should listen to.

     

       55
       55
       +
               '';

     

       56
       56
       +
               type = lib.types.str;

     

       57
       57
       +
             };

     

       58
       58
       +
       

     

       59
       59
       +
             port = lib.mkOption {

     

       60
       60
       +
               default = 4444;

     

       61
       61
       +
               description = lib.mdDoc ''

     

       62
       62
       +
                 The port the server should listen to.

     

       63
       63
       +
               '';

     

       64
       64
       +
               type = lib.types.port;

     

       65
       65
       +
             };

     

       66
       66
       +
       

     

       67
       67
       +
             auth = lib.mkOption {

     

       68
       68
       +
               default = "password";

     

       69
       69
       +
               description = lib.mdDoc ''

     

       70
       70
       +
                 The type of authentication to use.

     

       71
       71
       +
               '';

     

       72
       72
       +
               type = lib.types.enum [ "none" "password" ];

     

       73
       73
       +
             };

     

       74
       74
       +
       

     

       75
       75
       +
             hashedPassword = lib.mkOption {

     

       76
       76
       +
               default = "";

     

       77
       77
       +
               description = lib.mdDoc ''

     

       78
       78
       +
                 Create the password with: `echo -n 'thisismypassword' | npx argon2-cli -e`.

     

       79
       79
       +
               '';

     

       80
       80
       +
               type = lib.types.str;

     

       81
       81
       +
             };

     

       82
       82
       +
       

     

       83
       83
       +
             user = lib.mkOption {

     

       84
       84
       +
               default = defaultUser;

     

       85
       85
       +
               example = "yourUser";

     

       86
       86
       +
               description = lib.mdDoc ''

     

       87
       87
       +
                 The user to run code-server as.

     

       88
       88
       +
                 By default, a user named `${defaultUser}` will be created.

     

       89
       89
       +
               '';

     

       90
       90
       +
               type = lib.types.str;

     

       91
       91
       +
             };

     

       92
       92
       +
       

     

       93
       93
       +
             group = lib.mkOption {

     

       94
       94
       +
               default = defaultGroup;

     

       95
       95
       +
               example = "yourGroup";

     

       96
       96
       +
               description = lib.mdDoc ''

     

       97
       97
       +
                 The group to run code-server under.

     

       98
       98
       +
                 By default, a group named `${defaultGroup}` will be created.

     

       99
       99
       +
               '';

     

       100
       100
       +
               type = lib.types.str;

     

       101
       101
       +
             };

     

       102
       102
       +
       

     

       103
       103
       +
             extraGroups = lib.mkOption {

     

       104
       104
       +
               default = [ ];

     

       105
       105
       +
               description = lib.mdDoc ''

     

       106
       106
       +
                 An array of additional groups for the `${defaultUser}` user.

     

       107
       107
       +
               '';

     

       108
       108
       +
               example = [ "docker" ];

     

       109
       109
       +
               type = lib.types.listOf lib.types.str;

     

       110
       110
       +
             };

     

       111
       111
       +
       

     

       112
       112
       +
             socket = lib.mkOption {

     

       113
       113
       +
               default = null;

     

       114
       114
       +
               example = "/run/code-server/socket";

     

       115
       115
       +
               description = lib.mdDoc ''

     

       116
       116
       +
                 Path to a socket (bind-addr will be ignored).

     

       117
       117
       +
               '';

     

       118
       118
       +
               type = lib.types.nullOr lib.types.str;

     

       119
       119
       +
             };

     

       120
       120
       +
       

     

       121
       121
       +
             socketMode = lib.mkOption {

     

       122
       122
       +
               default = null;

     

       123
       123
       +
               description = lib.mdDoc ''

     

       124
       124
       +
                  File mode of the socket.

     

       125
       125
       +
               '';

     

       126
       126
       +
               type = lib.types.nullOr lib.types.str;

     

       127
       127
       +
             };

     

       128
       128
       +
       

     

       129
       129
       +
             userDataDir = lib.mkOption {

     

       130
       130
       +
               default = null;

     

       131
       131
       +
               description = lib.mdDoc ''

     

       132
       132
       +
                 Path to the user data directory.

     

       133
       133
       +
               '';

     

       134
       134
       +
               type = lib.types.nullOr lib.types.str;

     

       135
       135
       +
             };

     

       136
       136
       +
       

     

       137
       137
       +
             extensionsDir = lib.mkOption {

     

       138
       138
       +
               default = null;

     

       139
       139
       +
               description = lib.mdDoc ''

     

       140
       140
       +
                 Path to the extensions directory.

     

       141
       141
       +
               '';

     

       142
       142
       +
               type = lib.types.nullOr lib.types.str;

     

       143
       143
       +
             };

     

       144
       144
       +
       

     

       145
       145
       +
             proxyDomain = lib.mkOption {

     

       146
       146
       +
               default = null;

     

       147
       147
       +
               example = "code-server.lan";

     

       148
       148
       +
               description = lib.mdDoc ''

     

       149
       149
       +
                 Domain used for proxying ports.

     

       150
       150
       +
               '';

     

       151
       151
       +
               type = lib.types.nullOr lib.types.str;

     

       152
       152
       +
             };

     

       153
       153
       +
       

     

       154
       154
       +
             disableTelemetry = lib.mkOption {

     

       155
       155
       +
               default = false;

     

       156
       156
       +
               example = true;

     

       157
       157
       +
               description = lib.mdDoc ''

     

       158
       158
       +
                 Disable telemetry.

     

       159
       159
       +
               '';

     

       160
       160
       +
               type = lib.types.bool;

     

       161
       161
       +
             };

     

       162
       162
       +
       

     

       163
       163
       +
             disableUpdateCheck = lib.mkOption {

     

       164
       164
       +
               default = false;

     

       165
       165
       +
               example = true;

     

       166
       166
       +
               description = lib.mdDoc ''

     

       167
       167
       +
                 Disable update check.

     

       168
       168
       +
                 Without this flag, code-server checks every 6 hours against the latest github release and

     

       169
       169
       +
                 then notifies you once every week that a new release is available.

     

       170
       170
       +
               '';

     

       171
       171
       +
               type = lib.types.bool;

     

       172
       172
       +
             };

     

       173
       173
       +
       

     

       174
       174
       +
             disableFileDownloads = lib.mkOption {

     

       175
       175
       +
               default = false;

     

       176
       176
       +
               example = true;

     

       177
       177
       +
               description = lib.mdDoc ''

     

       178
       178
       +
                 Disable file downloads from Code.

     

       179
       179
       +
               '';

     

       180
       180
       +
               type = lib.types.bool;

     

       181
       181
       +
             };

     

       182
       182
       +
       

     

       183
       183
       +
             disableWorkspaceTrust = lib.mkOption {

     

       184
       184
       +
               default = false;

     

       185
       185
       +
               example = true;

     

       186
       186
       +
               description = lib.mdDoc ''

     

       187
       187
       +
                 Disable Workspace Trust feature.

     

       188
       188
       +
               '';

     

       189
       189
       +
               type = lib.types.bool;

     

       190
       190
       +
             };

     

       191
       191
       +
       

     

       192
       192
       +
             disableGettingStartedOverride = lib.mkOption {

     

       193
       193
       +
               default = false;

     

       194
       194
       +
               example = true;

     

       195
       195
       +
               description = lib.mdDoc ''

     

       196
       196
       +
                 Disable the coder/coder override in the Help: Getting Started page.

     

       197
       197
       +
               '';

     

       198
       198
       +
               type = lib.types.bool;

     

       199
       199
       +
             };

     

       200
       200
       +
       

     

       201
       201
       +
           };

     

       202
       202
       +
         };

     

       203
       203
       +
       

     

       204
       204
       +
         config = lib.mkIf cfg.enable {

     

       205
       205
       +
           systemd.services.code-server = {

     

       206
       206
       +
             description = "Code server";

     

       207
       207
       +
             wantedBy = [ "multi-user.target" ];

     

       208
       208
       +
             after = [ "network-online.target" ];

     

       209
       209
       +
             path = cfg.extraPackages;

     

       210
       210
       +
             environment = {

     

       211
       211
       +
               HASHED_PASSWORD = cfg.hashedPassword;

     

       212
       212
       +
             } // cfg.extraEnvironment;

     

       213
       213
       +
             serviceConfig = {

     

       214
       214
       +
               ExecStart = ''

     

       215
       215
       +
                 ${lib.getExe cfg.package} \

     

       216
       216
       +
                   --auth=${cfg.auth} \

     

       217
       217
       +
                   --bind-addr=${cfg.host}:${toString cfg.port} \

     

       218
       218
       +
                 '' + lib.optionalString (cfg.socket != null) ''

     

       219
       219
       +
                   --socket=${cfg.socket} \

     

       220
       220
       +
                 '' + lib.optionalString (cfg.userDataDir != null) ''

     

       221
       221
       +
                   --user-data-dir=${cfg.userDataDir} \

     

       222
       222
       +
                 '' + lib.optionalString (cfg.extensionsDir != null) ''

     

       223
       223
       +
                   --extensions-dir=${cfg.extensionsDir} \

     

       224
       224
       +
                 '' + lib.optionalString (cfg.disableTelemetry == true) ''

     

       225
       225
       +
                   --disable-telemetry \

     

       226
       226
       +
                 '' + lib.optionalString (cfg.disableUpdateCheck == true) ''

     

       227
       227
       +
                   --disable-update-check \

     

       228
       228
       +
                 '' + lib.optionalString (cfg.disableFileDownloads == true) ''

     

       229
       229
       +
                   --disable-file-downloads \

     

       230
       230
       +
                 '' + lib.optionalString (cfg.disableWorkspaceTrust == true) ''

     

       231
       231
       +
                   --disable-workspace-trust \

     

       232
       232
       +
                 '' + lib.optionalString (cfg.disableGettingStartedOverride == true) ''

     

       233
       233
       +
                   --disable-getting-started-override \

     

       234
       234
       +
                 '' + lib.escapeShellArgs cfg.extraArguments;

     

       235
       235
       +
               ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID";

     

       236
       236
       +
               RuntimeDirectory = cfg.user;

     

       237
       237
       +
               User = cfg.user;

     

       238
       238
       +
               Group = cfg.group;

     

       239
       239
       +
               Restart = "on-failure";

     

       240
       240
       +
             };

     

       241
       241
       +
           };

     

       242
       242
       +
       

     

       243
       243
       +
           users.users."${cfg.user}" = lib.mkMerge [

     

       244
       244
       +
             (lib.mkIf (cfg.user == defaultUser) {

     

       245
       245
       +
               isNormalUser = true;

     

       246
       246
       +
               description = "code-server user";

     

       247
       247
       +
               inherit (cfg) group;

     

       248
       248
       +
             })

     

       249
       249
       +
             {

     

       250
       250
       +
               packages = cfg.extraPackages;

     

       251
       251
       +
               inherit (cfg) extraGroups;

     

       252
       252
       +
             }

     

       253
       253
       +
           ];

     

       254
       254
       +
       

     

       255
       255
       +
           users.groups."${defaultGroup}" = lib.mkIf (cfg.group == defaultGroup) { };

     

       256
       256
       +
         };

     

       257
       257
       +
       

     

       258
       258
       +
         meta.maintainers = [ lib.maintainers.stackshadow ];

     

       259
       259
       +
       }

nixos/tests/all-tests.nix

···

       198
       198
        
         cntr = handleTestOn ["aarch64-linux" "x86_64-linux"] ./cntr.nix {};

     

       199
       199
        
         cockpit = handleTest ./cockpit.nix {};

     

       200
       200
        
         cockroachdb = handleTestOn ["x86_64-linux"] ./cockroachdb.nix {};

     

       201
       201
       +
         code-server = handleTest ./code-server.nix {};

     

       201
       202
        
         coder = handleTest ./coder.nix {};

     

       202
       203
        
         collectd = handleTest ./collectd.nix {};

     

       203
       204
        
         connman = handleTest ./connman.nix {};

+22

nixos/tests/code-server.nix

···

       1
       1
       +
       import ./make-test-python.nix ({pkgs, lib, ...}:

     

       2
       2
       +
       {

     

       3
       3
       +
         name = "code-server";

     

       4
       4
       +
       

     

       5
       5
       +
         nodes = {

     

       6
       6
       +
           machine = {pkgs, ...}: {

     

       7
       7
       +
             services.code-server = {

     

       8
       8
       +
               enable = true;

     

       9
       9
       +
               auth = "none";

     

       10
       10
       +
             };

     

       11
       11
       +
           };

     

       12
       12
       +
         };

     

       13
       13
       +
       

     

       14
       14
       +
         testScript = ''

     

       15
       15
       +
           start_all()

     

       16
       16
       +
           machine.wait_for_unit("code-server.service")

     

       17
       17
       +
           machine.wait_for_open_port(4444)

     

       18
       18
       +
           machine.succeed("curl -k --fail http://localhost:4444", timeout=10)

     

       19
       19
       +
         '';

     

       20
       20
       +
       

     

       21
       21
       +
         meta.maintainers = [ lib.maintainers.drupol ];

     

       22
       22
       +
       })

+4 -10

pkgs/applications/audio/parlatype/default.nix

···

       2
       2
        
       , stdenv

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
        
       , appstream-glib

     

       5
       5
       -
       , dbus

     

       6
       5
        
       , desktop-file-utils

     

       7
       6
        
       , gettext

     

       8
       7
        
       , glib

     

       9
       9
       -
       , gobject-introspection

     

       10
       10
       -
       , gsettings-desktop-schemas

     

       11
       8
        
       , gst_all_1

     

       12
       12
       -
       , gtk3

     

       9
       9
       +
       , gtk4

     

       13
       10
        
       , hicolor-icon-theme

     

       14
       11
        
       , isocodes

     

       15
       12
        
       , itstool

     
···

       23
       20
        
       

     

       24
       21
        
       stdenv.mkDerivation rec {

     

       25
       22
        
         pname = "parlatype";

     

       26
       26
       -
         version = "3.1";

     

       23
       23
       +
         version = "4.0";

     

       27
       24
        
       

     

       28
       25
        
         src = fetchFromGitHub {

     

       29
       26
        
           owner = "gkarsay";

     

       30
       27
        
           repo = pname;

     

       31
       28
        
           rev = "v${version}";

     

       32
       32
       -
           sha256 = "1a4xlsbszb50vnz1g7kf7hl7aywp7s7xaravkcx13csn0a7l3x45";

     

       29
       29
       +
           sha256 = "1iyjxss6sgc9gx6ij30zz97bl31qix8pxklzn4kknh1b0j7hhbwq";

     

       33
       30
        
         };

     

       34
       31
        
       

     

       35
       32
        
         nativeBuildInputs = [

     

       36
       33
        
           appstream-glib

     

       37
       34
        
           desktop-file-utils

     

       38
       35
        
           gettext

     

       39
       39
       -
           gobject-introspection

     

       40
       36
        
           itstool

     

       41
       37
        
           libxml2

     

       42
       38
        
           meson

     
···

       47
       43
        
         ];

     

       48
       44
        
       

     

       49
       45
        
         buildInputs = [

     

       50
       50
       -
           dbus

     

       51
       46
        
           glib

     

       52
       52
       -
           gsettings-desktop-schemas

     

       53
       47
        
           gst_all_1.gst-libav

     

       54
       48
        
           gst_all_1.gst-plugins-bad

     

       55
       49
        
           gst_all_1.gst-plugins-base

     

       56
       50
        
           gst_all_1.gst-plugins-good

     

       57
       51
        
           gst_all_1.gst-plugins-ugly

     

       58
       52
        
           gst_all_1.gstreamer

     

       59
       59
       -
           gtk3

     

       53
       53
       +
           gtk4

     

       60
       54
        
           hicolor-icon-theme

     

       61
       55
        
           isocodes

     

       62
       56
        
         ];

+2 -2

pkgs/applications/editors/vscode/extensions/default.nix

···

       1580
       1580
        
               mktplcRef = {

     

       1581
       1581
        
                 publisher = "github";

     

       1582
       1582
        
                 name = "copilot";

     

       1583
       1583
       -
                 version = "1.135.544";

     

       1584
       1584
       -
                 sha256 = "sha256-OeG1nkQbQAfu8NuDEA+iaWy0ioFyXPe7Qm/CZIKPiX8=";

     

       1583
       1583
       +
                 version = "1.143.601";

     

       1584
       1584
       +
                 sha256 = "sha256-Ge/q1fAfhI5EuJFLHZqZyuPahHSgES7G0ns9FbS9vzA=";

     

       1585
       1585
        
               };

     

       1586
       1586
        
       

     

       1587
       1587
        
               meta = {

+2 -2

pkgs/applications/misc/revanced-cli/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "revanced-cli";

     

       5
       5
       -
         version = "2.22.0";

     

       5
       5
       +
         version = "4.3.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/revanced/revanced-cli/releases/download/v${version}/revanced-cli-${version}-all.jar";

     

       9
       9
       -
           hash = "sha256-jyaqkZL7aOc5WXjlomZThyaCUwKU7AyKKrgtKadUo5s=";

     

       9
       9
       +
           hash = "sha256-D/4zR5PvcZqv8yyNIzbnYnGoHDrPQAeHyrN/G4QsTB0=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         nativeBuildInputs = [ makeWrapper ];

+4 -4

pkgs/applications/networking/cluster/talosctl/default.nix

···

       1
       1
       -
       { lib, stdenv, buildGoModule, fetchFromGitHub, installShellFiles }:

     

       1
       1
       +
       { lib, buildGoModule, fetchFromGitHub, installShellFiles }:

     

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "talosctl";

     

       5
       5
       -
         version = "1.5.5";

     

       5
       5
       +
         version = "1.6.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "siderolabs";

     

       9
       9
        
           repo = "talos";

     

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

     

       11
       11
       -
           hash = "sha256-15sNXiJ/s3MlrXFXPxA7mQ+/36HRSZF6XKos6XEHi1Y=";

     

       11
       11
       +
           hash = "sha256-Mcc9lfnhSbVA5tNHUtBgfQEGVyen4KZ/V9OeV8PxAYQ=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorHash = "sha256-fGl16Wsb1tW9+wZBg5yY73t7n+EJ1dVx5IlzY2B8PJA=";

     

       14
       14
       +
         vendorHash = "sha256-VeUDyiJ0R27Xrf+79f0soELKvR2xaK5ocbvhCzP9eFk=";

     

       15
       15
        
       

     

       16
       16
        
         ldflags = [ "-s" "-w" ];

     

       17
       17

+5 -6

pkgs/by-name/README.md

···

       112
       112
        
       

     

       113
       113
        
       CI performs [certain checks](../test/nixpkgs-check-by-name/README.md#validity-checks) on the `pkgs/by-name` structure.

     

       114
       114
        
       This is done using the [`nixpkgs-check-by-name` tool](../test/nixpkgs-check-by-name).

     

       115
       115
       -
       The version of this tool used is the one that corresponds to the NixOS channel of the PR base branch.

     

       116
       116
       -
       See [here](../../.github/workflows/check-by-name.yml) for details.

     

       117
       115
        
       

     

       118
       118
       -
       The tool can be run locally using

     

       116
       116
       +
       You can locally emulate the CI check using

     

       119
       117
        
       

     

       120
       120
       -
       ```bash

     

       121
       121
       -
       nix-build -A tests.nixpkgs-check-by-name

     

       122
       122
       -
       result/bin/nixpkgs-check-by-name .

     

       118
       118
       +
       ```

     

       119
       119
       +
       $ ./pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh master

     

       123
       120
        
       ```

     

       121
       121
       +
       

     

       122
       122
       +
       See [here](../../.github/workflows/check-by-name.yml) for more info.

+2 -2

pkgs/by-name/ll/llama-cpp/package.nix

···

       38
       38
        
       in

     

       39
       39
        
       stdenv.mkDerivation (finalAttrs: {

     

       40
       40
        
         pname = "llama-cpp";

     

       41
       41
       -
         version = "1573";

     

       41
       41
       +
         version = "1671";

     

       42
       42
        
       

     

       43
       43
        
         src = fetchFromGitHub {

     

       44
       44
        
           owner = "ggerganov";

     

       45
       45
        
           repo = "llama.cpp";

     

       46
       46
        
           rev = "refs/tags/b${finalAttrs.version}";

     

       47
       47
       -
           hash = "sha256-FEH0SI87qtezc++TAR38wfldx6/1GknuTBWGn+UyFPI=";

     

       47
       47
       +
           hash = "sha256-OFRc3gHKQboVCsDlQVHwzEBurIsOMj/bVGYuCLilydE=";

     

       48
       48
        
         };

     

       49
       49
        
       

     

       50
       50
        
         patches = [

+2 -2

pkgs/data/fonts/twitter-color-emoji/default.nix

···

       14
       14
        
       }:

     

       15
       15
        
       

     

       16
       16
        
       let

     

       17
       17
       -
         version = "14.1.2";

     

       17
       17
       +
         version = "15.0.2";

     

       18
       18
        
       

     

       19
       19
        
         twemojiSrc = fetchFromGitHub {

     

       20
       20
        
           name = "twemoji";

     

       21
       21
        
           owner = "jdecked";

     

       22
       22
        
           repo = "twemoji";

     

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

     

       24
       24
       -
           sha256 = "sha256-UQ4PwO4D1kw7JOMf6xSaRBfT822KwrvWBPDmaQjkRVQ=";

     

       24
       24
       +
           hash = "sha256-FLOqXDpSFyClBlG5u3IRL0EKeu1mckCfRizJh++IWxo=";

     

       25
       25
        
         };

     

       26
       26
        
       

     

       27
       27
        
         pythonEnv =

+3 -3

pkgs/development/interpreters/wasmtime/default.nix

···

       2
       2
        
       

     

       3
       3
        
       rustPlatform.buildRustPackage rec {

     

       4
       4
        
         pname = "wasmtime";

     

       5
       5
       -
         version = "15.0.1";

     

       5
       5
       +
         version = "16.0.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "bytecodealliance";

     

       9
       9
        
           repo = pname;

     

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

     

       11
       11
       -
           hash = "sha256-9vArmudz1Avxz46IS9FZIKbs8wZXoeWMd/FGLmpPitw=";

     

       11
       11
       +
           hash = "sha256-kySJme79RQMI8PP2Jhx1mjqJpUIf5jPn2TvbPEzw5hY=";

     

       12
       12
        
           fetchSubmodules = true;

     

       13
       13
        
         };

     

       14
       14
        
       

     

       15
       15
        
         # Disable cargo-auditable until https://github.com/rust-secure-code/cargo-auditable/issues/124 is solved.

     

       16
       16
        
         auditable = false;

     

       17
       17
       -
         cargoHash = "sha256-/mX9zUN+dZoOCOPMeWCJ9U7KfI6JnFl8B2leYosy2jQ=";

     

       17
       17
       +
         cargoHash = "sha256-2XlnR4OBvdQyMUUOL6VvqDxf8jGYlhz2PDuPd24Ocxw=";

     

       18
       18
        
         cargoBuildFlags = [ "--package" "wasmtime-cli" "--package" "wasmtime-c-api" ];

     

       19
       19
        
       

     

       20
       20
        
         outputs = [ "out" "dev" ];

+10 -5

pkgs/development/python-modules/google-cloud-bigquery-logging/default.nix

···

       9
       9
        
       , pytest-asyncio

     

       10
       10
        
       , pytestCheckHook

     

       11
       11
        
       , pythonOlder

     

       12
       12
       +
       , setuptools

     

       12
       13
        
       }:

     

       13
       14
        
       

     

       14
       15
        
       buildPythonPackage rec {

     

       15
       16
        
         pname = "google-cloud-bigquery-logging";

     

       16
       16
       -
         version = "1.3.0";

     

       17
       17
       -
         format = "setuptools";

     

       17
       17
       +
         version = "1.4.0";

     

       18
       18
       +
         pyproject = true;

     

       18
       19
        
       

     

       19
       20
        
         disabled = pythonOlder "3.7";

     

       20
       21
        
       

     

       21
       22
        
         src = fetchPypi {

     

       22
       23
        
           inherit pname version;

     

       23
       23
       -
           hash = "sha256-7hj42cr9BKwSBEX09kZPngAUPFPrQ/VS5hBzbAaQhH4=";

     

       24
       24
       +
           hash = "sha256-4pl7cT8bLy0y3ntYt1qO027KF7yokHun5lGZHWnBkUw=";

     

       24
       25
        
         };

     

       26
       26
       +
       

     

       27
       27
       +
         nativeBuildInputs = [

     

       28
       28
       +
           setuptools

     

       29
       29
       +
         ];

     

       25
       30
        
       

     

       26
       31
        
         propagatedBuildInputs = [

     

       27
       32
        
           google-api-core

     
···

       43
       48
        
       

     

       44
       49
        
         meta = with lib; {

     

       45
       50
        
           description = "Bigquery logging client library";

     

       46
       46
       -
           homepage = "https://github.com/googleapis/python-bigquery-logging";

     

       47
       47
       -
           changelog = "https://github.com/googleapis/python-bigquery-logging/blob/v${version}/CHANGELOG.md";

     

       51
       51
       +
           homepage = "https://github.com/googleapis/google-cloud-python/tree/main/packages/google-cloud-bigquery-logging";

     

       52
       52
       +
           changelog = "https://github.com/googleapis/google-cloud-python/blob/google-cloud-bigquery-logging-v${version}/packages/google-cloud-bigquery-logging/CHANGELOG.md";

     

       48
       53
        
           license = licenses.asl20;

     

       49
       54
        
           maintainers = with maintainers; [ fab ];

     

       50
       55
        
         };

+2 -2

pkgs/development/python-modules/oci/default.nix

···

       14
       14
        
       

     

       15
       15
        
       buildPythonPackage rec {

     

       16
       16
        
         pname = "oci";

     

       17
       17
       -
         version = "2.117.0";

     

       17
       17
       +
         version = "2.118.0";

     

       18
       18
        
         format = "setuptools";

     

       19
       19
        
       

     

       20
       20
        
         disabled = pythonOlder "3.7";

     
···

       23
       23
        
           owner = "oracle";

     

       24
       24
        
           repo = "oci-python-sdk";

     

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

     

       26
       26
       -
           hash = "sha256-D9LstmP4/ysRTe2tvyl84z23cskHfy1O7FT/a/qg2As=";

     

       26
       26
       +
           hash = "sha256-bmV2IFMh/lp7+7MMqlg9zm8VkdZE48zqf8N3+/sSkTc=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
        
         pythonRelaxDeps = [

+8 -4

pkgs/development/python-modules/oracledb/default.nix

···

       4
       4
        
       , cython_3

     

       5
       5
        
       , fetchPypi

     

       6
       6
        
       , pythonOlder

     

       7
       7
       +
       , setuptools

     

       8
       8
       +
       , wheel

     

       7
       9
        
       }:

     

       8
       10
        
       

     

       9
       11
        
       buildPythonPackage rec {

     

       10
       12
        
         pname = "oracledb";

     

       11
       11
       -
         version = "1.4.2";

     

       12
       12
       -
         format = "setuptools";

     

       13
       13
       +
         version = "2.0.0";

     

       14
       14
       +
         pyproject = true;

     

       13
       15
        
       

     

       14
       14
       -
         disabled = pythonOlder "3.6";

     

       16
       16
       +
         disabled = pythonOlder "3.7";

     

       15
       17
        
       

     

       16
       18
        
         src = fetchPypi {

     

       17
       19
        
           inherit pname version;

     

       18
       18
       -
           hash = "sha256-4o7ZBG8nNdwt1bvN82Z/KE44Tg7H7tPus3mPqKfUfjY=";

     

       20
       20
       +
           hash = "sha256-+0SB560anoEhSCiiGaRbZTMB2AxaHMR+A4VxBbYa4sk=";

     

       19
       21
        
         };

     

       20
       22
        
       

     

       21
       23
        
         nativeBuildInputs = [

     

       22
       24
        
           cython_3

     

       25
       25
       +
           setuptools

     

       26
       26
       +
           wheel

     

       23
       27
        
         ];

     

       24
       28
        
       

     

       25
       29
        
         propagatedBuildInputs = [

+2 -2

pkgs/development/python-modules/peaqevcore/default.nix

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "peaqevcore";

     

       9
       9
       -
         version = "19.5.21";

     

       9
       9
       +
         version = "19.5.23";

     

       10
       10
        
         format = "setuptools";

     

       11
       11
        
       

     

       12
       12
        
         disabled = pythonOlder "3.7";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchPypi {

     

       15
       15
        
           inherit pname version;

     

       16
       16
       -
           hash = "sha256-MR+dPGap7IgdWV+bKLUU3E3lzoG+RaaspjqedMQMk5Y=";

     

       16
       16
       +
           hash = "sha256-lLxwc9maivUJAF2Day16B86ELVqsoVJsY9j4rS5FbPM=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         postPatch = ''

+2 -2

pkgs/development/python-modules/podman/default.nix

···

       15
       15
        
       

     

       16
       16
        
       buildPythonPackage rec {

     

       17
       17
        
         pname = "podman";

     

       18
       18
       -
         version = "4.8.0.post1";

     

       18
       18
       +
         version = "4.8.1";

     

       19
       19
        
         pyproject = true;

     

       20
       20
        
       

     

       21
       21
        
         disabled = pythonOlder "3.7";

     
···

       24
       24
        
           owner = "containers";

     

       25
       25
        
           repo = "podman-py";

     

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

     

       27
       27
       -
           hash = "sha256-d7rNXqYeeDHilzNc1jcIWq7rNcYZCvlf9ipu1m3oFfw=";

     

       27
       27
       +
           hash = "sha256-KecYH3fUaWNXx6WQ0NFmEm8o4OkOyYfSHIAh2p+Am1k=";

     

       28
       28
        
         };

     

       29
       29
        
       

     

       30
       30
        
         nativeBuildInputs = [

+6 -6

pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-nu.json

···

       1
       1
        
       {

     

       2
       2
       -
         "url": "https://github.com/LhKipp/tree-sitter-nu",

     

       3
       3
       -
         "rev": "c125aaa83c14f936a20f60c0e86537b81b9f01c9",

     

       4
       4
       -
         "date": "2023-09-19T21:59:06+02:00",

     

       5
       5
       -
         "path": "/nix/store/s0fcpv3w2wkra74y675arsvi3g0xbng2-tree-sitter-nu",

     

       6
       6
       -
         "sha256": "1ckbbzq9rk6iz23xs283rw7j2w7lg8fgp552qkiqa3fc7fmyrfk0",

     

       7
       7
       -
         "hash": "sha256-YLrsqzvMDYXjxKKU+xx69HAhD88DCd2H+NHMnPBfa7I=",

     

       2
       2
       +
         "url": "https://github.com/nushell/tree-sitter-nu",

     

       3
       3
       +
         "rev": "a0b80b2e21e5e39571252dc799e19eb89f1fc912",

     

       4
       4
       +
         "date": "2023-12-21T08:27:09-06:00",

     

       5
       5
       +
         "path": "/nix/store/nlczvz84gk9jjjiijczwyn1isy1rn1k7-tree-sitter-nu",

     

       6
       6
       +
         "sha256": "1y9bsdg9v7znlc1k4xxraaj8f8fn5m3zyc0r2m9fff2if9ijpll1",

     

       7
       7
       +
         "hash": "sha256-gdIrY3JROOdSFRkw/0ct1iGHpFK5dzIDo/afnV7TK/k=",

     

       8
       8
        
         "fetchLFS": false,

     

       9
       9
        
         "fetchSubmodules": false,

     

       10
       10
        
         "deepClone": false,

+1 -1

pkgs/development/tools/parsing/tree-sitter/update.nix

···

       378
       378
        
             repo = "tree-sitter-solidity";

     

       379
       379
        
           };

     

       380
       380
        
           "tree-sitter-nu" = {

     

       381
       381
       -
             orga = "LhKipp";

     

       381
       381
       +
             orga = "nushell";

     

       382
       382
        
             repo = "tree-sitter-nu";

     

       383
       383
        
           };

     

       384
       384
        
           "tree-sitter-cue" = {

+3 -3

pkgs/games/ddnet/default.nix

···

       35
       35
        
       

     

       36
       36
        
       stdenv.mkDerivation rec {

     

       37
       37
        
         pname = "ddnet";

     

       38
       38
       -
         version = "17.4";

     

       38
       38
       +
         version = "17.4.2";

     

       39
       39
        
       

     

       40
       40
        
         src = fetchFromGitHub {

     

       41
       41
        
           owner = "ddnet";

     

       42
       42
        
           repo = pname;

     

       43
       43
        
           rev = version;

     

       44
       44
       -
           hash = "sha256-VWn6fbK6f9/MwjZuFMD2LDv9erRhFnU4JEnbpYDBl70=";

     

       44
       44
       +
           hash = "sha256-cu6EmCaT8nMCcXUwvZdWog/4bvHQo9+DZHDHRvun2E4=";

     

       45
       45
        
         };

     

       46
       46
        
       

     

       47
       47
        
         cargoDeps = rustPlatform.fetchCargoTarball {

     

       48
       48
        
           name = "${pname}-${version}";

     

       49
       49
        
           inherit src;

     

       50
       50
       -
           hash = "sha256-ntAH78BTfPU9nMorsXzZnrZIyNWVCxmQWwwEFIFQB1c=";

     

       50
       50
       +
           hash = "sha256-O4ORWuTlmEMsTpMEhnauNfXOKWfg8hB32rZKRe8Nmp4=";

     

       51
       51
        
         };

     

       52
       52
        
       

     

       53
       53
        
         nativeBuildInputs = [

+4 -4

pkgs/os-specific/linux/kernel/xanmod-kernels.nix

···

       6
       6
        
         # NOTE: When updating these, please also take a look at the changes done to

     

       7
       7
        
         # kernel config in the xanmod version commit

     

       8
       8
        
         ltsVariant = {

     

       9
       9
       -
           version = "6.1.68";

     

       10
       10
       -
           hash = "sha256-mpnoaeeBrCELXJujgHKqZxSIzRMbk8dpPv1G9EKAf3E=";

     

       9
       9
       +
           version = "6.1.69";

     

       10
       10
       +
           hash = "sha256-/uk2sS7g4REPtR/LSc7djjoc//m6QvrXfHO4OemQcy8=";

     

       11
       11
        
           variant = "lts";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         mainVariant = {

     

       15
       15
       -
           version = "6.6.7";

     

       16
       16
       -
           hash = "sha256-0I+CS4Ithb0euFAO5G7ao3dxA1gq5wqFVsNyYWvRfYc=";

     

       15
       15
       +
           version = "6.6.8";

     

       16
       16
       +
           hash = "sha256-TtWTYuT3GMnQy1shkF+HTgv4Z1OSOLh4RXfG+Xj0n3M=";

     

       17
       17
        
           variant = "main";

     

       18
       18
        
         };

     

       19
       19

+20

pkgs/servers/code-server/build-vscode-nogit.patch

···

       1
       1
       +
       diff --git a/ci/build/build-vscode.sh b/ci/build/build-vscode.sh

     

       2
       2
       +
       index a72549fb..3aed1ad5 100755

     

       3
       3
       +
       --- a/ci/build/build-vscode.sh

     

       4
       4
       +
       +++ b/ci/build/build-vscode.sh

     

       5
       5
       +
       @@ -58,7 +58,6 @@ main() {

     

       6
       6
       +
          # telemetry available; telemetry can still be disabled by flag or setting).

     

       7
       7
       +
          # This needs to be done before building as Code will read this file and embed

     

       8
       8
       +
          # it into the client-side code.

     

       9
       9
       +
       -  git checkout product.json             # Reset in case the script exited early.

     

       10
       10
       +
          cp product.json product.original.json # Since jq has no inline edit.

     

       11
       11
       +
          jq --slurp '.[0] * .[1]' product.original.json <(

     

       12
       12
       +
            cat << EOF

     

       13
       13
       +
       @@ -105,7 +104,6 @@ EOF

     

       14
       14
       +
          # Reset so if you develop after building you will not be stuck with the wrong

     

       15
       15
       +
          # commit (the dev client will use `oss-dev` but the dev server will still use

     

       16
       16
       +
          # product.json which will have `stable-$commit`).

     

       17
       17
       +
       -  git checkout product.json

     

       18
       18
       +
        

     

       19
       19
       +
          popd

     

       20
       20
       +

+327

pkgs/servers/code-server/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , stdenv

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       , buildGoModule

     

       5
       5
       +
       , makeWrapper

     

       6
       6
       +
       , cacert

     

       7
       7
       +
       , moreutils

     

       8
       8
       +
       , jq

     

       9
       9
       +
       , git

     

       10
       10
       +
       , rsync

     

       11
       11
       +
       , pkg-config

     

       12
       12
       +
       , yarn

     

       13
       13
       +
       , python3

     

       14
       14
       +
       , esbuild

     

       15
       15
       +
       , nodejs

     

       16
       16
       +
       , node-gyp

     

       17
       17
       +
       , libsecret

     

       18
       18
       +
       , xorg

     

       19
       19
       +
       , ripgrep

     

       20
       20
       +
       , AppKit

     

       21
       21
       +
       , Cocoa

     

       22
       22
       +
       , CoreServices

     

       23
       23
       +
       , Security

     

       24
       24
       +
       , cctools

     

       25
       25
       +
       , xcbuild

     

       26
       26
       +
       , quilt

     

       27
       27
       +
       , nixosTests

     

       28
       28
       +
       }:

     

       29
       29
       +
       

     

       30
       30
       +
       let

     

       31
       31
       +
         system = stdenv.hostPlatform.system;

     

       32
       32
       +
       

     

       33
       33
       +
         python = python3;

     

       34
       34
       +
         yarn' = yarn.override { inherit nodejs; };

     

       35
       35
       +
         defaultYarnOpts = [ ];

     

       36
       36
       +
       

     

       37
       37
       +
         esbuild' = esbuild.override {

     

       38
       38
       +
           buildGoModule = args: buildGoModule (args // rec {

     

       39
       39
       +
             version = "0.16.17";

     

       40
       40
       +
             src = fetchFromGitHub {

     

       41
       41
       +
               owner = "evanw";

     

       42
       42
       +
               repo = "esbuild";

     

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

     

       44
       44
       +
               hash = "sha256-8L8h0FaexNsb3Mj6/ohA37nYLFogo5wXkAhGztGUUsQ=";

     

       45
       45
       +
             };

     

       46
       46
       +
             vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";

     

       47
       47
       +
           });

     

       48
       48
       +
         };

     

       49
       49
       +
       

     

       50
       50
       +
         # replaces esbuild's download script with a binary from nixpkgs

     

       51
       51
       +
         patchEsbuild = path: version: ''

     

       52
       52
       +
           mkdir -p ${path}/node_modules/esbuild/bin

     

       53
       53
       +
           jq "del(.scripts.postinstall)" ${path}/node_modules/esbuild/package.json | sponge ${path}/node_modules/esbuild/package.json

     

       54
       54
       +
           sed -i 's/${version}/${esbuild'.version}/g' ${path}/node_modules/esbuild/lib/main.js

     

       55
       55
       +
           ln -s -f ${esbuild'}/bin/esbuild ${path}/node_modules/esbuild/bin/esbuild

     

       56
       56
       +
         '';

     

       57
       57
       +
       

     

       58
       58
       +
         # Comment from @code-asher, the code-server maintainer

     

       59
       59
       +
         # See https://github.com/NixOS/nixpkgs/pull/240001#discussion_r1244303617

     

       60
       60
       +
         #

     

       61
       61
       +
         # If the commit is missing it will break display languages (Japanese, Spanish,

     

       62
       62
       +
         # etc). For some reason VS Code has a hard dependency on the commit being set

     

       63
       63
       +
         # for that functionality.

     

       64
       64
       +
         # The commit is also used in cache busting. Without the commit you could run

     

       65
       65
       +
         # into issues where the browser is loading old versions of assets from the

     

       66
       66
       +
         # cache.

     

       67
       67
       +
         # Lastly, it can be helpful for the commit to be accurate in bug reports

     

       68
       68
       +
         # especially when they are built outside of our CI as sometimes the version

     

       69
       69
       +
         # numbers can be unreliable (since they are arbitrarily provided).

     

       70
       70
       +
         #

     

       71
       71
       +
         # To compute the commit when upgrading this derivation, do:

     

       72
       72
       +
         # `$ git rev-parse <git-rev>` where <git-rev> is the git revision of the `src`

     

       73
       73
       +
         # Example: `$ git rev-parse v4.16.1`

     

       74
       74
       +
         commit = "0c98611e6b43803a9d5dba222d7023b569abfb49";

     

       75
       75
       +
       in

     

       76
       76
       +
       stdenv.mkDerivation (finalAttrs: {

     

       77
       77
       +
         pname = "code-server";

     

       78
       78
       +
         version = "4.19.1";

     

       79
       79
       +
       

     

       80
       80
       +
         src = fetchFromGitHub {

     

       81
       81
       +
           owner = "coder";

     

       82
       82
       +
           repo = "code-server";

     

       83
       83
       +
           rev = "v${finalAttrs.version}";

     

       84
       84
       +
           fetchSubmodules = true;

     

       85
       85
       +
           hash = "sha256-J+6zuqVf1YKQjiRiqO4867DEwYzZsgQYgbsRXPo2hwY=";

     

       86
       86
       +
         };

     

       87
       87
       +
       

     

       88
       88
       +
         yarnCache = stdenv.mkDerivation {

     

       89
       89
       +
           name = "${finalAttrs.pname}-${finalAttrs.version}-${system}-yarn-cache";

     

       90
       90
       +
           inherit (finalAttrs) src;

     

       91
       91
       +
       

     

       92
       92
       +
           nativeBuildInputs = [ yarn' git cacert ];

     

       93
       93
       +
       

     

       94
       94
       +
           buildPhase = ''

     

       95
       95
       +
             runHook preBuild

     

       96
       96
       +
       

     

       97
       97
       +
             export HOME=$PWD

     

       98
       98
       +
             export GIT_SSL_CAINFO="${cacert}/etc/ssl/certs/ca-bundle.crt"

     

       99
       99
       +
       

     

       100
       100
       +
             yarn --cwd "./vendor" install --modules-folder modules --ignore-scripts --frozen-lockfile

     

       101
       101
       +
       

     

       102
       102
       +
             yarn config set yarn-offline-mirror $out

     

       103
       103
       +
             find "$PWD" -name "yarn.lock" -printf "%h\n" | \

     

       104
       104
       +
               xargs -I {} yarn --cwd {} \

     

       105
       105
       +
                 --frozen-lockfile --ignore-scripts --ignore-platform \

     

       106
       106
       +
                 --ignore-engines --no-progress --non-interactive

     

       107
       107
       +
       

     

       108
       108
       +
             find ./lib/vscode -name "yarn.lock" -printf "%h\n" | \

     

       109
       109
       +
               xargs -I {} yarn --cwd {} \

     

       110
       110
       +
                 --ignore-scripts --ignore-engines

     

       111
       111
       +
       

     

       112
       112
       +
             runHook postBuild

     

       113
       113
       +
           '';

     

       114
       114
       +
       

     

       115
       115
       +
           outputHashMode = "recursive";

     

       116
       116
       +
           outputHashAlgo = "sha256";

     

       117
       117
       +
           outputHash = "sha256-g2rwB+PuWuYgrzIuW0ngia7cdPMC8s7ffBEkbmPPzB4=";

     

       118
       118
       +
         };

     

       119
       119
       +
       

     

       120
       120
       +
         nativeBuildInputs = [

     

       121
       121
       +
           nodejs

     

       122
       122
       +
           yarn'

     

       123
       123
       +
           python

     

       124
       124
       +
           pkg-config

     

       125
       125
       +
           makeWrapper

     

       126
       126
       +
           git

     

       127
       127
       +
           rsync

     

       128
       128
       +
           jq

     

       129
       129
       +
           moreutils

     

       130
       130
       +
           quilt

     

       131
       131
       +
         ];

     

       132
       132
       +
       

     

       133
       133
       +
         buildInputs = lib.optionals (!stdenv.isDarwin) [ libsecret ]

     

       134
       134
       +
           ++ (with xorg; [ libX11 libxkbfile ])

     

       135
       135
       +
           ++ lib.optionals stdenv.isDarwin [

     

       136
       136
       +
           AppKit

     

       137
       137
       +
           Cocoa

     

       138
       138
       +
           CoreServices

     

       139
       139
       +
           Security

     

       140
       140
       +
           cctools

     

       141
       141
       +
           xcbuild

     

       142
       142
       +
         ];

     

       143
       143
       +
       

     

       144
       144
       +
         patches = [

     

       145
       145
       +
           # Remove all git calls from the VS Code build script except `git rev-parse

     

       146
       146
       +
           # HEAD` which is replaced in postPatch with the commit.

     

       147
       147
       +
           ./build-vscode-nogit.patch

     

       148
       148
       +
         ];

     

       149
       149
       +
       

     

       150
       150
       +
         postPatch = ''

     

       151
       151
       +
           export HOME=$PWD

     

       152
       152
       +
       

     

       153
       153
       +
           patchShebangs ./ci

     

       154
       154
       +
       

     

       155
       155
       +
           # inject git commit

     

       156
       156
       +
           substituteInPlace ./ci/build/build-vscode.sh \

     

       157
       157
       +
             --replace '$(git rev-parse HEAD)' "${commit}"

     

       158
       158
       +
           substituteInPlace ./ci/build/build-release.sh \

     

       159
       159
       +
             --replace '$(git rev-parse HEAD)' "${commit}"

     

       160
       160
       +
         '';

     

       161
       161
       +
       

     

       162
       162
       +
         configurePhase = ''

     

       163
       163
       +
           runHook preConfigure

     

       164
       164
       +
       

     

       165
       165
       +
           # run yarn offline by default

     

       166
       166
       +
           echo '--install.offline true' >> .yarnrc

     

       167
       167
       +
       

     

       168
       168
       +
           # set default yarn opts

     

       169
       169
       +
           ${lib.concatMapStrings (option: ''

     

       170
       170
       +
             yarn --offline config set ${option}

     

       171
       171
       +
           '') defaultYarnOpts}

     

       172
       172
       +
       

     

       173
       173
       +
           # set offline mirror to yarn cache we created in previous steps

     

       174
       174
       +
           yarn --offline config set yarn-offline-mirror "${finalAttrs.yarnCache}"

     

       175
       175
       +
       

     

       176
       176
       +
           # skip unnecessary electron download

     

       177
       177
       +
           export ELECTRON_SKIP_BINARY_DOWNLOAD=1

     

       178
       178
       +
       

     

       179
       179
       +
           # set nodedir to prevent node-gyp from downloading headers

     

       180
       180
       +
           # taken from https://nixos.org/manual/nixpkgs/stable/#javascript-tool-specific

     

       181
       181
       +
           mkdir -p $HOME/.node-gyp/${nodejs.version}

     

       182
       182
       +
           echo 9 > $HOME/.node-gyp/${nodejs.version}/installVersion

     

       183
       183
       +
           ln -sfv ${nodejs}/include $HOME/.node-gyp/${nodejs.version}

     

       184
       184
       +
           export npm_config_nodedir=${nodejs}

     

       185
       185
       +
       

     

       186
       186
       +
           # use updated node-gyp. fixes the following error on Darwin:

     

       187
       187
       +
           # PermissionError: [Errno 1] Operation not permitted: '/usr/sbin/pkgutil'

     

       188
       188
       +
           export npm_config_node_gyp=${node-gyp}/lib/node_modules/node-gyp/bin/node-gyp.js

     

       189
       189
       +
       

     

       190
       190
       +
           runHook postConfigure

     

       191
       191
       +
         '';

     

       192
       192
       +
       

     

       193
       193
       +
         buildPhase = ''

     

       194
       194
       +
           runHook preBuild

     

       195
       195
       +
       

     

       196
       196
       +
           # install code-server dependencies

     

       197
       197
       +
           yarn --offline --ignore-scripts

     

       198
       198
       +
       

     

       199
       199
       +
           # apply patches

     

       200
       200
       +
           quilt push -a

     

       201
       201
       +
       

     

       202
       202
       +
           # patch shebangs of everything to allow binary packages to build

     

       203
       203
       +
           patchShebangs .

     

       204
       204
       +
       

     

       205
       205
       +
           export PLAYWRIGHT_SKIP_BROWSER_DOWNLOAD=1

     

       206
       206
       +
           export SKIP_SUBMODULE_DEPS=1

     

       207
       207
       +
           export NODE_OPTIONS=--openssl-legacy-provider

     

       208
       208
       +
       

     

       209
       209
       +
           # rebuild binary packages now that scripts have been patched

     

       210
       210
       +
           echo "----- NPM rebuild"

     

       211
       211
       +
           npm rebuild --prefer-offline

     

       212
       212
       +
       

     

       213
       213
       +
           # Replicate ci/dev/postinstall.sh

     

       214
       214
       +
           echo "----- Replicate ci/dev/postinstall.sh"

     

       215
       215
       +
           yarn --cwd "./vendor" install --modules-folder modules --offline --ignore-scripts --frozen-lockfile

     

       216
       216
       +
       

     

       217
       217
       +
           # remove all built-in extensions, as these are 3rd party extensions that

     

       218
       218
       +
           # get downloaded from vscode marketplace

     

       219
       219
       +
           jq --slurp '.[0] * .[1]' "./lib/vscode/product.json" <(

     

       220
       220
       +
             cat << EOF

     

       221
       221
       +
           {

     

       222
       222
       +
             "builtInExtensions": []

     

       223
       223
       +
           }

     

       224
       224
       +
           EOF

     

       225
       225
       +
           ) | sponge ./lib/vscode/product.json

     

       226
       226
       +
       

     

       227
       227
       +
           # disable automatic updates

     

       228
       228
       +
           sed -i '/update.mode/,/\}/{s/default:.*/default: "none",/g}' \

     

       229
       229
       +
             lib/vscode/src/vs/platform/update/common/update.config.contribution.ts

     

       230
       230
       +
       

     

       231
       231
       +
           # Patch out remote download of nodejs from build script

     

       232
       232
       +
           patch -p1 -i ${./remove-node-download.patch}

     

       233
       233
       +
       

     

       234
       234
       +
           # Fetch packages for vscode

     

       235
       235
       +
           find ./lib/vscode -name "yarn.lock" -printf "%h\n" | \

     

       236
       236
       +
               xargs -I {} yarn --cwd {} \

     

       237
       237
       +
                 --frozen-lockfile --ignore-scripts --ignore-engines

     

       238
       238
       +
       

     

       239
       239
       +
           # patch shebangs of everything to allow binary packages to build

     

       240
       240
       +
           patchShebangs .

     

       241
       241
       +
       

     

       242
       242
       +
           ${patchEsbuild "./lib/vscode/build" "0.12.6"}

     

       243
       243
       +
           ${patchEsbuild "./lib/vscode/extensions" "0.11.23"}

     

       244
       244
       +
         '' + lib.optionalString stdenv.isDarwin ''

     

       245
       245
       +
           # use prebuilt binary for @parcel/watcher, which requires macOS SDK 10.13+

     

       246
       246
       +
           # (see issue #101229)

     

       247
       247
       +
           pushd ./lib/vscode/remote/node_modules/@parcel/watcher

     

       248
       248
       +
           mkdir -p ./build/Release

     

       249
       249
       +
           mv ./prebuilds/darwin-x64/node.napi.glibc.node ./build/Release/watcher.node

     

       250
       250
       +
           jq "del(.scripts) | .gypfile = false" ./package.json | sponge ./package.json

     

       251
       251
       +
           popd

     

       252
       252
       +
         '' + ''

     

       253
       253
       +
       

     

       254
       254
       +
           # put ripgrep binary into bin, so postinstall does not try to download it

     

       255
       255
       +
           find -name ripgrep -type d \

     

       256
       256
       +
             -execdir mkdir -p {}/bin \; \

     

       257
       257
       +
             -execdir ln -s ${ripgrep}/bin/rg {}/bin/rg \;

     

       258
       258
       +
       

     

       259
       259
       +
           # run postinstall scripts after patching

     

       260
       260
       +
           find ./lib/vscode \( -path "*/node_modules/*" -or -path "*/extensions/*" \) \

     

       261
       261
       +
             -and -type f -name "yarn.lock" -printf "%h\n" | \

     

       262
       262
       +
               xargs -I {} sh -c 'jq -e ".scripts.postinstall" {}/package.json >/dev/null && yarn --cwd {} postinstall --frozen-lockfile --offline || true'

     

       263
       263
       +
       

     

       264
       264
       +
           # build code-server

     

       265
       265
       +
           yarn build

     

       266
       266
       +
       

     

       267
       267
       +
           # build vscode

     

       268
       268
       +
           VERSION=${finalAttrs.version} yarn build:vscode

     

       269
       269
       +
       

     

       270
       270
       +
           # inject version into package.json

     

       271
       271
       +
           jq --slurp '.[0] * .[1]' ./package.json <(

     

       272
       272
       +
             cat << EOF

     

       273
       273
       +
           {

     

       274
       274
       +
             "version": "${finalAttrs.version}"

     

       275
       275
       +
           }

     

       276
       276
       +
           EOF

     

       277
       277
       +
           ) | sponge ./package.json

     

       278
       278
       +
       

     

       279
       279
       +
           # create release

     

       280
       280
       +
           yarn release

     

       281
       281
       +
       

     

       282
       282
       +
           runHook postBuild

     

       283
       283
       +
         '';

     

       284
       284
       +
       

     

       285
       285
       +
         installPhase = ''

     

       286
       286
       +
           runHook preInstall

     

       287
       287
       +
       

     

       288
       288
       +
           mkdir -p $out/libexec/code-server $out/bin

     

       289
       289
       +
       

     

       290
       290
       +
           # copy release to libexec path

     

       291
       291
       +
           cp -R -T release "$out/libexec/code-server"

     

       292
       292
       +
       

     

       293
       293
       +
           # install only production dependencies

     

       294
       294
       +
           yarn --offline --cwd "$out/libexec/code-server" --production

     

       295
       295
       +
       

     

       296
       296
       +
           # create wrapper

     

       297
       297
       +
           makeWrapper "${nodejs}/bin/node" "$out/bin/code-server" \

     

       298
       298
       +
             --add-flags "$out/libexec/code-server/out/node/entry.js"

     

       299
       299
       +
       

     

       300
       300
       +
           runHook postInstall

     

       301
       301
       +
         '';

     

       302
       302
       +
       

     

       303
       303
       +
         passthru = {

     

       304
       304
       +
           prefetchYarnCache = lib.overrideDerivation finalAttrs.yarnCache (d: {

     

       305
       305
       +
             outputHash = lib.fakeSha256;

     

       306
       306
       +
           });

     

       307
       307
       +
           tests = {

     

       308
       308
       +
             inherit (nixosTests) code-server;

     

       309
       309
       +
           };

     

       310
       310
       +
           # vscode-with-extensions compatibility

     

       311
       311
       +
           executableName = "code-server";

     

       312
       312
       +
           longName = "Visual Studio Code Server";

     

       313
       313
       +
         };

     

       314
       314
       +
       

     

       315
       315
       +
         meta = {

     

       316
       316
       +
           description = "Run VS Code on a remote server";

     

       317
       317
       +
           longDescription = ''

     

       318
       318
       +
             code-server is VS Code running on a remote server, accessible through the

     

       319
       319
       +
             browser.

     

       320
       320
       +
           '';

     

       321
       321
       +
           homepage = "https://github.com/coder/code-server";

     

       322
       322
       +
           license = lib.licenses.mit;

     

       323
       323
       +
           maintainers = with lib.maintainers; [ offline henkery code-asher ];

     

       324
       324
       +
           platforms = [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" ];

     

       325
       325
       +
           mainProgram = "code-server";

     

       326
       326
       +
         };

     

       327
       327
       +
       })

+10

pkgs/servers/code-server/playwright.patch

···

       1
       1
       +
       --- ./vendor/modules/code-oss-dev/node_modules/playwright/install.js

     

       2
       2
       +
       +++ ./vendor/modules/code-oss-dev/node_modules/playwright/install.js

     

       3
       3
       +
       @@ -14,6 +14,4 @@

     

       4
       4
       +
         * limitations under the License.

     

       5
       5
       +
         */

     

       6
       6
       +
        

     

       7
       7
       +
       -const { installDefaultBrowsersForNpmInstall } = require('playwright-core/lib/utils/registry');

     

       8
       8
       +
       -

     

       9
       9
       +
       -installDefaultBrowsersForNpmInstall();

     

       10
       10
       +
       +process.stdout.write('Browser install disabled by Nix build script\n');

+28

pkgs/servers/code-server/remove-node-download.patch

···

       1
       1
       +
       --- ./lib/vscode/build/gulpfile.reh.js

     

       2
       2
       +
       +++ ./lib/vscode/build/gulpfile.reh.js

     

       3
       3
       +
       @@ -268,9 +268,6 @@

     

       4
       4
       +
        			.pipe(util.stripSourceMappingURL())

     

       5
       5
       +
        			.pipe(jsFilter.restore);

     

       6
       6
       +
        

     

       7
       7
       +
       -		const nodePath = `.build/node/v${nodeVersion}/${platform}-${arch}`;

     

       8
       8
       +
       -		const node = gulp.src(`${nodePath}/**`, { base: nodePath, dot: true });

     

       9
       9
       +
       -

     

       10
       10
       +
        		let web = [];

     

       11
       11
       +
        		if (type === 'reh-web') {

     

       12
       12
       +
        			web = [

     

       13
       13
       +
       @@ -287,7 +284,6 @@

     

       14
       14
       +
        			license,

     

       15
       15
       +
        			sources,

     

       16
       16
       +
        			deps,

     

       17
       17
       +
       -			node,

     

       18
       18
       +
        			...web

     

       19
       19
       +
        		);

     

       20
       20
       +
        

     

       21
       21
       +
       @@ -385,7 +381,6 @@

     

       22
       22
       +
        			const destinationFolderName = `vscode-${type}${dashed(platform)}${dashed(arch)}`;

     

       23
       23
       +
        

     

       24
       24
       +
        			const serverTaskCI = task.define(`vscode-${type}${dashed(platform)}${dashed(arch)}${dashed(minified)}-ci`, task.series(

     

       25
       25
       +
       -				gulp.task(`node-${platform}-${arch}`),

     

       26
       26
       +
        				util.rimraf(path.join(BUILD_ROOT, destinationFolderName)),

     

       27
       27
       +
        				packageTask(type, platform, arch, sourceFolderName, destinationFolderName)

     

       28
       28
       +
        			));

+2 -2

pkgs/servers/honk/default.nix

···

       8
       8
        
       

     

       9
       9
        
       buildGoModule rec {

     

       10
       10
        
         pname = "honk";

     

       11
       11
       -
         version = "1.1.1";

     

       11
       11
       +
         version = "1.2.0";

     

       12
       12
        
       

     

       13
       13
        
         src = fetchurl {

     

       14
       14
        
           url = "https://humungus.tedunangst.com/r/honk/d/honk-${version}.tgz";

     

       15
       15
       -
           hash = "sha256-kfoSVGm1QKVjDiWvjK4QzAoA/iiU9j6DS3SYFSM+AaA=";

     

       15
       15
       +
           hash = "sha256-kcrEg0KBdCaA4g8ivIgOWIGJVDCtY5rI4P7cp/ZyXe4=";

     

       16
       16
        
         };

     

       17
       17
        
         vendorHash = null;

     

       18
       18

+26

pkgs/test/nixpkgs-check-by-name/scripts/README.md

···

       1
       1
       +
       # CI-related Scripts

     

       2
       2
       +
       

     

       3
       3
       +
       This directory contains scripts used and related to the CI running the `pkgs/by-name` checks in Nixpkgs. See also the [CI GitHub Action](../../../../.github/workflows/check-by-name.yml).

     

       4
       4
       +
       

     

       5
       5
       +
       ## `./run-local.sh BASE_BRANCH [REPOSITORY]`

     

       6
       6
       +
       

     

       7
       7
       +
       Runs the `pkgs/by-name` check on the HEAD commit, closely matching what CI does.

     

       8
       8
       +
       

     

       9
       9
       +
       Note that this can't do exactly the same as CI,

     

       10
       10
       +
       because CI needs to rely on GitHub's server-side Git history to compute the mergeability of PRs before the check can be started.

     

       11
       11
       +
       In turn when running locally, we don't want to have to push commits to test them,

     

       12
       12
       +
       and we can also rely on the local Git history to do the mergeability check.

     

       13
       13
       +
       

     

       14
       14
       +
       Arguments:

     

       15
       15
       +
       - `BASE_BRANCH`: The base branch to use, e.g. master or release-23.11

     

       16
       16
       +
       - `REPOSITORY`: The repository to fetch the base branch from, defaults to https://github.com/NixOS/nixpkgs.git

     

       17
       17
       +
       

     

       18
       18
       +
       ## `./fetch-tool.sh BASE_BRANCH OUTPUT_PATH`

     

       19
       19
       +
       

     

       20
       20
       +
       Fetches the Hydra-prebuilt nixpkgs-check-by-name to use from the NixOS channel corresponding to the given base branch.

     

       21
       21
       +
       

     

       22
       22
       +
       This script is used both by [`./run-local.sh`](#run-local-sh-base-branch-repository) and CI.

     

       23
       23
       +
       

     

       24
       24
       +
       Arguments:

     

       25
       25
       +
       - `BASE_BRANCH`: The base branch to use, e.g. master or release-23.11

     

       26
       26
       +
       - `OUTPUT_PATH`: The output symlink path for the tool

+47

pkgs/test/nixpkgs-check-by-name/scripts/fetch-tool.sh

···

       1
       1
       +
       #!/usr/bin/env bash

     

       2
       2
       +
       # Fetches the prebuilt nixpkgs-check-by-name to use from

     

       3
       3
       +
       # the NixOS channel corresponding to the given base branch

     

       4
       4
       +
       

     

       5
       5
       +
       set -o pipefail -o errexit -o nounset

     

       6
       6
       +
       

     

       7
       7
       +
       trace() { echo >&2 "$@"; }

     

       8
       8
       +
       

     

       9
       9
       +
       if (( $# < 2 )); then

     

       10
       10
       +
           trace "Usage: $0 BASE_BRANCH OUTPUT_PATH"

     

       11
       11
       +
           trace "BASE_BRANCH: The base branch to use, e.g. master or release-23.11"

     

       12
       12
       +
           trace "OUTPUT_PATH: The output symlink path for the tool"

     

       13
       13
       +
           exit 1

     

       14
       14
       +
       fi

     

       15
       15
       +
       baseBranch=$1

     

       16
       16
       +
       output=$2

     

       17
       17
       +
       

     

       18
       18
       +
       trace -n "Determining the channel to use for PR base branch $baseBranch.. "

     

       19
       19
       +
       if [[ "$baseBranch" =~ ^(release|staging|staging-next)-([0-9][0-9]\.[0-9][0-9])$ ]]; then

     

       20
       20
       +
         # Use the release channel for all PRs to release-XX.YY, staging-XX.YY and staging-next-XX.YY

     

       21
       21
       +
         preferredChannel=nixos-${BASH_REMATCH[2]}

     

       22
       22
       +
       else

     

       23
       23
       +
         # Use the nixos-unstable channel for all other PRs

     

       24
       24
       +
         preferredChannel=nixos-unstable

     

       25
       25
       +
       fi

     

       26
       26
       +
       

     

       27
       27
       +
       # Check that the channel exists. It doesn't exist for fresh release branches

     

       28
       28
       +
       if curl -fSs "https://channels.nixos.org/$preferredChannel"; then

     

       29
       29
       +
           channel=$preferredChannel

     

       30
       30
       +
           trace "$channel"

     

       31
       31
       +
       else

     

       32
       32
       +
           # Fall back to nixos-unstable, makes sense for fresh release branches

     

       33
       33
       +
           channel=nixos-unstable

     

       34
       34
       +
           trace -e "\e[33mWarning: Preferred channel $preferredChannel could not be fetched, using fallback: $channel\e[0m"

     

       35
       35
       +
       fi

     

       36
       36
       +
       

     

       37
       37
       +
       trace -n "Fetching latest version of channel $channel.. "

     

       38
       38
       +
       # This is probably the easiest way to get Nix to output the path to a downloaded channel!

     

       39
       39
       +
       nixpkgs=$(nix-instantiate --find-file nixpkgs -I nixpkgs=channel:"$channel")

     

       40
       40
       +
       trace "$nixpkgs"

     

       41
       41
       +
       

     

       42
       42
       +
       # This file only exists in channels

     

       43
       43
       +
       trace -e "Git revision of channel $channel is \e[34m$(<"$nixpkgs/.git-revision")\e[0m"

     

       44
       44
       +
       

     

       45
       45
       +
       trace -n "Fetching the prebuilt version of nixpkgs-check-by-name.. "

     

       46
       46
       +
       nix-build -o "$output" "$nixpkgs" -A tests.nixpkgs-check-by-name -j 0 >/dev/null

     

       47
       47
       +
       realpath "$output" >&2

+67

pkgs/test/nixpkgs-check-by-name/scripts/run-local.sh

···

       1
       1
       +
       #!/usr/bin/env bash

     

       2
       2
       +
       

     

       3
       3
       +
       set -o pipefail -o errexit -o nounset

     

       4
       4
       +
       

     

       5
       5
       +
       trace() { echo >&2 "$@"; }

     

       6
       6
       +
       

     

       7
       7
       +
       tmp=$(mktemp -d)

     

       8
       8
       +
       cleanup() {

     

       9
       9
       +
           # Don't exit early if anything fails to cleanup

     

       10
       10
       +
           set +o errexit

     

       11
       11
       +
       

     

       12
       12
       +
           trace -n "Cleaning up.. "

     

       13
       13
       +
       

     

       14
       14
       +
           [[ -e "$tmp/base" ]] && git worktree remove --force "$tmp/base"

     

       15
       15
       +
           [[ -e "$tmp/merged" ]] && git worktree remove --force "$tmp/merged"

     

       16
       16
       +
       

     

       17
       17
       +
           rm -rf "$tmp"

     

       18
       18
       +
       

     

       19
       19
       +
           trace "Done"

     

       20
       20
       +
       }

     

       21
       21
       +
       trap cleanup exit

     

       22
       22
       +
       

     

       23
       23
       +
       

     

       24
       24
       +
       repo=https://github.com/NixOS/nixpkgs.git

     

       25
       25
       +
       

     

       26
       26
       +
       if (( $# != 0 )); then

     

       27
       27
       +
           baseBranch=$1

     

       28
       28
       +
           shift

     

       29
       29
       +
       else

     

       30
       30
       +
           trace "Usage: $0 BASE_BRANCH [REPOSITORY]"

     

       31
       31
       +
           trace "BASE_BRANCH: The base branch to use, e.g. master or release-23.11"

     

       32
       32
       +
           trace "REPOSITORY: The repository to fetch the base branch from, defaults to $repo"

     

       33
       33
       +
           exit 1

     

       34
       34
       +
       fi

     

       35
       35
       +
       

     

       36
       36
       +
       if (( $# != 0 )); then

     

       37
       37
       +
           repo=$1

     

       38
       38
       +
           shift

     

       39
       39
       +
       fi

     

       40
       40
       +
       

     

       41
       41
       +
       if [[ -n "$(git status --porcelain)" ]]; then

     

       42
       42
       +
           trace -e "\e[33mWarning: Dirty tree, uncommitted changes won't be taken into account\e[0m"

     

       43
       43
       +
       fi

     

       44
       44
       +
       headSha=$(git rev-parse HEAD)

     

       45
       45
       +
       trace -e "Using HEAD commit \e[34m$headSha\e[0m"

     

       46
       46
       +
       

     

       47
       47
       +
       trace -n "Creating Git worktree for the HEAD commit in $tmp/merged.. "

     

       48
       48
       +
       git worktree add --detach -q "$tmp/merged" HEAD

     

       49
       49
       +
       trace "Done"

     

       50
       50
       +
       

     

       51
       51
       +
       trace -n "Fetching base branch $baseBranch to compare against.. "

     

       52
       52
       +
       git fetch -q "$repo" refs/heads/"$baseBranch"

     

       53
       53
       +
       baseSha=$(git rev-parse FETCH_HEAD)

     

       54
       54
       +
       trace -e "\e[34m$baseSha\e[0m"

     

       55
       55
       +
       

     

       56
       56
       +
       trace -n "Creating Git worktree for the base branch in $tmp/base.. "

     

       57
       57
       +
       git worktree add -q "$tmp/base" "$baseSha"

     

       58
       58
       +
       trace "Done"

     

       59
       59
       +
       

     

       60
       60
       +
       trace -n "Merging base branch into the HEAD commit in $tmp/merged.. "

     

       61
       61
       +
       git -C "$tmp/merged" merge -q --no-edit "$baseSha"

     

       62
       62
       +
       trace -e "\e[34m$(git -C "$tmp/merged" rev-parse HEAD)\e[0m"

     

       63
       63
       +
       

     

       64
       64
       +
       "$tmp/merged/pkgs/test/nixpkgs-check-by-name/scripts/fetch-tool.sh" "$baseBranch" "$tmp/tool"

     

       65
       65
       +
       

     

       66
       66
       +
       trace "Running nixpkgs-check-by-name.."

     

       67
       67
       +
       "$tmp/tool/bin/nixpkgs-check-by-name" --base "$tmp/base" "$tmp/merged"

+4 -4

pkgs/tools/security/vaultwarden/webvault.nix

···

       7
       7
        
       }:

     

       8
       8
        
       

     

       9
       9
        
       let

     

       10
       10
       -
         version = "2023.10.0";

     

       10
       10
       +
         version = "2023.12.0";

     

       11
       11
        
       

     

       12
       12
        
         bw_web_builds = fetchFromGitHub {

     

       13
       13
        
           owner = "dani-garcia";

     

       14
       14
        
           repo = "bw_web_builds";

     

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

     

       16
       16
       -
           hash = "sha256-5vfmMJIGKyZlTQDi/t1YKAALbW/6BFAcWODfkypk/eA=";

     

       16
       16
       +
           hash = "sha256-S98Yqi0PEpMF+enP/J3x/kPEe0VhErY8BNphOXmsijg=";

     

       17
       17
        
         };

     

       18
       18
        
       in buildNpmPackage rec {

     

       19
       19
        
         pname = "vaultwarden-webvault";

     
···

       23
       23
        
           owner = "bitwarden";

     

       24
       24
        
           repo = "clients";

     

       25
       25
        
           rev = "web-v${lib.removeSuffix "b" version}";

     

       26
       26
       -
           hash = "sha256-egXToXWfb9XV7JuCRBYJO4p/e+WOwMncPKz0oBgeALQ=";

     

       26
       26
       +
           hash = "sha256-eAwj7cWR/ojAMAvYg2/vtNWYTwVBCOnBJPy9mC5Td40=";

     

       27
       27
        
         };

     

       28
       28
        
       

     

       29
       29
       -
         npmDepsHash = "sha256-iO8ZozVl1vOOqowQARnRJWSFUFnau46+dKfcMSkyU3o=";

     

       29
       29
       +
         npmDepsHash = "sha256-VW1pGG/pc2tdSs5+HfypZv9fnQu04qkoFBTJxaYvBZo=";

     

       30
       30
        
       

     

       31
       31
        
         postPatch = ''

     

       32
       32
        
           ln -s ${bw_web_builds}/{patches,resources} ..

+54

pkgs/tools/typesetting/tectonic/biber.nix

···

       1
       1
       +
       /*

     

       2
       2
       +
         This package, `biber-for-tectonic`, provides a compatible version of `biber`

     

       3
       3
       +
         as an optional runtime dependency of `tectonic`.

     

       4
       4
       +
       

     

       5
       5
       +
         The development of tectonic is slowing down recently, such that its `biber`

     

       6
       6
       +
         dependency has been lagging behind the one in the nixpkgs `texlive` bundle.

     

       7
       7
       +
         See:

     

       8
       8
       +
       

     

       9
       9
       +
         https://github.com/tectonic-typesetting/tectonic/discussions/1122

     

       10
       10
       +
       

     

       11
       11
       +
         It is now feasible to track the biber dependency in nixpkgs, as the

     

       12
       12
       +
         version bump is not very frequent, and it would provide a more complete

     

       13
       13
       +
         user experience of tectonic in nixpkgs.

     

       14
       14
       +
       */

     

       15
       15
       +
       

     

       16
       16
       +
       { lib

     

       17
       17
       +
       , fetchFromGitHub

     

       18
       18
       +
       , fetchpatch

     

       19
       19
       +
       , biber

     

       20
       20
       +
       }:

     

       21
       21
       +
       

     

       22
       22
       +
       let version = "2.17"; in (

     

       23
       23
       +
         biber.override {

     

       24
       24
       +
           /*

     

       25
       25
       +
             It is necessary to first override the `version` data here, which is

     

       26
       26
       +
             passed to `buildPerlModule`, and then to `mkDerivation`.

     

       27
       27
       +
       

     

       28
       28
       +
             If we simply do `biber.overrideAttrs` the resulting package `name`

     

       29
       29
       +
             would be incorrect, since it has already been preprocessed by

     

       30
       30
       +
             `buildPerlModule`.

     

       31
       31
       +
           */

     

       32
       32
       +
           texlive.pkgs.biber.texsource = {

     

       33
       33
       +
             inherit version;

     

       34
       34
       +
             inherit (biber) pname meta;

     

       35
       35
       +
           };

     

       36
       36
       +
         }

     

       37
       37
       +
       ).overrideAttrs (prevAttrs: {

     

       38
       38
       +
         src = fetchFromGitHub {

     

       39
       39
       +
           owner = "plk";

     

       40
       40
       +
           repo = "biber";

     

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

     

       42
       42
       +
           hash = "sha256-Tt2sN2b2NGxcWyZDj5uXNGC8phJwFRiyH72n3yhFCi0=";

     

       43
       43
       +
         };

     

       44
       44
       +
         patches = [

     

       45
       45
       +
           # Perl>=5.36.0 compatibility

     

       46
       46
       +
           (fetchpatch {

     

       47
       47
       +
             url = "https://patch-diff.githubusercontent.com/raw/plk/biber/pull/411.patch";

     

       48
       48
       +
             hash = "sha256-osgldRVfe3jnMSOMnAMQSB0Ymc1s7J6KtM2ig3c93SE=";

     

       49
       49
       +
           })

     

       50
       50
       +
         ];

     

       51
       51
       +
         meta = prevAttrs.meta // {

     

       52
       52
       +
           maintainers = with lib.maintainers; [ doronbehar bryango ];

     

       53
       53
       +
         };

     

       54
       54
       +
       })

+14 -5

pkgs/tools/typesetting/tectonic/default.nix

···

       1
       1
       +
       /*

     

       2
       2
       +
         This file provides the `tectonic-unwrapped` package. On the other hand,

     

       3
       3
       +
         the `tectonic` package is defined in `./wrapper.nix`, by wrapping

     

       4
       4
       +
         - [`tectonic-unwrapped`](./default.nix) i.e. this package, and

     

       5
       5
       +
         - [`biber-for-tectonic`](./biber.nix),

     

       6
       6
       +
           which provides a compatible version of `biber`.

     

       7
       7
       +
       */

     

       8
       8
       +
       

     

       1
       9
        
       { lib

     

       2
       10
        
       , stdenv

     

       3
       11
        
       , fetchFromGitHub

     
···

       25
       33
        
       

     

       26
       34
        
         cargoHash = "sha256-1WjZbmZFPB1+QYpjqq5Y+fDkMZNmWJYIxmMFWg7Tiac=";

     

       27
       35
        
       

     

       28
       28
       -
         nativeBuildInputs = [ pkg-config makeBinaryWrapper ];

     

       36
       36
       +
         nativeBuildInputs = [ pkg-config ];

     

       29
       37
        
       

     

       30
       38
        
         buildInputs = [ icu fontconfig harfbuzz openssl ]

     

       31
       39
        
           ++ lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ ApplicationServices Cocoa Foundation ]);

     
···

       33
       41
        
         # workaround for https://github.com/NixOS/nixpkgs/issues/166205

     

       34
       42
        
         NIX_LDFLAGS = lib.optionalString (stdenv.cc.isClang && stdenv.cc.libcxx != null) " -l${stdenv.cc.libcxx.cxxabi.libName}";

     

       35
       43
        
       

     

       36
       36
       -
         postInstall = lib.optionalString stdenv.isLinux ''

     

       44
       44
       +
         postInstall = ''

     

       45
       45
       +
           # Makes it possible to automatically use the V2 CLI API

     

       46
       46
       +
           ln -s $out/bin/tectonic $out/bin/nextonic

     

       47
       47
       +
         '' + lib.optionalString stdenv.isLinux ''

     

       37
       48
        
           substituteInPlace dist/appimage/tectonic.desktop \

     

       38
       49
        
             --replace Exec=tectonic Exec=$out/bin/tectonic

     

       39
       50
        
           install -D dist/appimage/tectonic.desktop -t $out/share/applications/

     

       40
       51
        
           install -D dist/appimage/tectonic.svg -t $out/share/icons/hicolor/scalable/apps/

     

       41
       41
       -
       

     

       42
       42
       -
           ln -s $out/bin/tectonic $out/bin/nextonic

     

       43
       52
        
         '';

     

       44
       53
        
       

     

       45
       54
        
         doCheck = true;

     
···

       50
       59
        
           changelog = "https://github.com/tectonic-typesetting/tectonic/blob/tectonic@${version}/CHANGELOG.md";

     

       51
       60
        
           license = with licenses; [ mit ];

     

       52
       61
        
           mainProgram = "tectonic";

     

       53
       53
       -
           maintainers = with maintainers; [ lluchs doronbehar ];

     

       62
       62
       +
           maintainers = with maintainers; [ lluchs doronbehar bryango ];

     

       54
       63
        
         };

     

       55
       64
        
       }

+56

pkgs/tools/typesetting/tectonic/wrapper.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , symlinkJoin

     

       3
       3
       +
       , tectonic-unwrapped

     

       4
       4
       +
       , biber-for-tectonic

     

       5
       5
       +
       , makeWrapper

     

       6
       6
       +
       }:

     

       7
       7
       +
       

     

       8
       8
       +
       symlinkJoin {

     

       9
       9
       +
         name = "${tectonic-unwrapped.pname}-wrapped-${tectonic-unwrapped.version}";

     

       10
       10
       +
         paths = [ tectonic-unwrapped ];

     

       11
       11
       +
       

     

       12
       12
       +
         nativeBuildInputs = [ makeWrapper ];

     

       13
       13
       +
       

     

       14
       14
       +
         passthru = {

     

       15
       15
       +
           unwrapped = tectonic-unwrapped;

     

       16
       16
       +
           biber = biber-for-tectonic;

     

       17
       17
       +
         };

     

       18
       18
       +
       

     

       19
       19
       +
         # Replace the unwrapped tectonic with the one wrapping it with biber

     

       20
       20
       +
         postBuild = ''

     

       21
       21
       +
           rm $out/bin/{tectonic,nextonic}

     

       22
       22
       +
         ''

     

       23
       23
       +
           # Ideally, we would have liked to also pin the version of the online TeX

     

       24
       24
       +
           # bundle that Tectonic's developer distribute, so that the `biber` version

     

       25
       25
       +
           # and the `biblatex` version distributed from there are compatible.

     

       26
       26
       +
           # However, that is not currently possible, due to lack of upstream support

     

       27
       27
       +
           # for specifying this in runtime, there were 2 suggestions sent upstream

     

       28
       28
       +
           # that suggested a way of improving the situation:

     

       29
       29
       +
           #

     

       30
       30
       +
           # - https://github.com/tectonic-typesetting/tectonic/pull/1132

     

       31
       31
       +
           # - https://github.com/tectonic-typesetting/tectonic/pull/1131

     

       32
       32
       +
           #

     

       33
       33
       +
           # The 1st suggestion seems more promising as it'd allow us to simply use

     

       34
       34
       +
           # makeWrapper's --add-flags option. However, the PR linked above is not

     

       35
       35
       +
           # complete, and as of currently, upstream hasn't even reviewed it, or

     

       36
       36
       +
           # commented on the idea.

     

       37
       37
       +
           #

     

       38
       38
       +
           # Note also that upstream has announced that they will put less time and

     

       39
       39
       +
           # energy for the project:

     

       40
       40
       +
           #

     

       41
       41
       +
           # https://github.com/tectonic-typesetting/tectonic/discussions/1122

     

       42
       42
       +
           #

     

       43
       43
       +
           # Hence, we can be rather confident that for the near future, the online

     

       44
       44
       +
           # TeX bundle won't be updated and hence the biblatex distributed there

     

       45
       45
       +
           # won't require a higher version of biber.

     

       46
       46
       +
         + ''

     

       47
       47
       +
           makeWrapper ${lib.getBin tectonic-unwrapped}/bin/tectonic $out/bin/tectonic \

     

       48
       48
       +
             --prefix PATH : "${lib.getBin biber-for-tectonic}/bin"

     

       49
       49
       +
           ln -s $out/bin/tectonic $out/bin/nextonic

     

       50
       50
       +
         '';

     

       51
       51
       +
       

     

       52
       52
       +
         meta = tectonic-unwrapped.meta // {

     

       53
       53
       +
           description = "Tectonic TeX/LaTeX engine, wrapped with a compatible biber";

     

       54
       54
       +
           maintainers = with lib.maintainers; [ doronbehar bryango ];

     

       55
       55
       +
         };

     

       56
       56
       +
       }

-1

pkgs/top-level/aliases.nix

···

       156
       156
        
         claws-mail-gtk3 = claws-mail; # Added 2021-07-10

     

       157
       157
        
         clucene_core_1 = throw "'clucene_core_1' has been renamed to/replaced by 'clucene_core'"; # Added 2023-12-09

     

       158
       158
        
         cntk = throw "'cntk' has been removed from nixpkgs, as it was broken and unmaintained"; # Added 2023-10-09

     

       159
       159
       -
         code-server = throw "'code-server' has been removed from nixpkgs, as it was depending on EOL Node.js and is unmaintained."; # Added 2023-10-30

     

       160
       159
        
         codimd = hedgedoc; # Added 2020-11-29

     

       161
       160
        
         inherit (libsForQt5.mauiPackages) communicator; # added 2022-05-17

     

       162
       161
        
         compton = throw "'compton' has been renamed to/replaced by 'picom'"; # Converted to throw 2023-09-10

+13 -4

pkgs/top-level/all-packages.nix

···

       6710
       6710
        
       

     

       6711
       6711
        
         biber = callPackage ../tools/typesetting/biber { };

     

       6712
       6712
        
       

     

       6713
       6713
       +
         biber-for-tectonic = callPackage ../tools/typesetting/tectonic/biber.nix { };

     

       6714
       6714
       +
       

     

       6713
       6715
        
         biber-ms = callPackage ../tools/typesetting/biber-ms { };

     

       6714
       6716
        
       

     

       6715
       6717
        
         biblatex-check = callPackage ../tools/typesetting/biblatex-check { };

     
···

       25359
       25361
        
       

     

       25360
       25362
        
         tecla = callPackage ../development/libraries/tecla { };

     

       25361
       25363
        
       

     

       25362
       25362
       -
         tectonic = callPackage ../tools/typesetting/tectonic {

     

       25364
       25364
       +
         tectonic = callPackage ../tools/typesetting/tectonic/wrapper.nix { };

     

       25365
       25365
       +
       

     

       25366
       25366
       +
         tectonic-unwrapped = callPackage ../tools/typesetting/tectonic {

     

       25363
       25367
        
           harfbuzz = harfbuzzFull;

     

       25364
       25368
        
         };

     

       25365
       25369
        
       

     
···

       35702
       35706
        
       

     

       35703
       35707
        
         taizen = callPackage ../applications/misc/taizen { };

     

       35704
       35708
        
       

     

       35705
       35705
       -
         talosctl = callPackage ../applications/networking/cluster/talosctl {

     

       35706
       35706
       -
           buildGoModule = buildGo120Module;

     

       35707
       35707
       -
         };

     

       35709
       35709
       +
         talosctl = callPackage ../applications/networking/cluster/talosctl { };

     

       35708
       35710
        
       

     

       35709
       35711
        
         talentedhack = callPackage ../applications/audio/talentedhack { };

     

       35710
       35712
        
       

     
···

       36372
       36374
        
         openvscode-server = callPackage ../servers/openvscode-server {

     

       36373
       36375
        
           nodejs = nodejs_18;

     

       36374
       36376
        
           inherit (darwin.apple_sdk.frameworks) AppKit Cocoa Security;

     

       36377
       36377
       +
           inherit (darwin) cctools;

     

       36378
       36378
       +
           inherit (nodePackages) node-gyp;

     

       36379
       36379
       +
         };

     

       36380
       36380
       +
       

     

       36381
       36381
       +
         code-server = callPackage ../servers/code-server {

     

       36382
       36382
       +
           nodejs = nodejs_18;

     

       36383
       36383
       +
           inherit (darwin.apple_sdk.frameworks) AppKit Cocoa CoreServices Security;

     

       36375
       36384
        
           inherit (darwin) cctools;

     

       36376
       36385
        
           inherit (nodePackages) node-gyp;

     

       36377
       36386
        
         };

+1 -9

pkgs/top-level/packages-config.nix

···

       12
       12
        
             fdbPackages

     

       13
       13
        
             fusePackages

     

       14
       14
        
             gns3Packages

     

       15
       15
       +
             haskellPackages

     

       15
       16
        
             idrisPackages

     

       16
       17
        
             nodePackages

     

       17
       18
        
             nodePackages_latest

     
···

       28
       29
        
             zabbix60

     

       29
       30
        
             zeroadPackages

     

       30
       31
        
           ;

     

       31
       31
       -
       

     

       32
       32
       -
           haskellPackages = super.haskellPackages // {

     

       33
       33
       -
             # mesos, which this depends on, has been removed from nixpkgs. We are keeping

     

       34
       34
       -
             # the error message for now, so users will get an error message they can make

     

       35
       35
       -
             # sense of, but need to work around it here.

     

       36
       36
       -
             # TODO(@sternenseemann): remove this after branch-off of 22.05, along with the

     

       37
       37
       -
             # override in configuration-nix.nix

     

       38
       38
       -
             hs-mesos = null;

     

       39
       39
       -
           };

     

       40
       32
        
       

     

       41
       33
        
           # Make sure haskell.compiler is included, so alternative GHC versions show up,

     

       42
       34
        
           # but don't add haskell.packages.* since they contain the same packages (at