commit dd424ee92c1c5c76ffe3896d26cdf687e7fbb09a · pyrox.dev/nixpkgs

+6 -6

doc/README.md

···

       106
       106
        
       

     

       107
       107
        
       The following are supported:

     

       108
       108
        
       

     

       109
       109
       -
       - [`caution`](https://tdg.docbook.org/tdg/5.0/caution.html)

     

       110
       110
       -
       - [`important`](https://tdg.docbook.org/tdg/5.0/important.html)

     

       111
       111
       -
       - [`note`](https://tdg.docbook.org/tdg/5.0/note.html)

     

       112
       112
       -
       - [`tip`](https://tdg.docbook.org/tdg/5.0/tip.html)

     

       113
       113
       -
       - [`warning`](https://tdg.docbook.org/tdg/5.0/warning.html)

     

       114
       114
       -
       - [`example`](https://tdg.docbook.org/tdg/5.0/example.html)

     

       109
       109
       +
       - `caution`

     

       110
       110
       +
       - `important`

     

       111
       111
       +
       - `note`

     

       112
       112
       +
       - `tip`

     

       113
       113
       +
       - `warning`

     

       114
       114
       +
       - `example`

     

       115
       115
        
       

     

       116
       116
        
       Example admonitions require a title to work.

     

       117
       117
        
       If you don't provide one, the manual won't be built.

+12 -17

doc/using/configuration.chapter.md

···

       1
       1
        
       # Global configuration {#chap-packageconfig}

     

       2
       2
        
       

     

       3
       3
       -
       Nix comes with certain defaults about what packages can and cannot be installed, based on a package's metadata. By default, Nix will prevent installation if any of the following criteria are true:

     

       3
       3
       +
       Nix comes with certain defaults about which packages can and cannot be installed, based on a package's metadata.

     

       4
       4
       +
       By default, Nix will prevent installation if any of the following criteria are true:

     

       4
       5
        
       

     

       5
       6
        
       -   The package is thought to be broken, and has had its `meta.broken` set to `true`.

     

       6
       7
        
       

     
···

       10
       11
        
       

     

       11
       12
        
       -   The package has known security vulnerabilities but has not or can not be updated for some reason, and a list of issues has been entered in to the package's `meta.knownVulnerabilities`.

     

       12
       13
        
       

     

       13
       13
       -
       Note that all this is checked during evaluation already, and the check includes any package that is evaluated. In particular, all build-time dependencies are checked. `nix-env -qa` will (attempt to) hide any packages that would be refused.

     

       14
       14
       +
       Each of these criteria can be altered in the Nixpkgs configuration.

     

       14
       15
        
       

     

       15
       15
       -
       Each of these criteria can be altered in the nixpkgs configuration.

     

       16
       16
       +
       :::{.note}

     

       17
       17
       +
       All this is checked during evaluation already, and the check includes any package that is evaluated.

     

       18
       18
       +
       In particular, all build-time dependencies are checked.

     

       19
       19
       +
       :::

     

       16
       20
        
       

     

       17
       17
       -
       The nixpkgs configuration for a NixOS system is set in the `configuration.nix`, as in the following example:

     

       18
       18
       -
       

     

       19
       19
       -
       ```nix

     

       20
       20
       -
       {

     

       21
       21
       -
         nixpkgs.config = {

     

       22
       22
       -
           allowUnfree = true;

     

       23
       23
       -
         };

     

       24
       24
       -
       }

     

       25
       25
       -
       ```

     

       26
       26
       -
       

     

       27
       27
       -
       However, this does not allow unfree software for individual users. Their configurations are managed separately.

     

       28
       28
       -
       

     

       29
       29
       -
       A user's nixpkgs configuration is stored in a user-specific configuration file located at `~/.config/nixpkgs/config.nix`. For example:

     

       21
       21
       +
       A user's Nixpkgs configuration is stored in a user-specific configuration file located at `~/.config/nixpkgs/config.nix`. For example:

     

       30
       22
        
       

     

       31
       23
        
       ```nix

     

       32
       24
        
       {

     
···

       34
       26
        
       }

     

       35
       27
        
       ```

     

       36
       28
        
       

     

       37
       37
       -
       Note that we are not able to test or build unfree software on Hydra due to policy. Most unfree licenses prohibit us from either executing or distributing the software.

     

       29
       29
       +
       :::{.caution}

     

       30
       30
       +
       Unfree software is not tested or built in Nixpkgs continuous integration, and therefore not cached.

     

       31
       31
       +
       Most unfree licenses prohibit either executing or distributing the software.

     

       32
       32
       +
       :::

     

       38
       33
        
       

     

       39
       34
        
       ## Installing broken packages {#sec-allow-broken}

     

       40
       35

+6

maintainers/maintainer-list.nix

···

       10523
       10523
        
           githubId = 845652;

     

       10524
       10524
        
           name = "Kier Davis";

     

       10525
       10525
        
         };

     

       10526
       10526
       +
         kiike = {

     

       10527
       10527
       +
           email = "me@enric.me";

     

       10528
       10528
       +
           github = "kiike";

     

       10529
       10529
       +
           githubId = 464625;

     

       10530
       10530
       +
           name = "Enric Morales";

     

       10531
       10531
       +
         };

     

       10526
       10532
        
         kilianar = {

     

       10527
       10533
        
           email = "mail@kilianar.de";

     

       10528
       10534
        
           github = "kilianar";

+26 -4

nixos/doc/manual/configuration/customizing-packages.section.md

···

       1
       1
        
       # Customising Packages {#sec-customising-packages}

     

       2
       2
        
       

     

       3
       3
       -
       Some packages in Nixpkgs have options to enable or disable optional

     

       4
       4
       -
       functionality or change other aspects of the package.

     

       3
       3
       +
       The Nixpkgs configuration for a NixOS system is set by the {option}`nixpkgs.config` option.

     

       4
       4
       +
       

     

       5
       5
       +
       ::::{.example}

     

       6
       6
       +
       # Globally allow unfree packages

     

       7
       7
       +
       

     

       8
       8
       +
       ```nix

     

       9
       9
       +
       {

     

       10
       10
       +
         nixpkgs.config = {

     

       11
       11
       +
           allowUnfree = true;

     

       12
       12
       +
         };

     

       13
       13
       +
       }

     

       14
       14
       +
       ```

     

       15
       15
       +
       

     

       16
       16
       +
       :::{.note}

     

       17
       17
       +
       This only allows unfree software in the given NixOS configuration.

     

       18
       18
       +
       For users invoking Nix commands such as [`nix-build`](https://nixos.org/manual/nix/stable/command-ref/nix-build), Nixpkgs is configured independently.

     

       19
       19
       +
       See the [Nixpkgs manual section on global configuration](https://nixos.org/manual/nixpkgs/unstable/#chap-packageconfig) for details.

     

       20
       20
       +
       :::

     

       21
       21
       +
       ::::

     

       22
       22
       +
       

     

       23
       23
       +
       <!-- TODO(@fricklerhandwerk)

     

       24
       24
       +
       all of the following should go to the Nixpkgs manual, it has nothing to do with NixOS

     

       25
       25
       +
       -->

     

       26
       26
       +
       

     

       27
       27
       +
       Some packages in Nixpkgs have options to enable or disable optional functionality, or change other aspects of the package.

     

       5
       28
        
       

     

       6
       29
        
       ::: {.warning}

     

       7
       7
       -
       Unfortunately, Nixpkgs currently lacks a way to query available

     

       8
       8
       -
       configuration options.

     

       30
       30
       +
       Unfortunately, Nixpkgs currently lacks a way to query available package configuration options.

     

       9
       31
        
       :::

     

       10
       32
        
       

     

       11
       33
        
       ::: {.note}

+1 -1

nixos/modules/services/networking/knot.nix

···

       226
       226
        
             };

     

       227
       227
        
       

     

       228
       228
        
             settings = mkOption {

     

       229
       229
       -
               type = types.attrs;

     

       229
       229
       +
               type = types.submodule { freeformType = types.attrs; };

     

       230
       230
        
               default = {};

     

       231
       231
        
               description = ''

     

       232
       232
        
                 Extra configuration as nix values.

+2 -2

pkgs/applications/editors/android-studio/default.nix

···

       18
       18
        
           sha256Hash = "sha256-zROBKzQiP4V2P67HgOIkHgn8q/M0zy5MkZozVSiQsWU=";

     

       19
       19
        
         };

     

       20
       20
        
         latestVersion = {

     

       21
       21
       -
           version = "2024.1.1.3"; # "Android Studio Koala | 2024.1.1 Canary 5"

     

       22
       22
       -
           sha256Hash = "sha256-JL2cloR0RhSnr8e62fHhxIzF286fT9sahTuv2OoQVRY=";

     

       21
       21
       +
           version = "2024.1.1.4"; # "Android Studio Koala | 2024.1.1 Canary 6"

     

       22
       22
       +
           sha256Hash = "sha256-lfig7lFyF7XZowTQKpo6zGeR23VHq/f7vvUDWCs7jeo=";

     

       23
       23
        
         };

     

       24
       24
        
       in {

     

       25
       25
        
         # Attributes are named by their corresponding release channels

+1 -1

pkgs/applications/editors/neovim/neovide/default.nix

···

       113
       113
        
           homepage = "https://github.com/neovide/neovide";

     

       114
       114
        
           changelog = "https://github.com/neovide/neovide/releases/tag/${version}";

     

       115
       115
        
           license = with licenses; [ mit ];

     

       116
       116
       -
           maintainers = with maintainers; [ ck3d multisn8 ];

     

       116
       116
       +
           maintainers = with maintainers; [ ck3d ];

     

       117
       117
        
           platforms = platforms.all;

     

       118
       118
        
         };

     

       119
       119
        
       }

+148

pkgs/applications/misc/inochi2d/creator-dub-lock.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "dependencies": {

     

       3
       3
       +
           "bcaa": {

     

       4
       4
       +
             "version": "0.0.8",

     

       5
       5
       +
             "sha256": "1v8qy98hjdgfsdx6zg9n09sfpfqsh57nbsn8phw82rssi0gysgsr"

     

       6
       6
       +
           },

     

       7
       7
       +
           "bindbc-loader": {

     

       8
       8
       +
             "version": "1.0.3",

     

       9
       9
       +
             "sha256": "0d688cwb2hjhfxc7l00cfh22prybsndk6j1hvlrf9nlzb46i4i1j"

     

       10
       10
       +
           },

     

       11
       11
       +
           "bindbc-sdl": {

     

       12
       12
       +
             "version": "1.1.3",

     

       13
       13
       +
             "sha256": "0yi472nv7pg1q1kk749w3mv1l2l6ch20k8kcc4l9jy3m2vwlpd88"

     

       14
       14
       +
           },

     

       15
       15
       +
           "dcv": {

     

       16
       16
       +
             "version": "0.3.0",

     

       17
       17
       +
             "sha256": "02fd7wig6i618r7l7alw0hfljbwjvq13fkyhwcpsdd7r5x2f7hyk"

     

       18
       18
       +
           },

     

       19
       19
       +
           "ddbus": {

     

       20
       20
       +
             "version": "3.0.0-beta.2",

     

       21
       21
       +
             "sha256": "01dgvlvwbhwz7822gp6z5xn6w3k51q09i6qzns2i4ixmjh45wscs"

     

       22
       22
       +
           },

     

       23
       23
       +
           "diet-ng": {

     

       24
       24
       +
             "version": "1.8.1",

     

       25
       25
       +
             "sha256": "0kh8haw712xkd3f07s5x5g12nmmkv0y1lk2cqh66298fc5mgj4sv"

     

       26
       26
       +
           },

     

       27
       27
       +
           "dportals": {

     

       28
       28
       +
             "version": "0.1.0",

     

       29
       29
       +
             "sha256": "11wxlp2y7s2mc98bxya7fmg0gc4yqlyg0bjsd1yxzr8fmsvf2zzh"

     

       30
       30
       +
           },

     

       31
       31
       +
           "dunit": {

     

       32
       32
       +
             "version": "1.0.16",

     

       33
       33
       +
             "sha256": "0p9g4h5qanbg6281x1068mdl5p7zvqig4zmmi72a2cay6dxnbvxb"

     

       34
       34
       +
           },

     

       35
       35
       +
           "dxml": {

     

       36
       36
       +
             "version": "0.4.4",

     

       37
       37
       +
             "sha256": "0p5vmkw29ksh5wdxz1ijms1wblq288pv15vnbl93z7q2vgnq995w"

     

       38
       38
       +
           },

     

       39
       39
       +
           "eventcore": {

     

       40
       40
       +
             "version": "0.9.29",

     

       41
       41
       +
             "sha256": "1993mibxqb4v7lbsq3kbfwxfpi0d1gzzmzvx6y01907aqz933isa"

     

       42
       42
       +
           },

     

       43
       43
       +
           "facetrack-d": {

     

       44
       44
       +
             "version": "0.7.8",

     

       45
       45
       +
             "sha256": "1414wvh0kn1rps5r16ir92sqfj8a7na1gd71ds81jkq8arkm17j0"

     

       46
       46
       +
           },

     

       47
       47
       +
           "fghj": {

     

       48
       48
       +
             "version": "1.0.2",

     

       49
       49
       +
             "sha256": "0c102pfbcb3kpr8hpq3qzlxfw460v202vg6hrfdzw5a8pygy4cxj"

     

       50
       50
       +
           },

     

       51
       51
       +
           "i18n-d": {

     

       52
       52
       +
             "version": "1.0.2",

     

       53
       53
       +
             "sha256": "1p33w5wh09ha132fsk0b37rjgzw6z3l0v64dixmkvnhhm1xy3b1g"

     

       54
       54
       +
           },

     

       55
       55
       +
           "i2d-imgui": {

     

       56
       56
       +
             "version": "0.8.0",

     

       57
       57
       +
             "sha256": "1xikjz5b9r4gml0j7z5k8x1n8h9qcixzsg8gpjlzr3dwis7m0cfw"

     

       58
       58
       +
           },

     

       59
       59
       +
           "i2d-opengl": {

     

       60
       60
       +
             "version": "1.0.0",

     

       61
       61
       +
             "sha256": "0137ifda4z6h7sa7ls9n3rpcd6344qsfpbcc0dl7wzyk0xa73912"

     

       62
       62
       +
           },

     

       63
       63
       +
           "imagefmt": {

     

       64
       64
       +
             "version": "2.1.2",

     

       65
       65
       +
             "sha256": "0dl7n4myxp1s3b32v2s975k76gs90wr2nw6ac5jq9hsgzhp1ix0h"

     

       66
       66
       +
           },

     

       67
       67
       +
           "inmath": {

     

       68
       68
       +
             "version": "1.0.6",

     

       69
       69
       +
             "sha256": "0kzk55ilbnl6qypjk60zwd5ibys5n47128hbbr0mbc7bpj9ppfg4"

     

       70
       70
       +
           },

     

       71
       71
       +
           "inochi2d": {

     

       72
       72
       +
             "version": "0.8.3",

     

       73
       73
       +
             "sha256": "1m9dalm6sb518yi9mbphq1fdax90fc5rmskah19l7slnplbhli4l"

     

       74
       74
       +
           },

     

       75
       75
       +
           "kra-d": {

     

       76
       76
       +
             "version": "0.5.5",

     

       77
       77
       +
             "sha256": "0dffmf084ykz19y084v936r3f74613d0jifj0wb3xibfcq9mwxqz"

     

       78
       78
       +
           },

     

       79
       79
       +
           "libasync": {

     

       80
       80
       +
             "version": "0.8.6",

     

       81
       81
       +
             "sha256": "0hhk5asfdccby8ky77a25qn7dfmfdmwyzkrg3zk064bicmgdwlnj"

     

       82
       82
       +
           },

     

       83
       83
       +
           "memutils": {

     

       84
       84
       +
             "version": "1.0.10",

     

       85
       85
       +
             "sha256": "0hm31birbw59sw1bi9syjhbcdgwwwyyx6r9jg7ar9i6a74cjr52c"

     

       86
       86
       +
           },

     

       87
       87
       +
           "mir-algorithm": {

     

       88
       88
       +
             "version": "3.22.0",

     

       89
       89
       +
             "sha256": "0pl1vwyyhr2hrxlj060khzhg33dkgyrzi3f5qqxz6xj3hcp7axxq"

     

       90
       90
       +
           },

     

       91
       91
       +
           "mir-core": {

     

       92
       92
       +
             "version": "1.7.0",

     

       93
       93
       +
             "sha256": "14k7y2r06pwzf29shymyjrk7l582bh181rc07bnwgjn3f84ayn62"

     

       94
       94
       +
           },

     

       95
       95
       +
           "mir-linux-kernel": {

     

       96
       96
       +
             "version": "1.0.1",

     

       97
       97
       +
             "sha256": "0adyjpcgd65z44iydnrrrpjwbvmrm08a3pkcriqi7npqylfysqn6"

     

       98
       98
       +
           },

     

       99
       99
       +
           "mir-random": {

     

       100
       100
       +
             "version": "2.2.19",

     

       101
       101
       +
             "sha256": "0ad9ahvyrv5h38aqwn3zvlrva3ikfq28dfhpg2lwwgm31ymzvqpb"

     

       102
       102
       +
           },

     

       103
       103
       +
           "openssl": {

     

       104
       104
       +
             "version": "3.3.3",

     

       105
       105
       +
             "sha256": "1fwhd5fkvgbqf3y8gwmrnd42kzi4k3mibpxijw5j82jxgfp1rzsf"

     

       106
       106
       +
           },

     

       107
       107
       +
           "openssl-static": {

     

       108
       108
       +
             "version": "1.0.3+3.0.8",

     

       109
       109
       +
             "sha256": "1z977ghlnczxky2q2gislfi68jnbp2zf4pifv8rzrcs0nx3va2jr"

     

       110
       110
       +
           },

     

       111
       111
       +
           "psd-d": {

     

       112
       112
       +
             "version": "0.6.3",

     

       113
       113
       +
             "sha256": "0qbwkvzgrvd6m67p14ari4iiajmhfi2x1id4da971qxiprfm1993"

     

       114
       114
       +
           },

     

       115
       115
       +
           "silly": {

     

       116
       116
       +
             "version": "1.1.1",

     

       117
       117
       +
             "sha256": "1l0mpnbz8h3ihjxvk5qwn6p6lwb75g259k7fjqasw0zp0c27bkjb"

     

       118
       118
       +
           },

     

       119
       119
       +
           "stdx-allocator": {

     

       120
       120
       +
             "version": "2.77.5",

     

       121
       121
       +
             "sha256": "1g8382wr49sjyar0jay8j7y2if7h1i87dhapkgxphnizp24d7kaj"

     

       122
       122
       +
           },

     

       123
       123
       +
           "taggedalgebraic": {

     

       124
       124
       +
             "version": "0.11.22",

     

       125
       125
       +
             "sha256": "1kc39sdnk2ybhrwxiwyw1mqcw0qzjr0vr54yvyp3gkkaad373k4r"

     

       126
       126
       +
           },

     

       127
       127
       +
           "tinyfiledialogs": {

     

       128
       128
       +
             "version": "0.10.1",

     

       129
       129
       +
             "sha256": "1k3gq9y7912x5b30h60nvlfdr61as1f187b8rsilkxliizcmbhfi"

     

       130
       130
       +
           },

     

       131
       131
       +
           "vibe-container": {

     

       132
       132
       +
             "version": "1.3.0",

     

       133
       133
       +
             "sha256": "02gdw7ma93fdvgx3fngmfjd074jh2rzm9qsxakr3zn81p6qnzair"

     

       134
       134
       +
           },

     

       135
       135
       +
           "vibe-core": {

     

       136
       136
       +
             "version": "2.8.2",

     

       137
       137
       +
             "sha256": "1g9l8hmjx4dzzwh7pqasc9s16zzbdfvciswbv0gnrvmjsb0pi9xr"

     

       138
       138
       +
           },

     

       139
       139
       +
           "vibe-d": {

     

       140
       140
       +
             "version": "0.9.8",

     

       141
       141
       +
             "sha256": "1gficgfzwswaxj9qlnca28c65gl7xq6q8y47qlf4m1gvkxj4ij2k"

     

       142
       142
       +
           },

     

       143
       143
       +
           "vmc-d": {

     

       144
       144
       +
             "version": "1.1.3",

     

       145
       145
       +
             "sha256": "0kkqihhzxdq0n46jk55g4yhhwrnw6b9d931yb5pblxcc342gckvm"

     

       146
       146
       +
           }

     

       147
       147
       +
         }

     

       148
       148
       +
       }

+81

pkgs/applications/misc/inochi2d/default.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         stdenv,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         substituteAll,

     

       6
       6
       +
         callPackage,

     

       7
       7
       +
       }:

     

       8
       8
       +
       

     

       9
       9
       +
       # Note for maintainers:

     

       10
       10
       +
       #

     

       11
       11
       +
       # These packages are only allowed to be packaged under the the condition that we

     

       12
       12
       +
       # - patch source/creator/config.d to not point to upstream's bug tracker

     

       13
       13
       +
       # - use the "barebones" configuration to remove the mascot and logo from the build

     

       14
       14
       +
       #

     

       15
       15
       +
       # We have received permission by the owner to go ahead with the packaging, as we have met all the criteria

     

       16
       16
       +
       # https://github.com/NixOS/nixpkgs/pull/288841#issuecomment-1950247467

     

       17
       17
       +
       

     

       18
       18
       +
       let

     

       19
       19
       +
         mkGeneric = builderArgs: callPackage ./generic.nix { inherit builderArgs; };

     

       20
       20
       +
       in

     

       21
       21
       +
       {

     

       22
       22
       +
         inochi-creator = mkGeneric rec {

     

       23
       23
       +
           pname = "inochi-creator";

     

       24
       24
       +
           appname = "Inochi Creator";

     

       25
       25
       +
           version = "0.8.4";

     

       26
       26
       +
       

     

       27
       27
       +
           src = fetchFromGitHub {

     

       28
       28
       +
             owner = "Inochi2D";

     

       29
       29
       +
             repo = "inochi-creator";

     

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

     

       31
       31
       +
             hash = "sha256-wsB9KIZyot2Y+6QpQlIXRzv3cPCdwp2Q/ZfDizAKJc4=";

     

       32
       32
       +
           };

     

       33
       33
       +
       

     

       34
       34
       +
           dubLock = ./creator-dub-lock.json;

     

       35
       35
       +
       

     

       36
       36
       +
           patches = [

     

       37
       37
       +
             # Upstream asks that we change the bug tracker URL to not point to the upsteam bug tracker

     

       38
       38
       +
             (substituteAll {

     

       39
       39
       +
               src = ./support-url.patch;

     

       40
       40
       +
               assignees = "TomaSajt"; # should be a comma separated list of the github usernames of the maintainers

     

       41
       41
       +
             })

     

       42
       42
       +
             # Change how duplicate locales differentiate themselves (the store paths were too long)

     

       43
       43
       +
             ./translations.patch

     

       44
       44
       +
           ];

     

       45
       45
       +
       

     

       46
       46
       +
           meta = {

     

       47
       47
       +
             # darwin has slightly different build steps

     

       48
       48
       +
             broken = stdenv.isDarwin;

     

       49
       49
       +
             changelog = "https://github.com/Inochi2D/inochi-creator/releases/tag/${src.rev}";

     

       50
       50
       +
             description = "An open source editor for the Inochi2D puppet format";

     

       51
       51
       +
           };

     

       52
       52
       +
         };

     

       53
       53
       +
       

     

       54
       54
       +
         inochi-session = mkGeneric rec {

     

       55
       55
       +
           pname = "inochi-session";

     

       56
       56
       +
           appname = "Inochi Session";

     

       57
       57
       +
           version = "0.8.3";

     

       58
       58
       +
       

     

       59
       59
       +
           src = fetchFromGitHub {

     

       60
       60
       +
             owner = "Inochi2D";

     

       61
       61
       +
             repo = "inochi-session";

     

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

     

       63
       63
       +
             hash = "sha256-yq/uMWEeydZun07/7hgUaAw3IruRqrDuGgbe5NzNYxw=";

     

       64
       64
       +
           };

     

       65
       65
       +
       

     

       66
       66
       +
           dubLock = ./session-dub-lock.json;

     

       67
       67
       +
       

     

       68
       68
       +
           preFixup = ''

     

       69
       69
       +
             patchelf $out/share/inochi-session/inochi-session --add-needed cimgui.so

     

       70
       70
       +
           '';

     

       71
       71
       +
       

     

       72
       72
       +
           dontStrip = true; # symbol lookup error: undefined symbol: , version

     

       73
       73
       +
       

     

       74
       74
       +
           meta = {

     

       75
       75
       +
             # darwin has slightly different build steps, aarch fails to build because of some lua related error

     

       76
       76
       +
             broken = stdenv.isDarwin || stdenv.isAarch64;

     

       77
       77
       +
             changelog = "https://github.com/Inochi2D/inochi-session/releases/tag/${src.rev}";

     

       78
       78
       +
             description = "An application that allows streaming with Inochi2D puppets";

     

       79
       79
       +
           };

     

       80
       80
       +
         };

     

       81
       81
       +
       }

+139

pkgs/applications/misc/inochi2d/generic.nix

···

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         buildDubPackage,

     

       4
       4
       +
         fetchFromGitHub,

     

       5
       5
       +
         writeShellScriptBin,

     

       6
       6
       +
       

     

       7
       7
       +
         cmake,

     

       8
       8
       +
         gettext,

     

       9
       9
       +
         copyDesktopItems,

     

       10
       10
       +
         makeDesktopItem,

     

       11
       11
       +
         makeWrapper,

     

       12
       12
       +
       

     

       13
       13
       +
         dbus,

     

       14
       14
       +
         freetype,

     

       15
       15
       +
         SDL2,

     

       16
       16
       +
         gnome,

     

       17
       17
       +
       

     

       18
       18
       +
         builderArgs,

     

       19
       19
       +
       }:

     

       20
       20
       +
       

     

       21
       21
       +
       let

     

       22
       22
       +
         cimgui-src = fetchFromGitHub {

     

       23
       23
       +
           owner = "Inochi2D";

     

       24
       24
       +
           repo = "cimgui";

     

       25
       25
       +
           rev = "49bb5ce65f7d5eeab7861d8ffd5aa2a58ca8f08c";

     

       26
       26
       +
           hash = "sha256-XcnZbIjwq7vmYBnMAs+cEpJL8HB8wrL098FXGxC+diA=";

     

       27
       27
       +
           fetchSubmodules = true;

     

       28
       28
       +
         };

     

       29
       29
       +
       

     

       30
       30
       +
         inherit (builderArgs)

     

       31
       31
       +
           pname

     

       32
       32
       +
           appname

     

       33
       33
       +
           version

     

       34
       34
       +
           dubLock

     

       35
       35
       +
           meta

     

       36
       36
       +
           ;

     

       37
       37
       +
       in

     

       38
       38
       +
       buildDubPackage (

     

       39
       39
       +
         builderArgs

     

       40
       40
       +
         // {

     

       41
       41
       +
           nativeBuildInputs = [

     

       42
       42
       +
             cmake # used for building `i2d-imgui`

     

       43
       43
       +
             gettext # used when generating translations

     

       44
       44
       +
             copyDesktopItems

     

       45
       45
       +
             makeWrapper

     

       46
       46
       +
       

     

       47
       47
       +
             # A fake git implementation to be used by the `gitver` package

     

       48
       48
       +
             # It is a dependency of the main packages and the `inochi2d` dub dependency

     

       49
       49
       +
             # A side effect of this script is that `inochi2d` will have the same version listed as the main package

     

       50
       50
       +
             (writeShellScriptBin "git" "echo v${version}")

     

       51
       51
       +
           ];

     

       52
       52
       +
       

     

       53
       53
       +
           buildInputs = [

     

       54
       54
       +
             dbus

     

       55
       55
       +
             freetype

     

       56
       56
       +
             SDL2

     

       57
       57
       +
           ];

     

       58
       58
       +
       

     

       59
       59
       +
           dontUseCmakeConfigure = true;

     

       60
       60
       +
       

     

       61
       61
       +
           # these deps are not listed inside `dub.sdl`, so they didn't get auto-generated

     

       62
       62
       +
           # these are used for generating version info when building

     

       63
       63
       +
           dubLock = lib.recursiveUpdate (lib.importJSON dubLock) {

     

       64
       64
       +
             dependencies = {

     

       65
       65
       +
               gitver = {

     

       66
       66
       +
                 version = "1.6.1";

     

       67
       67
       +
                 sha256 = "sha256-NCyFik4FbD7yMLd5zwf/w4cHwhzLhIRSVw1bWo/CZB4=";

     

       68
       68
       +
               };

     

       69
       69
       +
               semver = {

     

       70
       70
       +
                 version = "0.3.2";

     

       71
       71
       +
                 sha256 = "sha256-l6c9hniUd5xNsJepq8x30e0JTjmXs4pYUmv4ws+Nrn4=";

     

       72
       72
       +
               };

     

       73
       73
       +
             };

     

       74
       74
       +
           };

     

       75
       75
       +
       

     

       76
       76
       +
           postConfigure = ''

     

       77
       77
       +
             cimgui_dir=("$DUB_HOME"/packages/i2d-imgui/*/i2d-imgui)

     

       78
       78
       +
       

     

       79
       79
       +
             # `i2d-imgui` isn't able to find SDL2 by default due to it being written in lower case

     

       80
       80
       +
             # this is only an issue when compiling statically (session)

     

       81
       81
       +
             substituteInPlace "$cimgui_dir/dub.json" \

     

       82
       82
       +
                 --replace-fail '"sdl2"' '"SDL2"'

     

       83
       83
       +
       

     

       84
       84
       +
             # The `i2d-cimgui` dub dependency fetched inside the auto-generated `*-deps.nix` file

     

       85
       85
       +
             # which doesn't know that it's actually a git repo, so it doesn't fetch its submodules.

     

       86
       86
       +
             # Upstream uses a cmake script to fetch the `cimgui` submodule anyway, which we can't do

     

       87
       87
       +
             # We get around this by manually pre-fetching the submodule and copying it into the right place

     

       88
       88
       +
             cp -r --no-preserve=all ${cimgui-src}/* "$cimgui_dir/deps/cimgui"

     

       89
       89
       +
       

     

       90
       90
       +
             # Disable the original cmake fetcher script

     

       91
       91
       +
             substituteInPlace "$cimgui_dir/deps/CMakeLists.txt" \

     

       92
       92
       +
                 --replace-fail "PullSubmodules(" "# PullSubmodules(" \

     

       93
       93
       +
                 --replace-fail  "\''${cimgui_SUBMOD_DIR}" "cimgui"

     

       94
       94
       +
           '';

     

       95
       95
       +
       

     

       96
       96
       +
           preBuild = ''

     

       97
       97
       +
             # Generate translations (if possible)

     

       98
       98
       +
             . gentl.sh

     

       99
       99
       +
       

     

       100
       100
       +
             # Use the fake git to generate version info

     

       101
       101
       +
             dub build --skip-registry=all --compiler=ldc2 --build=release --config=meta

     

       102
       102
       +
           '';

     

       103
       103
       +
       

     

       104
       104
       +
           # Use the "barebones" configuration so that we don't include the mascot and icon files in out build

     

       105
       105
       +
           dubFlags = [ "--config=barebones" ];

     

       106
       106
       +
       

     

       107
       107
       +
           installPhase = ''

     

       108
       108
       +
             runHook preInstall

     

       109
       109
       +
       

     

       110
       110
       +
             mkdir -p $out/share/${pname}

     

       111
       111
       +
             cp -r out/* $out/share/${pname}

     

       112
       112
       +
       

     

       113
       113
       +
             runHook postInstall

     

       114
       114
       +
           '';

     

       115
       115
       +
       

     

       116
       116
       +
           desktopItems = [

     

       117
       117
       +
             (makeDesktopItem {

     

       118
       118
       +
               name = pname;

     

       119
       119
       +
               desktopName = appname;

     

       120
       120
       +
               exec = pname;

     

       121
       121
       +
               comment = meta.description;

     

       122
       122
       +
               categories = [ "Utility" ];

     

       123
       123
       +
             })

     

       124
       124
       +
           ];

     

       125
       125
       +
       

     

       126
       126
       +
           postFixup = ''

     

       127
       127
       +
             # Add support for `open file` dialog

     

       128
       128
       +
             makeWrapper $out/share/${pname}/${pname} $out/bin/${pname} \

     

       129
       129
       +
                 --prefix PATH : ${lib.makeBinPath [ gnome.zenity ]}

     

       130
       130
       +
           '';

     

       131
       131
       +
       

     

       132
       132
       +
           meta = {

     

       133
       133
       +
             homepage = "https://inochi2d.com/";

     

       134
       134
       +
             license = lib.licenses.bsd2;

     

       135
       135
       +
             mainProgram = pname;

     

       136
       136
       +
             maintainers = with lib.maintainers; [ tomasajt ];

     

       137
       137
       +
           } // meta;

     

       138
       138
       +
         }

     

       139
       139
       +
       )

+140

pkgs/applications/misc/inochi2d/session-dub-lock.json

···

       1
       1
       +
       {

     

       2
       2
       +
         "dependencies": {

     

       3
       3
       +
           "bindbc-loader": {

     

       4
       4
       +
             "version": "1.0.3",

     

       5
       5
       +
             "sha256": "0d688cwb2hjhfxc7l00cfh22prybsndk6j1hvlrf9nlzb46i4i1j"

     

       6
       6
       +
           },

     

       7
       7
       +
           "bindbc-lua": {

     

       8
       8
       +
             "version": "0.5.1",

     

       9
       9
       +
             "sha256": "116lcplxxl39x6m2sr9zkszdbrm1pa285sjqijnqxqy99jajnhc7"

     

       10
       10
       +
           },

     

       11
       11
       +
           "bindbc-sdl": {

     

       12
       12
       +
             "version": "1.1.3",

     

       13
       13
       +
             "sha256": "0yi472nv7pg1q1kk749w3mv1l2l6ch20k8kcc4l9jy3m2vwlpd88"

     

       14
       14
       +
           },

     

       15
       15
       +
           "bindbc-spout2": {

     

       16
       16
       +
             "version": "0.1.1",

     

       17
       17
       +
             "sha256": "03r4xsjpwys4nlfhas4hjqygzs764dzsr789b091iczp56pp9w9z"

     

       18
       18
       +
           },

     

       19
       19
       +
           "ddbus": {

     

       20
       20
       +
             "version": "3.0.0-beta.2",

     

       21
       21
       +
             "sha256": "01dgvlvwbhwz7822gp6z5xn6w3k51q09i6qzns2i4ixmjh45wscs"

     

       22
       22
       +
           },

     

       23
       23
       +
           "diet-ng": {

     

       24
       24
       +
             "version": "1.8.1",

     

       25
       25
       +
             "sha256": "0kh8haw712xkd3f07s5x5g12nmmkv0y1lk2cqh66298fc5mgj4sv"

     

       26
       26
       +
           },

     

       27
       27
       +
           "dportals": {

     

       28
       28
       +
             "version": "0.1.0",

     

       29
       29
       +
             "sha256": "11wxlp2y7s2mc98bxya7fmg0gc4yqlyg0bjsd1yxzr8fmsvf2zzh"

     

       30
       30
       +
           },

     

       31
       31
       +
           "dunit": {

     

       32
       32
       +
             "version": "1.0.16",

     

       33
       33
       +
             "sha256": "0p9g4h5qanbg6281x1068mdl5p7zvqig4zmmi72a2cay6dxnbvxb"

     

       34
       34
       +
           },

     

       35
       35
       +
           "eventcore": {

     

       36
       36
       +
             "version": "0.9.29",

     

       37
       37
       +
             "sha256": "1993mibxqb4v7lbsq3kbfwxfpi0d1gzzmzvx6y01907aqz933isa"

     

       38
       38
       +
           },

     

       39
       39
       +
           "facetrack-d": {

     

       40
       40
       +
             "version": "0.7.8",

     

       41
       41
       +
             "sha256": "1414wvh0kn1rps5r16ir92sqfj8a7na1gd71ds81jkq8arkm17j0"

     

       42
       42
       +
           },

     

       43
       43
       +
           "fghj": {

     

       44
       44
       +
             "version": "1.0.2",

     

       45
       45
       +
             "sha256": "0c102pfbcb3kpr8hpq3qzlxfw460v202vg6hrfdzw5a8pygy4cxj"

     

       46
       46
       +
           },

     

       47
       47
       +
           "i18n-d": {

     

       48
       48
       +
             "version": "1.0.2",

     

       49
       49
       +
             "sha256": "1p33w5wh09ha132fsk0b37rjgzw6z3l0v64dixmkvnhhm1xy3b1g"

     

       50
       50
       +
           },

     

       51
       51
       +
           "i2d-imgui": {

     

       52
       52
       +
             "version": "0.8.0",

     

       53
       53
       +
             "sha256": "1xikjz5b9r4gml0j7z5k8x1n8h9qcixzsg8gpjlzr3dwis7m0cfw"

     

       54
       54
       +
           },

     

       55
       55
       +
           "i2d-opengl": {

     

       56
       56
       +
             "version": "1.0.0",

     

       57
       57
       +
             "sha256": "0137ifda4z6h7sa7ls9n3rpcd6344qsfpbcc0dl7wzyk0xa73912"

     

       58
       58
       +
           },

     

       59
       59
       +
           "imagefmt": {

     

       60
       60
       +
             "version": "2.1.2",

     

       61
       61
       +
             "sha256": "0dl7n4myxp1s3b32v2s975k76gs90wr2nw6ac5jq9hsgzhp1ix0h"

     

       62
       62
       +
           },

     

       63
       63
       +
           "inmath": {

     

       64
       64
       +
             "version": "1.0.6",

     

       65
       65
       +
             "sha256": "0kzk55ilbnl6qypjk60zwd5ibys5n47128hbbr0mbc7bpj9ppfg4"

     

       66
       66
       +
           },

     

       67
       67
       +
           "inochi2d": {

     

       68
       68
       +
             "version": "0.8.3",

     

       69
       69
       +
             "sha256": "1m9dalm6sb518yi9mbphq1fdax90fc5rmskah19l7slnplbhli4l"

     

       70
       70
       +
           },

     

       71
       71
       +
           "inui": {

     

       72
       72
       +
             "version": "1.2.1",

     

       73
       73
       +
             "sha256": "0pygf8jxnbvib5f23qxf6k24wz8mh6fc0zhrkp83gq33k02ab5cx"

     

       74
       74
       +
           },

     

       75
       75
       +
           "libasync": {

     

       76
       76
       +
             "version": "0.8.6",

     

       77
       77
       +
             "sha256": "0hhk5asfdccby8ky77a25qn7dfmfdmwyzkrg3zk064bicmgdwlnj"

     

       78
       78
       +
           },

     

       79
       79
       +
           "lumars": {

     

       80
       80
       +
             "version": "1.6.1",

     

       81
       81
       +
             "sha256": "1vzdghqwv2gb41rp75456g43yfsndbl0dy6bnn4x6azwwny22br9"

     

       82
       82
       +
           },

     

       83
       83
       +
           "memutils": {

     

       84
       84
       +
             "version": "1.0.10",

     

       85
       85
       +
             "sha256": "0hm31birbw59sw1bi9syjhbcdgwwwyyx6r9jg7ar9i6a74cjr52c"

     

       86
       86
       +
           },

     

       87
       87
       +
           "mir-algorithm": {

     

       88
       88
       +
             "version": "3.22.0",

     

       89
       89
       +
             "sha256": "0pl1vwyyhr2hrxlj060khzhg33dkgyrzi3f5qqxz6xj3hcp7axxq"

     

       90
       90
       +
           },

     

       91
       91
       +
           "mir-core": {

     

       92
       92
       +
             "version": "1.7.0",

     

       93
       93
       +
             "sha256": "14k7y2r06pwzf29shymyjrk7l582bh181rc07bnwgjn3f84ayn62"

     

       94
       94
       +
           },

     

       95
       95
       +
           "mir-linux-kernel": {

     

       96
       96
       +
             "version": "1.0.1",

     

       97
       97
       +
             "sha256": "0adyjpcgd65z44iydnrrrpjwbvmrm08a3pkcriqi7npqylfysqn6"

     

       98
       98
       +
           },

     

       99
       99
       +
           "openssl": {

     

       100
       100
       +
             "version": "3.3.3",

     

       101
       101
       +
             "sha256": "1fwhd5fkvgbqf3y8gwmrnd42kzi4k3mibpxijw5j82jxgfp1rzsf"

     

       102
       102
       +
           },

     

       103
       103
       +
           "openssl-static": {

     

       104
       104
       +
             "version": "1.0.3+3.0.8",

     

       105
       105
       +
             "sha256": "1z977ghlnczxky2q2gislfi68jnbp2zf4pifv8rzrcs0nx3va2jr"

     

       106
       106
       +
           },

     

       107
       107
       +
           "silly": {

     

       108
       108
       +
             "version": "1.1.1",

     

       109
       109
       +
             "sha256": "1l0mpnbz8h3ihjxvk5qwn6p6lwb75g259k7fjqasw0zp0c27bkjb"

     

       110
       110
       +
           },

     

       111
       111
       +
           "stdx-allocator": {

     

       112
       112
       +
             "version": "2.77.5",

     

       113
       113
       +
             "sha256": "1g8382wr49sjyar0jay8j7y2if7h1i87dhapkgxphnizp24d7kaj"

     

       114
       114
       +
           },

     

       115
       115
       +
           "taggedalgebraic": {

     

       116
       116
       +
             "version": "0.11.22",

     

       117
       117
       +
             "sha256": "1kc39sdnk2ybhrwxiwyw1mqcw0qzjr0vr54yvyp3gkkaad373k4r"

     

       118
       118
       +
           },

     

       119
       119
       +
           "tinyfiledialogs": {

     

       120
       120
       +
             "version": "0.10.1",

     

       121
       121
       +
             "sha256": "1k3gq9y7912x5b30h60nvlfdr61as1f187b8rsilkxliizcmbhfi"

     

       122
       122
       +
           },

     

       123
       123
       +
           "vibe-container": {

     

       124
       124
       +
             "version": "1.3.0",

     

       125
       125
       +
             "sha256": "02gdw7ma93fdvgx3fngmfjd074jh2rzm9qsxakr3zn81p6qnzair"

     

       126
       126
       +
           },

     

       127
       127
       +
           "vibe-core": {

     

       128
       128
       +
             "version": "2.8.2",

     

       129
       129
       +
             "sha256": "1g9l8hmjx4dzzwh7pqasc9s16zzbdfvciswbv0gnrvmjsb0pi9xr"

     

       130
       130
       +
           },

     

       131
       131
       +
           "vibe-d": {

     

       132
       132
       +
             "version": "0.9.8",

     

       133
       133
       +
             "sha256": "1gficgfzwswaxj9qlnca28c65gl7xq6q8y47qlf4m1gvkxj4ij2k"

     

       134
       134
       +
           },

     

       135
       135
       +
           "vmc-d": {

     

       136
       136
       +
             "version": "1.1.3",

     

       137
       137
       +
             "sha256": "0kkqihhzxdq0n46jk55g4yhhwrnw6b9d931yb5pblxcc342gckvm"

     

       138
       138
       +
           }

     

       139
       139
       +
         }

     

       140
       140
       +
       }

+13

pkgs/applications/misc/inochi2d/support-url.patch

···

       1
       1
       +
       diff --git a/source/creator/config.d b/source/creator/config.d

     

       2
       2
       +
       index 4289703..d8dea4e 100644

     

       3
       3
       +
       --- a/source/creator/config.d

     

       4
       4
       +
       +++ b/source/creator/config.d

     

       5
       5
       +
       @@ -30,7 +30,7 @@ enum INC_BANNER_ARTIST_PAGE = "https://mastodon.art/@nighteden";

     

       6
       6
       +
        /**

     

       7
       7
       +
            URI for bug reports, for unofficial builds this SHOULD be changed.

     

       8
       8
       +
        */

     

       9
       9
       +
       -enum INC_BUG_REPORT_URI = "https://github.com/Inochi2D/inochi-creator/issues/new?assignees=&labels=bug&template=bug-report.yml&title=%5BBUG%5D";

     

       10
       10
       +
       +enum INC_BUG_REPORT_URI = "https://github.com/NixOS/nixpkgs/issues/new?assignees=@assignees@&labels=0.kind%3A+bug&projects=&template=bug_report.md&title=inochi-creator:";

     

       11
       11
       +
        

     

       12
       12
       +
        /**

     

       13
       13
       +
            URI for feature requests, for the most part this doesn't need to be changed

+22

pkgs/applications/misc/inochi2d/translations.patch

···

       1
       1
       +
       diff --git a/source/creator/core/i18n.d b/source/creator/core/i18n.d

     

       2
       2
       +
       index 38761dd..f276ca1 100644

     

       3
       3
       +
       --- a/source/creator/core/i18n.d

     

       4
       4
       +
       +++ b/source/creator/core/i18n.d

     

       5
       5
       +
       @@ -132,7 +132,7 @@ void markDups(TLEntry[] entries) {

     

       6
       6
       +
                // If prevEntry has same humanName as entry before prevEntry, or as this entry,

     

       7
       7
       +
                // disambiguate with the source folder

     

       8
       8
       +
                if (prevIsDup || entryIsDup) {

     

       9
       9
       +
       -            prevEntry.humanName ~= " (" ~ prevEntry.path ~ ")";

     

       10
       10
       +
       +            prevEntry.humanName ~= " (" ~ prevEntry.code ~ ")";

     

       11
       11
       +
                    prevEntry.humanNameC = prevEntry.humanName.toStringz;

     

       12
       12
       +
                }

     

       13
       13
       +
                prevIsDup = entryIsDup;

     

       14
       14
       +
       @@ -140,7 +140,7 @@ void markDups(TLEntry[] entries) {

     

       15
       15
       +
            }

     

       16
       16
       +
        

     

       17
       17
       +
            if (prevIsDup) {

     

       18
       18
       +
       -        prevEntry.humanName ~= " (" ~ prevEntry.path ~ ")";

     

       19
       19
       +
       +        prevEntry.humanName ~= " (" ~ prevEntry.code ~ ")";

     

       20
       20
       +
                prevEntry.humanNameC = prevEntry.humanName.toStringz;

     

       21
       21
       +
            }

     

       22
       22
       +
        }

+2 -2

pkgs/applications/radio/gqrx/default.nix

···

       27
       27
        
       

     

       28
       28
        
       gnuradioMinimal.pkgs.mkDerivation rec {

     

       29
       29
        
         pname = "gqrx";

     

       30
       30
       -
         version = "2.17.4";

     

       30
       30
       +
         version = "2.17.5";

     

       31
       31
        
       

     

       32
       32
        
         src = fetchFromGitHub {

     

       33
       33
        
           owner = "gqrx-sdr";

     

       34
       34
        
           repo = "gqrx";

     

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

     

       36
       36
       -
           hash = "sha256-7TjmtF0B+dxUcoXXzpF47dHwxhNMKKQ8Mpf/FFTuwl4=";

     

       36
       36
       +
           hash = "sha256-9VePsl/vaSTZ1TMyIeaGoZNrZv+O/7BxQ3ubD5S2EjY=";

     

       37
       37
        
         };

     

       38
       38
        
       

     

       39
       39
        
         nativeBuildInputs = [

+26 -25

pkgs/applications/virtualization/OVMF/default.nix

···

       24
       24
        
       # Usually, this option is broken, do not use it except if you know what you are

     

       25
       25
        
       # doing.

     

       26
       26
        
       , sourceDebug ? false

     

       27
       27
       +
       , projectDscPath ? {

     

       28
       28
       +
           i686 = "OvmfPkg/OvmfPkgIa32.dsc";

     

       29
       29
       +
           x86_64 = "OvmfPkg/OvmfPkgX64.dsc";

     

       30
       30
       +
           aarch64 = "ArmVirtPkg/ArmVirtQemu.dsc";

     

       31
       31
       +
           riscv64 = "OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc";

     

       32
       32
       +
         }.${stdenv.hostPlatform.parsed.cpu.name}

     

       33
       33
       +
         or (throw "Unsupported OVMF `projectDscPath` on ${stdenv.hostPlatform.parsed.cpu.name}")

     

       34
       34
       +
       , fwPrefix ? {

     

       35
       35
       +
           i686 = "OVMF";

     

       36
       36
       +
           x86_64 = "OVMF";

     

       37
       37
       +
           aarch64 = "AAVMF";

     

       38
       38
       +
           riscv64 = "RISCV_VIRT";

     

       39
       39
       +
         }.${stdenv.hostPlatform.parsed.cpu.name}

     

       40
       40
       +
         or (throw "Unsupported OVMF `fwPrefix` on ${stdenv.hostPlatform.parsed.cpu.name}")

     

       41
       41
       +
       , metaPlatforms ? edk2.meta.platforms

     

       27
       42
        
       }:

     

       28
       43
        
       

     

       29
       44
        
       let

     

       30
       45
        
       

     

       31
       46
        
         platformSpecific = {

     

       32
       32
       -
           i686 = {

     

       33
       33
       -
             projectDscPath = "OvmfPkg/OvmfPkgIa32.dsc";

     

       34
       34
       -
             fwPrefix = "OVMF";

     

       35
       35
       -
           };

     

       36
       36
       -
           x86_64 = {

     

       37
       37
       -
             projectDscPath = "OvmfPkg/OvmfPkgX64.dsc";

     

       38
       38
       -
             fwPrefix = "OVMF";

     

       39
       39
       -
             msVarsArgs = {

     

       40
       40
       -
               flavor = "OVMF_4M";

     

       41
       41
       -
               archDir = "X64";

     

       42
       42
       -
             };

     

       47
       47
       +
           x86_64.msVarsArgs = {

     

       48
       48
       +
             flavor = "OVMF_4M";

     

       49
       49
       +
             archDir = "X64";

     

       43
       50
        
           };

     

       44
       44
       -
           aarch64 = {

     

       45
       45
       -
             projectDscPath = "ArmVirtPkg/ArmVirtQemu.dsc";

     

       46
       46
       -
             fwPrefix = "AAVMF";

     

       47
       47
       -
             msVarsArgs = {

     

       48
       48
       -
               flavor = "AAVMF";

     

       49
       49
       -
               archDir = "AARCH64";

     

       50
       50
       -
             };

     

       51
       51
       -
           };

     

       52
       52
       -
           riscv64 = {

     

       53
       53
       -
             projectDscPath = "OvmfPkg/RiscVVirt/RiscVVirtQemu.dsc";

     

       54
       54
       -
             fwPrefix = "RISCV_VIRT";

     

       51
       51
       +
           aarch64.msVarsArgs = {

     

       52
       52
       +
             flavor = "AAVMF";

     

       53
       53
       +
             archDir = "AARCH64";

     

       55
       54
        
           };

     

       56
       55
        
         };

     

       57
       56
        
       

     

       58
       57
        
         cpuName = stdenv.hostPlatform.parsed.cpu.name;

     

       59
       58
        
       

     

       60
       60
       -
         inherit (platformSpecific.${cpuName})

     

       61
       61
       -
           projectDscPath fwPrefix msVarsArgs;

     

       59
       59
       +
         inherit (platformSpecific.${cpuName}) msVarsArgs;

     

       62
       60
        
       

     

       63
       61
        
         version = lib.getVersion edk2;

     

       64
       62
        
       

     
···

       152
       150
        
         # release notes accordingly.

     

       153
       151
        
         postInstall = ''

     

       154
       152
        
           mkdir -vp $fd/FV

     

       153
       153
       +
         '' + lib.optionalString (builtins.elem fwPrefix [

     

       154
       154
       +
           "OVMF" "AAVMF" "RISCV_VIRT"

     

       155
       155
       +
         ]) ''

     

       155
       156
        
           mv -v $out/FV/${fwPrefix}_{CODE,VARS}.fd $fd/FV

     

       156
       157
        
         '' + lib.optionalString stdenv.hostPlatform.isx86 ''

     

       157
       158
        
           mv -v $out/FV/${fwPrefix}.fd $fd/FV

     
···

       184
       185
        
           description = "Sample UEFI firmware for QEMU and KVM";

     

       185
       186
        
           homepage = "https://github.com/tianocore/tianocore.github.io/wiki/OVMF";

     

       186
       187
        
           license = lib.licenses.bsd2;

     

       187
       187
       -
           inherit (edk2.meta) platforms;

     

       188
       188
       +
           platforms = metaPlatforms;

     

       188
       189
        
           maintainers = with lib.maintainers; [ adamcstephens raitobezarius ];

     

       189
       190
        
           broken = stdenv.isDarwin;

     

       190
       191
        
         };

+3 -3

pkgs/by-name/ja/jan/package.nix

···

       5
       5
        
       

     

       6
       6
        
       let

     

       7
       7
        
         pname = "jan";

     

       8
       8
       -
         version = "0.4.10";

     

       8
       8
       +
         version = "0.4.11";

     

       9
       9
        
         src = fetchurl {

     

       10
       10
        
           url = "https://github.com/janhq/jan/releases/download/v${version}/jan-linux-x86_64-${version}.AppImage";

     

       11
       11
       -
           hash = "sha256-IOqwz3pJ4veuxQwfkMs0Zf8dNQcQ0HwnR3SPBVvQXtU=";

     

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

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         appimageContents = appimageTools.extractType2 { inherit pname version src; };

     
···

       20
       20
        
           mv $out/bin/jan-${version} $out/bin/jan

     

       21
       21
        
           install -Dm444 ${appimageContents}/jan.desktop -t $out/share/applications

     

       22
       22
        
           substituteInPlace $out/share/applications/jan.desktop \

     

       23
       23
       -
             --replace 'Exec=AppRun --no-sandbox %U' 'Exec=jan'

     

       23
       23
       +
             --replace-fail 'Exec=AppRun --no-sandbox %U' 'Exec=jan'

     

       24
       24
        
           cp -r ${appimageContents}/usr/share/icons $out/share

     

       25
       25
        
         '';

     

       26
       26

+40

pkgs/by-name/mo/moproxy/package.nix

···

       1
       1
       +
       { fetchFromGitHub

     

       2
       2
       +
       , rustPlatform

     

       3
       3
       +
       , fetchurl

     

       4
       4
       +
       , lib

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       rustPlatform.buildRustPackage rec{

     

       8
       8
       +
         pname = "moproxy";

     

       9
       9
       +
         version = "0.5.1";

     

       10
       10
       +
       

     

       11
       11
       +
         src = fetchFromGitHub {

     

       12
       12
       +
           owner = "sorz";

     

       13
       13
       +
           repo = "moproxy";

     

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

     

       15
       15
       +
           hash = "sha256-Rqno+cg44IWBJbKWUP6BnxzwCjuNhFo9nBF6u2jlyA4=";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         cargoHash = "sha256-EunlvI7I6d93wb3hxgxsyAXkzxRlDu0fq9qqjnbzzWg=";

     

       19
       19
       +
       

     

       20
       20
       +
         preBuild =

     

       21
       21
       +
           let

     

       22
       22
       +
             webBundle = fetchurl {

     

       23
       23
       +
               url = "https://github.com/sorz/moproxy-web/releases/download/v0.1.8/build.zip";

     

       24
       24
       +
               hash = "sha256-bLC76LnTWR2/xnDcZtX/t0OUmP7vdI/o3TCRzG9eH/g=";

     

       25
       25
       +
             };

     

       26
       26
       +
           in

     

       27
       27
       +
           ''

     

       28
       28
       +
             # build script try to download from network

     

       29
       29
       +
             sed -i '15s/.*/let zip_path = PathBuf::from("${lib.escape ["/"]  (toString webBundle)}");/' build.rs

     

       30
       30
       +
           '';

     

       31
       31
       +
       

     

       32
       32
       +
         meta = with lib; {

     

       33
       33
       +
           homepage = "https://github.com/sorz/moproxy";

     

       34
       34
       +
           description = "A transparent TCP to SOCKSv5/HTTP proxy on Linux written in Rust";

     

       35
       35
       +
           license = licenses.mit;

     

       36
       36
       +
           mainProgram = "moproxy";

     

       37
       37
       +
           maintainers = with maintainers; [ oluceps ];

     

       38
       38
       +
           platforms = platforms.linux;

     

       39
       39
       +
         };

     

       40
       40
       +
       }

+7

pkgs/by-name/ov/OVMF-cloud-hypervisor/package.nix

···

       1
       1
       +
       { lib, OVMF }:

     

       2
       2
       +
       

     

       3
       3
       +
       OVMF.override {

     

       4
       4
       +
         projectDscPath = "OvmfPkg/CloudHv/CloudHvX64.dsc";

     

       5
       5
       +
         fwPrefix = "CLOUDHV";

     

       6
       6
       +
         metaPlatforms = builtins.filter (lib.hasPrefix "x86_64-") OVMF.meta.platforms;

     

       7
       7
       +
       }

+26

pkgs/by-name/re/restls/package.nix

···

       1
       1
       +
       { fetchFromGitHub

     

       2
       2
       +
       , rustPlatform

     

       3
       3
       +
       , lib

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       rustPlatform.buildRustPackage rec{

     

       7
       7
       +
         pname = "restls";

     

       8
       8
       +
         version = "0.1.1";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchFromGitHub {

     

       11
       11
       +
           owner = "3andne";

     

       12
       12
       +
           repo = "restls";

     

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

     

       14
       14
       +
           hash = "sha256-nlQdBwxHVbpOmb9Wq+ap2i4KI1zJYT3SEqvedDbVH8Q=";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         cargoHash = "sha256-KtNLLtStZ7SNndcPxWfNPA2duoXFVePrbNQFPUz2xFg=";

     

       18
       18
       +
       

     

       19
       19
       +
         meta = with lib; {

     

       20
       20
       +
           homepage = "https://github.com/3andne/restls";

     

       21
       21
       +
           description = "A Perfect Impersonation of TLS";

     

       22
       22
       +
           license = licenses.bsd3;

     

       23
       23
       +
           mainProgram = "restls";

     

       24
       24
       +
           maintainers = with maintainers; [ oluceps ];

     

       25
       25
       +
         };

     

       26
       26
       +
       }

+1 -1

pkgs/by-name/ri/rippkgs/package.nix

···

       30
       30
        
           description = "A CLI for indexing and searching packages in Nix expressions";

     

       31
       31
        
           homepage = "https://github.com/replit/rippkgs";

     

       32
       32
        
           license = lib.licenses.mit;

     

       33
       33
       -
           maintainers = with lib.maintainers; [ eclairevoyant ];

     

       33
       33
       +
           maintainers = with lib.maintainers; [ eclairevoyant cdmistman ];

     

       34
       34
        
           mainProgram = "rippkgs";

     

       35
       35
        
         };

     

       36
       36
        
       }

+24

pkgs/by-name/tr/tridactyl-native/lock.json

···

       3
       3
        
           {

     

       4
       4
        
             "method": "fetchzip",

     

       5
       5
        
             "packages": [

     

       6
       6
       +
               "regex"

     

       7
       7
       +
             ],

     

       8
       8
       +
             "path": "/nix/store/y6w1gzbf6i691z35rbn6kzrmf1n5bmdc-source",

     

       9
       9
       +
             "ref": "v0.25.0",

     

       10
       10
       +
             "rev": "cb8b7bfdcdc2272aadf92153c668acd3c901bd6b",

     

       11
       11
       +
             "sha256": "1ggp5rvs217dv2n0p5ddm5h17pv2mc7724n8cd0b393kmsjiykhz",

     

       12
       12
       +
             "srcDir": "src",

     

       13
       13
       +
             "url": "https://github.com/nitely/nim-regex/archive/cb8b7bfdcdc2272aadf92153c668acd3c901bd6b.tar.gz"

     

       14
       14
       +
           },

     

       15
       15
       +
           {

     

       16
       16
       +
             "method": "fetchzip",

     

       17
       17
       +
             "packages": [

     

       6
       18
        
               "tempfile"

     

       7
       19
        
             ],

     

       8
       20
        
             "path": "/nix/store/d0x874ngf02b8fk1xralnvmij7xh0kjc-source",

     
···

       11
       23
        
             "sha256": "10d1g09q6p554pwr6a3b6ajnwqbphz3a4cwkfa05jbviflfyzjyk",

     

       12
       24
        
             "srcDir": "",

     

       13
       25
        
             "url": "https://github.com/OpenSystemsLab/tempfile.nim/archive/26e0239441755e5edcfd170e9aa566bb9c9eb6f3.tar.gz"

     

       26
       26
       +
           },

     

       27
       27
       +
           {

     

       28
       28
       +
             "method": "fetchzip",

     

       29
       29
       +
             "packages": [

     

       30
       30
       +
               "unicodedb"

     

       31
       31
       +
             ],

     

       32
       32
       +
             "path": "/nix/store/wpilzdf8vdwp7w129yrl821p9qvl3ky3-source",

     

       33
       33
       +
             "ref": "0.12.0",

     

       34
       34
       +
             "rev": "b055310c08db8f879057b4fec15c8301ee93bb2a",

     

       35
       35
       +
             "sha256": "0w77h75vrgp6jiq4dd9i2m4za2cf8qhjkz2wlxiz27yn2isjrndy",

     

       36
       36
       +
             "srcDir": "src",

     

       37
       37
       +
             "url": "https://github.com/nitely/nim-unicodedb/archive/b055310c08db8f879057b4fec15c8301ee93bb2a.tar.gz"

     

       14
       38
        
           }

     

       15
       39
        
         ]

     

       16
       40
        
       }

+4 -5

pkgs/by-name/tr/tridactyl-native/package.nix

···

       1
       1
        
       { lib, buildNimPackage, fetchFromGitHub }:

     

       2
       2
       -
       

     

       3
       2
        
       buildNimPackage {

     

       4
       3
        
         pname = "tridactyl-native";

     

       5
       5
       -
         version = "0.3.7";

     

       4
       4
       +
         version = "0.4.1";

     

       6
       5
        
       

     

       7
       6
        
         src = fetchFromGitHub {

     

       8
       7
        
           owner = "tridactyl";

     

       9
       8
        
           repo = "native_messenger";

     

       10
       10
       -
           rev = "62f19dba573b924703829847feb1bfee68885514";

     

       11
       11
       -
           sha256 = "sha256-YGDVcfFcI9cRCCZ4BrO5xTuI9mrGq1lfbEITB7o3vQQ=";

     

       9
       9
       +
           rev = "3059abd9fb3f14d598f6c299335c3ebac5bc689a";

     

       10
       10
       +
           sha256 = "sha256-gicdpWAoimZMNGLc8w0vtJiFFxeqxB8P4lgWDun7unM=";

     

       12
       11
        
         };

     

       13
       12
        
       

     

       14
       13
        
         lockFile = ./lock.json;

     
···

       26
       25
        
           homepage = "https://github.com/tridactyl/native_messenger";

     

       27
       26
        
           license = licenses.bsd2;

     

       28
       27
        
           platforms = platforms.all;

     

       29
       29
       -
           maintainers = with maintainers; [ timokau dit7ya ];

     

       28
       28
       +
           maintainers = with maintainers; [ timokau dit7ya kiike ];

     

       30
       29
        
         };

     

       31
       30
        
       }

+3 -3

pkgs/by-name/ux/uxn/package.nix

···

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation (finalAttrs: {

     

       9
       9
        
         pname = "uxn";

     

       10
       10
       -
         version = "unstable-2024-04-05";

     

       10
       10
       +
         version = "unstable-2024-04-15";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromSourcehut {

     

       13
       13
        
           owner = "~rabbits";

     

       14
       14
        
           repo = "uxn";

     

       15
       15
       -
           rev = "41567558bc1ec4721fee1cc316c3a3cdc627b102";

     

       16
       16
       -
           hash = "sha256-Qvq9/kNZAKRHH3NIxiX5+67ibeX5QzK97EhuoplTBDQ=";

     

       15
       15
       +
           rev = "b0bfb38dccff4ff7b0fa6d384651f7847a76fd1f";

     

       16
       16
       +
           hash = "sha256-OLrIIrcIfFI96+Q2fc0JSqJHBMcoN9+LL5E/YCN21Kc=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         outputs = [ "out" "projects" ];

+2 -2

pkgs/by-name/wi/wiremock/package.nix

···

       10
       10
        
       

     

       11
       11
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       12
       12
        
         pname = "wiremock";

     

       13
       13
       -
         version = "3.5.2";

     

       13
       13
       +
         version = "3.5.3";

     

       14
       14
        
       

     

       15
       15
        
         src = fetchurl {

     

       16
       16
        
           url = "mirror://maven/org/wiremock/wiremock-standalone/${finalAttrs.version}/wiremock-standalone-${finalAttrs.version}.jar";

     

       17
       17
       -
           hash = "sha256-27DIcfP5R1Qiwl2fhvUQjFsE8pTHTv5MuFqHGa+whVY=";

     

       17
       17
       +
           hash = "sha256-HIWhuaW36/kdsj8iZD0ANHQ26olURnYL1q5fcQXHHjw=";

     

       18
       18
        
         };

     

       19
       19
        
       

     

       20
       20
        
         dontUnpack = true;

+4 -1

pkgs/desktops/gnome/core/eog/default.nix

···

       21
       21
        
       , exempi

     

       22
       22
        
       , shared-mime-info

     

       23
       23
        
       , wrapGAppsHook

     

       24
       24
       +
       , libjxl

     

       24
       25
        
       , librsvg

     

       25
       26
        
       , webp-pixbuf-loader

     

       26
       27
        
       , libheif

     
···

       81
       82
        
         ];

     

       82
       83
        
       

     

       83
       84
        
         postInstall = ''

     

       84
       84
       -
           # Pull in WebP support for gnome-backgrounds.

     

       85
       85
       +
           # Pull in WebP and JXL support for gnome-backgrounds.

     

       85
       86
        
           # In postInstall to run before gappsWrapperArgsHook.

     

       86
       87
        
           export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE {

     

       87
       88
        
             extraLoaders = [

     

       89
       89
       +
               libjxl

     

       88
       90
        
               librsvg

     

       89
       91
        
               webp-pixbuf-loader

     

       90
       92
        
               libheif.out

     
···

       96
       98
        
           gappsWrapperArgs+=(

     

       97
       99
        
             # Thumbnailers

     

       98
       100
        
             --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"

     

       101
       101
       +
             --prefix XDG_DATA_DIRS : "${libjxl}/share"

     

       99
       102
        
             --prefix XDG_DATA_DIRS : "${librsvg}/share"

     

       100
       103
        
             --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"

     

       101
       104
        
           )

+3 -1

pkgs/desktops/gnome/core/gnome-control-center/default.nix

···

       31
       31
        
       , libgudev

     

       32
       32
        
       , libadwaita

     

       33
       33
        
       , libkrb5

     

       34
       34
       +
       , libjxl

     

       34
       35
        
       , libpulseaudio

     

       35
       36
        
       , libpwquality

     

       36
       37
        
       , librsvg

     
···

       173
       174
        
         '';

     

       174
       175
        
       

     

       175
       176
        
         postInstall = ''

     

       176
       176
       -
           # Pull in WebP support for gnome-backgrounds.

     

       177
       177
       +
           # Pull in WebP and JXL support for gnome-backgrounds.

     

       177
       178
        
           # In postInstall to run before gappsWrapperArgsHook.

     

       178
       179
        
           export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE {

     

       179
       180
        
             extraLoaders = [

     

       181
       181
       +
               libjxl

     

       180
       182
        
               librsvg

     

       181
       183
        
               webp-pixbuf-loader

     

       182
       184
        
             ];

+3 -1

pkgs/desktops/gnome/core/gnome-shell/default.nix

···

       19
       19
        
       , unzip

     

       20
       20
        
       , shared-mime-info

     

       21
       21
        
       , libgweather

     

       22
       22
       +
       , libjxl

     

       22
       23
        
       , librsvg

     

       23
       24
        
       , webp-pixbuf-loader

     

       24
       25
        
       , geoclue2

     
···

       188
       189
        
         '';

     

       189
       190
        
       

     

       190
       191
        
         postInstall = ''

     

       191
       191
       -
           # Pull in WebP support for gnome-backgrounds.

     

       192
       192
       +
           # Pull in WebP and JXL support for gnome-backgrounds.

     

       192
       193
        
           # In postInstall to run before gappsWrapperArgsHook.

     

       193
       194
        
           export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE {

     

       194
       195
        
             extraLoaders = [

     

       196
       196
       +
               libjxl

     

       195
       197
        
               librsvg

     

       196
       198
        
               webp-pixbuf-loader

     

       197
       199
        
             ];

+2

pkgs/desktops/gnome/core/nautilus/default.nix

···

       19
       19
        
       , shared-mime-info

     

       20
       20
        
       , libnotify

     

       21
       21
        
       , libexif

     

       22
       22
       +
       , libjxl

     

       22
       23
        
       , libseccomp

     

       23
       24
        
       , librsvg

     

       24
       25
        
       , webp-pixbuf-loader

     
···

       106
       107
        
           gappsWrapperArgs+=(

     

       107
       108
        
             # Thumbnailers

     

       108
       109
        
             --prefix XDG_DATA_DIRS : "${gdk-pixbuf}/share"

     

       110
       110
       +
             --prefix XDG_DATA_DIRS : "${libjxl}/share"

     

       109
       111
        
             --prefix XDG_DATA_DIRS : "${librsvg}/share"

     

       110
       112
        
             --prefix XDG_DATA_DIRS : "${webp-pixbuf-loader}/share"

     

       111
       113
        
             --prefix XDG_DATA_DIRS : "${shared-mime-info}/share"

+3 -1

pkgs/development/libraries/xdg-desktop-portal-gnome/default.nix

···

       14
       14
        
       , xdg-desktop-portal

     

       15
       15
        
       , wayland

     

       16
       16
        
       , gnome

     

       17
       17
       +
       , libjxl

     

       17
       18
        
       , librsvg

     

       18
       19
        
       , webp-pixbuf-loader

     

       19
       20
        
       }:

     
···

       50
       51
        
         ];

     

       51
       52
        
       

     

       52
       53
        
         postInstall = ''

     

       53
       53
       -
           # Pull in WebP support for gnome-backgrounds.

     

       54
       54
       +
           # Pull in WebP and JXL support for gnome-backgrounds.

     

       54
       55
        
           # In postInstall to run before gappsWrapperArgsHook.

     

       55
       56
        
           export GDK_PIXBUF_MODULE_FILE="${gnome._gdkPixbufCacheBuilder_DO_NOT_USE {

     

       56
       57
        
             extraLoaders = [

     

       58
       58
       +
               libjxl

     

       57
       59
        
               librsvg

     

       58
       60
        
               webp-pixbuf-loader

     

       59
       61
        
             ];

+10 -13

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

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , buildPythonPackage

     

       3
       3
       -
       , fetchPypi

     

       4
       4
       -
       , pythonOlder

     

       5
       5
       -
       , setuptools

     

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         buildPythonPackage,

     

       4
       4
       +
         fetchPypi,

     

       5
       5
       +
         pythonOlder,

     

       6
       6
       +
         setuptools,

     

       6
       7
        
       }:

     

       7
       8
        
       

     

       8
       9
        
       buildPythonPackage rec {

     

       9
       10
        
         pname = "mailchecker";

     

       10
       10
       -
         version = "6.0.1";

     

       11
       11
       +
         version = "6.0.3";

     

       11
       12
        
         pyproject = true;

     

       12
       13
        
       

     

       13
       14
        
         disabled = pythonOlder "3.7";

     

       14
       15
        
       

     

       15
       16
        
         src = fetchPypi {

     

       16
       17
        
           inherit pname version;

     

       17
       17
       -
           hash = "sha256-PXo6dfiAqC1WD/z5NBI6UZVUl/cwlvoqKDyfZI4fn2s=";

     

       18
       18
       +
           hash = "sha256-QRysmtKo5KXXAVcyQx2WwuwySUP8vAN/gqXWmgoOPmo=";

     

       18
       19
        
         };

     

       19
       20
        
       

     

       20
       20
       -
         nativeBuildInputs = [

     

       21
       21
       -
           setuptools

     

       22
       22
       -
         ];

     

       21
       21
       +
         build-system = [ setuptools ];

     

       23
       22
        
       

     

       24
       23
        
         # Module has no tests

     

       25
       24
        
         doCheck = false;

     

       26
       25
        
       

     

       27
       27
       -
         pythonImportsCheck = [

     

       28
       28
       -
           "MailChecker"

     

       29
       29
       -
         ];

     

       26
       26
       +
         pythonImportsCheck = [ "MailChecker" ];

     

       30
       27
        
       

     

       31
       28
        
         meta = with lib; {

     

       32
       29
        
           description = "Module for temporary (disposable/throwaway) email detection";

+2 -2

pkgs/development/python-modules/scikit-hep-testdata/default.nix

···

       11
       11
        
       

     

       12
       12
        
       buildPythonPackage rec {

     

       13
       13
        
         pname = "scikit-hep-testdata";

     

       14
       14
       -
         version = "0.4.43";

     

       14
       14
       +
         version = "0.4.44";

     

       15
       15
        
         format = "pyproject";

     

       16
       16
        
       

     

       17
       17
        
         disabled = pythonOlder "3.6";

     
···

       20
       20
        
           owner = "scikit-hep";

     

       21
       21
        
           repo = pname;

     

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

     

       23
       23
       -
           hash = "sha256-+CJyo6motrS89eDJct1zh6zOOrrw+yfAODA/BaVm00A=";

     

       23
       23
       +
           hash = "sha256-7a1F7180mnbMiEwRWzDQt2EhRsleSoVhWtTc+5DR/2o=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         nativeBuildInputs = [

+2 -2

pkgs/development/tools/twilio-cli/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenvNoCC.mkDerivation (finalAttrs: {

     

       4
       4
        
         pname = "twilio-cli";

     

       5
       5
       -
         version = "5.19.3";

     

       5
       5
       +
         version = "5.19.4";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchzip {

     

       8
       8
        
           url = "https://twilio-cli-prod.s3.amazonaws.com/twilio-v${finalAttrs.version}/twilio-v${finalAttrs.version}.tar.gz";

     

       9
       9
       -
           hash = "sha256-9OHulIASsU7udo5p0jxKlb7vZftWcOLmJYQffejOFqQ=";

     

       9
       9
       +
           hash = "sha256-dSM3B9C+H0sTnxCkElDXKWUxNtctW1Jgh/nRFWEXc2A=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         buildInputs = [ nodejs-slim ];

+2 -2

pkgs/games/shattered-pixel-dungeon/rkpd2.nix

···

       4
       4
        
       

     

       5
       5
        
       callPackage ./generic.nix rec {

     

       6
       6
        
         pname = "rkpd2";

     

       7
       7
       -
         version = "2.0.3";

     

       7
       7
       +
         version = "2.0.5";

     

       8
       8
        
       

     

       9
       9
        
         src = fetchFromGitHub {

     

       10
       10
        
           owner = "Zrp200";

     

       11
       11
        
           repo = "rkpd2";

     

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

     

       13
       13
       -
           hash = "sha256-dng/QoG9FTNU/fNVqPtLW/MVhO1uDBkXxWcI5mESUKw=";

     

       13
       13
       +
           hash = "sha256-VVqwgwDuIyRd5MU1/64Xz+8TbIOrXcHufs0XqD/Q4ls=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         depsHash = "sha256-vihoR0bPh7590sRxeYJ1uuynNRxtRBuiFUrdmsRNUJc=";

+2 -2

pkgs/tools/admin/credhub-cli/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "credhub-cli";

     

       5
       5
       -
         version = "2.9.28";

     

       5
       5
       +
         version = "2.9.29";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "cloudfoundry-incubator";

     

       9
       9
        
           repo = "credhub-cli";

     

       10
       10
        
           rev = version;

     

       11
       11
       -
           sha256 = "sha256-2LHWbTvxE8awSUm33XocjWxrY8dosMEaCPOx85+tj4s=";

     

       11
       11
       +
           sha256 = "sha256-6icF+Dg4IdCjeqcX058aewj702oCoch6VYqgdCVPoNc=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         # these tests require network access that we're not going to give them

-7

pkgs/tools/admin/mycli/default.nix

···

       42
       42
        
           "mycli/packages/paramiko_stub/__init__.py"

     

       43
       43
        
         ];

     

       44
       44
        
       

     

       45
       45
       -
         disabledTests = [

     

       46
       46
       -
           # Note: test_auto_escaped_col_names is currently failing due to a bug upstream.

     

       47
       47
       -
           # TODO: re-enable this test once there is a fix upstream. See

     

       48
       48
       -
           # https://github.com/dbcli/mycli/issues/1103 for details.

     

       49
       49
       -
           "test_auto_escaped_col_names"

     

       50
       50
       -
         ];

     

       51
       51
       -
       

     

       52
       45
        
         postPatch = ''

     

       53
       46
        
           substituteInPlace setup.py \

     

       54
       47
        
             --replace "cryptography == 36.0.2" "cryptography"

+2 -11

pkgs/tools/networking/libreswan/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , stdenv

     

       3
       3
        
       , fetchurl

     

       4
       4
       -
       , fetchpatch

     

       5
       4
        
       , nixosTests

     

       6
       5
        
       , pkg-config

     

       7
       6
        
       , systemd

     
···

       46
       45
        
       

     

       47
       46
        
       stdenv.mkDerivation rec {

     

       48
       47
        
         pname = "libreswan";

     

       49
       49
       -
         version = "4.12";

     

       48
       48
       +
         version = "4.15";

     

       50
       49
        
       

     

       51
       50
        
         src = fetchurl {

     

       52
       51
        
           url = "https://download.libreswan.org/${pname}-${version}.tar.gz";

     

       53
       53
       -
           hash = "sha256-roWr5BX3vs9LaiuYl+FxLyflqsnDXfvd28zgrX39mfc=";

     

       52
       52
       +
           hash = "sha256-/mDX2zmMjuIlBV2zZeyWiiSuvLxcNQYRMfz/2tG+BK8=";

     

       54
       53
        
         };

     

       55
       54
        
       

     

       56
       55
        
         strictDeps = true;

     
···

       114
       113
        
               -e '/test ! -d $(NSSDIR)/,+3d' \

     

       115
       114
        
               -i configs/Makefile

     

       116
       115
        
         '';

     

       117
       117
       -
       

     

       118
       118
       -
         patches = [

     

       119
       119
       -
           (fetchpatch {

     

       120
       120
       -
             name = "ignoring-return-value.patch";

     

       121
       121
       -
             url = "https://github.com/libreswan/libreswan/commit/ba5bad09f55959872022fa506d5ac06eafe3a314.diff";

     

       122
       122
       -
             hash = "sha256-xJ8rZWoRtJixamGY8sjOS+63Lw3RX7620HlRWYfvSxc=";

     

       123
       123
       -
           })

     

       124
       124
       -
         ];

     

       125
       116
        
       

     

       126
       117
        
         makeFlags = [

     

       127
       118
        
           "PREFIX=$(out)"

+1 -1

pkgs/tools/package-management/nix/common.nix

···

       266
       266
        
             environments.

     

       267
       267
        
           '';

     

       268
       268
        
           homepage = "https://nixos.org/";

     

       269
       269
       -
           license = licenses.lgpl2Plus;

     

       269
       269
       +
           license = licenses.lgpl21Plus;

     

       270
       270
        
           inherit maintainers;

     

       271
       271
        
           platforms = platforms.unix;

     

       272
       272
        
           outputsToInstall = [ "out" ] ++ optional enableDocumentation "man";

+2 -2

pkgs/tools/virtualization/govc/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "govc";

     

       5
       5
       -
         version = "0.37.0";

     

       5
       5
       +
         version = "0.37.1";

     

       6
       6
        
       

     

       7
       7
        
         subPackages = [ "govc" ];

     

       8
       8
        
       

     
···

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

     

       11
       11
        
           owner = "vmware";

     

       12
       12
        
           repo = "govmomi";

     

       13
       13
       -
           sha256 = "sha256-rE19ky/x3pqlz2/6W8ucrctgpJFefEKfzpW4DEDCQ3E=";

     

       13
       13
       +
           sha256 = "sha256-lErMWVr0UWR2Hc6fYZiauLz6kAZY/uGPNjm6oJGBAuw=";

     

       14
       14
        
         };

     

       15
       15
        
       

     

       16
       16
        
         vendorHash = "sha256-1EAQMYaTEtfAiu7+UTkC7QZwSWC1Ihwj9leTd90T0ZU=";

+3

pkgs/top-level/all-packages.nix

···

       19047
       19047
        
       

     

       19048
       19048
        
         inotify-tools = callPackage ../development/tools/misc/inotify-tools { };

     

       19049
       19049
        
       

     

       19050
       19050
       +
         inherit (callPackage ../applications/misc/inochi2d { })

     

       19051
       19051
       +
           inochi-creator inochi-session;

     

       19052
       19052
       +
       

     

       19050
       19053
        
         intel-gpu-tools = callPackage ../development/tools/misc/intel-gpu-tools { };

     

       19051
       19054
        
       

     

       19052
       19055
        
         insomnia = callPackage ../development/web/insomnia { };