commit 8c04f70ddd1846816678b6a617a7b0ae4ad98b03 · pyrox.dev/nixpkgs

+1 -1

doc/builders/fetchers.chapter.md

···

       18
        
       

     

       19
        
       The main difference between `fetchurl` and `fetchzip` is in how they store the contents. `fetchurl` will store the unaltered contents of the URL within the Nix store. `fetchzip` on the other hand will decompress the archive for you, making files and directories directly accessible in the future. `fetchzip` can only be used with archives. Despite the name, `fetchzip` is not limited to .zip files and can also be used with any tarball.

     

       20
        
       

     

       21
       -
       `fetchpatch` works very similarly to `fetchurl` with the same arguments expected. It expects patch files as a source and and performs normalization on them before computing the checksum. For example it will remove comments or other unstable parts that are sometimes added by version control systems and can change over time.

     

       22
        
       

     

       23
        
       

     

       24
        
       Other fetcher functions allow you to add source code directly from a VCS such as subversion or git. These are mostly straightforward nambes based on the name of the command used with the VCS system. Because they give you a working repository, they act most like `fetchzip`.

···

       18
        
       

     

       19
        
       The main difference between `fetchurl` and `fetchzip` is in how they store the contents. `fetchurl` will store the unaltered contents of the URL within the Nix store. `fetchzip` on the other hand will decompress the archive for you, making files and directories directly accessible in the future. `fetchzip` can only be used with archives. Despite the name, `fetchzip` is not limited to .zip files and can also be used with any tarball.

     

       20
        
       

     

       21
       +
       `fetchpatch` works very similarly to `fetchurl` with the same arguments expected. It expects patch files as a source and performs normalization on them before computing the checksum. For example it will remove comments or other unstable parts that are sometimes added by version control systems and can change over time.

     

       22
        
       

     

       23
        
       

     

       24
        
       Other fetcher functions allow you to add source code directly from a VCS such as subversion or git. These are mostly straightforward nambes based on the name of the command used with the VCS system. Because they give you a working repository, they act most like `fetchzip`.

+1 -1

doc/builders/images/snaptools.xml

···

       16
        
         </para>

     

       17
        
       

     

       18
        
         <para>

     

       19
       -
          The <parameter>base</parameter> should not be be specified, as <function>makeSnap</function> will force set it.

     

       20
        
         </para>

     

       21
        
       

     

       22
        
         <para>

···

       16
        
         </para>

     

       17
        
       

     

       18
        
         <para>

     

       19
       +
          The <parameter>base</parameter> should not be specified, as <function>makeSnap</function> will force set it.

     

       20
        
         </para>

     

       21
        
       

     

       22
        
         <para>

+1 -1

doc/languages-frameworks/android.section.md

···

       80
        
       

     

       81
        
       You can specify license names:

     

       82
        
       

     

       83
       -
       * `extraLicenses` is a list of of license names.

     

       84
        
         You can get these names from repo.json or `querypackages.sh licenses`. The SDK

     

       85
        
         license (`android-sdk-license`) is accepted for you if you set accept_license

     

       86
        
         to true. If you are doing something like working with preview SDKs, you will

···

       80
        
       

     

       81
        
       You can specify license names:

     

       82
        
       

     

       83
       +
       * `extraLicenses` is a list of license names.

     

       84
        
         You can get these names from repo.json or `querypackages.sh licenses`. The SDK

     

       85
        
         license (`android-sdk-license`) is accepted for you if you set accept_license

     

       86
        
         to true. If you are doing something like working with preview SDKs, you will

+1 -1

doc/languages-frameworks/dotnet.section.md

···

       64
        
       

     

       65
        
       The `dotnetCorePackages.sdk_X_Y` is preferred over the old dotnet-sdk as both major and minor version are very important for a dotnet environment. If a given minor version isn't present (or was changed), then this will likely break your ability to build a project.

     

       66
        
       

     

       67
       -
       ## dotnetCorePackages.sdk vs vs dotnetCorePackages.net vs dotnetCorePackages.netcore vs dotnetCorePackages.aspnetcore

     

       68
        
       

     

       69
        
       The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given version. The `net`, `netcore` and `aspnetcore` packages are meant to serve as minimal runtimes to deploy alongside already built applications. For runtime versions >= .NET 5 `net` is used while `netcore` is used for older .NET Core runtime version.

     

       70

···

       64
        
       

     

       65
        
       The `dotnetCorePackages.sdk_X_Y` is preferred over the old dotnet-sdk as both major and minor version are very important for a dotnet environment. If a given minor version isn't present (or was changed), then this will likely break your ability to build a project.

     

       66
        
       

     

       67
       +
       ## dotnetCorePackages.sdk vs dotnetCorePackages.net vs dotnetCorePackages.netcore vs dotnetCorePackages.aspnetcore

     

       68
        
       

     

       69
        
       The `dotnetCorePackages.sdk` contains both a runtime and the full sdk of a given version. The `net`, `netcore` and `aspnetcore` packages are meant to serve as minimal runtimes to deploy alongside already built applications. For runtime versions >= .NET 5 `net` is used while `netcore` is used for older .NET Core runtime version.

     

       70

+2 -2

doc/languages-frameworks/lua.section.md

···

       50
        
       ```shell

     

       51
        
       nix-env -iA nixpkgs.myLuaEnv

     

       52
        
       ```

     

       53
       -
       The environment is is installed by referring to the attribute, and considering

     

       54
        
       the `nixpkgs` channel was used.

     

       55
        
       

     

       56
        
       #### Lua environment defined in `/etc/nixos/configuration.nix`

     
···

       129
        
       [luarocks2nix](https://github.com/nix-community/luarocks) is a tool capable of generating nix derivations from both rockspec and src.rock (and favors the src.rock).

     

       130
        
       The automation only goes so far though and some packages need to be customized.

     

       131
        
       These customizations go in `pkgs/development/lua-modules/overrides.nix`.

     

       132
       -
       For instance if the rockspec defines `external_dependencies`, these need to be manually added in in its rockspec file then it won't work.

     

       133
        
       

     

       134
        
       You can try converting luarocks packages to nix packages with the command `nix-shell -p luarocks-nix` and then `luarocks nix PKG_NAME`.

     

       135
        
       Nix rely on luarocks to install lua packages, basically it runs:

···

       50
        
       ```shell

     

       51
        
       nix-env -iA nixpkgs.myLuaEnv

     

       52
        
       ```

     

       53
       +
       The environment is installed by referring to the attribute, and considering

     

       54
        
       the `nixpkgs` channel was used.

     

       55
        
       

     

       56
        
       #### Lua environment defined in `/etc/nixos/configuration.nix`

     
···

       129
        
       [luarocks2nix](https://github.com/nix-community/luarocks) is a tool capable of generating nix derivations from both rockspec and src.rock (and favors the src.rock).

     

       130
        
       The automation only goes so far though and some packages need to be customized.

     

       131
        
       These customizations go in `pkgs/development/lua-modules/overrides.nix`.

     

       132
       +
       For instance if the rockspec defines `external_dependencies`, these need to be manually added in its rockspec file then it won't work.

     

       133
        
       

     

       134
        
       You can try converting luarocks packages to nix packages with the command `nix-shell -p luarocks-nix` and then `luarocks nix PKG_NAME`.

     

       135
        
       Nix rely on luarocks to install lua packages, basically it runs:

+2 -2

doc/languages-frameworks/python.section.md

···

       334
        
       creating working Python environments in nix.

     

       335
        
       

     

       336
        
       Now that you know the basics to be up and running, it is time to take a step

     

       337
       -
       back and take a deeper look at at how Python packages are packaged on Nix. Then,

     

       338
        
       we will look at how you can use development mode with your code.

     

       339
        
       

     

       340
        
       #### Python library packages in Nixpkgs

     
···

       918
        
       

     

       919
        
       * `nativeBuildInputs ? []`: Build-time only dependencies. Typically executables

     

       920
        
         as well as the items listed in `setup_requires`.

     

       921
       -
       * `buildInputs ? []`: Build and/or run-time dependencies that need to be be

     

       922
        
         compiled for the host machine. Typically non-Python libraries which are being

     

       923
        
         linked.

     

       924
        
       * `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These

···

       334
        
       creating working Python environments in nix.

     

       335
        
       

     

       336
        
       Now that you know the basics to be up and running, it is time to take a step

     

       337
       +
       back and take a deeper look at how Python packages are packaged on Nix. Then,

     

       338
        
       we will look at how you can use development mode with your code.

     

       339
        
       

     

       340
        
       #### Python library packages in Nixpkgs

     
···

       918
        
       

     

       919
        
       * `nativeBuildInputs ? []`: Build-time only dependencies. Typically executables

     

       920
        
         as well as the items listed in `setup_requires`.

     

       921
       +
       * `buildInputs ? []`: Build and/or run-time dependencies that need to be

     

       922
        
         compiled for the host machine. Typically non-Python libraries which are being

     

       923
        
         linked.

     

       924
        
       * `checkInputs ? []`: Dependencies needed for running the `checkPhase`. These

+1 -1

doc/languages-frameworks/ruby.section.md

···

       229
        
       

     

       230
        
       If you want to package a specific version, you can use the standard Gemfile syntax for that, e.g. `gem 'mdl', '0.5.0'`, but if you want the latest stable version anyway, it's easier to update by simply running the `bundle lock` and `bundix` steps again.

     

       231
        
       

     

       232
       -
       Now you can also also make a `default.nix` that looks like this:

     

       233
        
       

     

       234
        
       ```nix

     

       235
        
       { bundlerApp }:

···

       229
        
       

     

       230
        
       If you want to package a specific version, you can use the standard Gemfile syntax for that, e.g. `gem 'mdl', '0.5.0'`, but if you want the latest stable version anyway, it's easier to update by simply running the `bundle lock` and `bundix` steps again.

     

       231
        
       

     

       232
       +
       Now you can also make a `default.nix` that looks like this:

     

       233
        
       

     

       234
        
       ```nix

     

       235
        
       { bundlerApp }:

+1 -1

doc/languages-frameworks/rust.section.md

···

       747
        
       stdenv.mkDerivation {

     

       748
        
         name = "rust-env";

     

       749
        
         buildInputs = [

     

       750
       -
           # Note: to use use stable, just replace `nightly` with `stable`

     

       751
        
           latest.rustChannels.nightly.rust

     

       752
        
       

     

       753
        
           # Add some extra dependencies from `pkgs`

···

       747
        
       stdenv.mkDerivation {

     

       748
        
         name = "rust-env";

     

       749
        
         buildInputs = [

     

       750
       +
           # Note: to use stable, just replace `nightly` with `stable`

     

       751
        
           latest.rustChannels.nightly.rust

     

       752
        
       

     

       753
        
           # Add some extra dependencies from `pkgs`

+1 -1

doc/using/overlays.xml

···

       230
        
          </para>

     

       231
        
       

     

       232
        
          <para>

     

       233
       -
           For BLAS/LAPACK switching to work correctly, all packages must depend on <literal>blas</literal> or <literal>lapack</literal>. This ensures that only one BLAS/LAPACK library is used at one time. There are two versions versions of BLAS/LAPACK currently in the wild, <literal>LP64</literal> (integer size = 32 bits) and <literal>ILP64</literal> (integer size = 64 bits). Some software needs special flags or patches to work with <literal>ILP64</literal>. You can check if <literal>ILP64</literal> is used in Nixpkgs with <varname>blas.isILP64</varname> and <varname>lapack.isILP64</varname>. Some software does NOT work with <literal>ILP64</literal>, and derivations need to specify an assertion to prevent this. You can prevent <literal>ILP64</literal> from being used with the following:

     

       234
        
          </para>

     

       235
        
       

     

       236
        
       <programlisting>

···

       230
        
          </para>

     

       231
        
       

     

       232
        
          <para>

     

       233
       +
           For BLAS/LAPACK switching to work correctly, all packages must depend on <literal>blas</literal> or <literal>lapack</literal>. This ensures that only one BLAS/LAPACK library is used at one time. There are two versions of BLAS/LAPACK currently in the wild, <literal>LP64</literal> (integer size = 32 bits) and <literal>ILP64</literal> (integer size = 64 bits). Some software needs special flags or patches to work with <literal>ILP64</literal>. You can check if <literal>ILP64</literal> is used in Nixpkgs with <varname>blas.isILP64</varname> and <varname>lapack.isILP64</varname>. Some software does NOT work with <literal>ILP64</literal>, and derivations need to specify an assertion to prevent this. You can prevent <literal>ILP64</literal> from being used with the following:

     

       234
        
          </para>

     

       235
        
       

     

       236
        
       <programlisting>

+13

pkgs/applications/backup/pika-backup/borg-path.patch

···

       1
       +
       diff --git a/src/borg/utils.rs b/src/borg/utils.rs

     

       2
       +
       index 4e30913..30d7d6f 100644

     

       3
       +
       --- a/src/borg/utils.rs

     

       4
       +
       +++ b/src/borg/utils.rs

     

       5
       +
       @@ -223,7 +223,7 @@ impl BorgCall {

     

       6
       +
            }

     

       7
       +
        

     

       8
       +
            pub fn cmd(&self) -> Command {

     

       9
       +
       -        let mut cmd = Command::new("borg");

     

       10
       +
       +        let mut cmd = Command::new("@borg@");

     

       11
       +
        

     

       12
       +
                cmd.args(self.args())

     

       13
       +
                    .stderr(Stdio::piped())

+77

pkgs/applications/backup/pika-backup/default.nix

···

       1
       +
       { lib

     

       2
       +
       , stdenv

     

       3
       +
       , fetchFromGitLab

     

       4
       +
       , rustPlatform

     

       5
       +
       , substituteAll

     

       6
       +
       , desktop-file-utils

     

       7
       +
       , meson

     

       8
       +
       , ninja

     

       9
       +
       , pkg-config

     

       10
       +
       , python3

     

       11
       +
       , wrapGAppsHook

     

       12
       +
       , borgbackup

     

       13
       +
       , dbus

     

       14
       +
       , gdk-pixbuf

     

       15
       +
       , glib

     

       16
       +
       , gtk3

     

       17
       +
       , libhandy

     

       18
       +
       }:

     

       19
       +
       

     

       20
       +
       stdenv.mkDerivation rec {

     

       21
       +
         pname = "pika-backup";

     

       22
       +
         version = "0.2.1";

     

       23
       +
       

     

       24
       +
         src = fetchFromGitLab {

     

       25
       +
           domain = "gitlab.gnome.org";

     

       26
       +
           owner = "World";

     

       27
       +
           repo = "pika-backup";

     

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

     

       29
       +
           sha256 = "0fm6vwpw0pa98v2yn8p3818rrlv9lk3pmgnal1b2kh52im5ll7m8";

     

       30
       +
         };

     

       31
       +
       

     

       32
       +
         cargoDeps = rustPlatform.fetchCargoTarball {

     

       33
       +
           inherit src;

     

       34
       +
           name = "${pname}-${version}";

     

       35
       +
           sha256 = "1f5s6a0wjrs2spsicirhbvb5xlz9iflwsaqchij9k02hfcsr308y";

     

       36
       +
         };

     

       37
       +
       

     

       38
       +
         patches = [

     

       39
       +
           (substituteAll {

     

       40
       +
             src = ./borg-path.patch;

     

       41
       +
             borg = "${borgbackup}/bin/borg";

     

       42
       +
           })

     

       43
       +
         ];

     

       44
       +
       

     

       45
       +
         postPatch = ''

     

       46
       +
           patchShebangs build-aux

     

       47
       +
         '';

     

       48
       +
       

     

       49
       +
         nativeBuildInputs = [

     

       50
       +
           desktop-file-utils

     

       51
       +
           meson

     

       52
       +
           ninja

     

       53
       +
           pkg-config

     

       54
       +
           python3

     

       55
       +
           wrapGAppsHook

     

       56
       +
         ] ++ (with rustPlatform; [

     

       57
       +
           cargoSetupHook

     

       58
       +
           rust.cargo

     

       59
       +
           rust.rustc

     

       60
       +
         ]);

     

       61
       +
       

     

       62
       +
         buildInputs = [

     

       63
       +
           dbus

     

       64
       +
           gdk-pixbuf

     

       65
       +
           glib

     

       66
       +
           gtk3

     

       67
       +
           libhandy

     

       68
       +
         ];

     

       69
       +
       

     

       70
       +
         meta = with lib; {

     

       71
       +
           description = "Simple backups based on borg";

     

       72
       +
           homepage = "https://wiki.gnome.org/Apps/PikaBackup";

     

       73
       +
           changelog = "https://gitlab.gnome.org/World/pika-backup/-/blob/v${version}/CHANGELOG.md";

     

       74
       +
           license = licenses.gpl3Plus;

     

       75
       +
           maintainers = with maintainers; [ dotlambda ];

     

       76
       +
         };

     

       77
       +
       }

+2 -2

pkgs/applications/misc/worker/default.nix

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "worker";

     

       5
       -
         version = "4.5.0";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz";

     

       9
       -
           sha256 = "02xrdg1v784p4gfqjm1mlxqwi40qlbzhp68p5ksj96cjv6av5b5s";

     

       10
        
         };

     

       11
        
       

     

       12
        
         buildInputs = [ libX11 ];

···

       2
        
       

     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "worker";

     

       5
       +
         version = "4.7.0";

     

       6
        
       

     

       7
        
         src = fetchurl {

     

       8
        
           url = "http://www.boomerangsworld.de/cms/worker/downloads/${pname}-${version}.tar.gz";

     

       9
       +
           sha256 = "sha256-9x/nHd2nUeFSH7a2qH4qlyH4FRH/NfNvTE1LEaMMSwU=";

     

       10
        
         };

     

       11
        
       

     

       12
        
         buildInputs = [ libX11 ];

+2

pkgs/applications/networking/browsers/firefox-bin/default.nix

···

       33
        
       , nspr

     

       34
        
       , nss

     

       35
        
       , pango

     

       0
        
       
     

       36
        
       , libheimdal

     

       37
        
       , libpulseaudio

     

       38
        
       , systemd

     
···

       125
        
             nspr

     

       126
        
             nss

     

       127
        
             pango

     

       0
        
       
     

       128
        
             libheimdal

     

       129
        
             libpulseaudio

     

       130
        
             systemd

···

       33
        
       , nspr

     

       34
        
       , nss

     

       35
        
       , pango

     

       36
       +
       , pciutils

     

       37
        
       , libheimdal

     

       38
        
       , libpulseaudio

     

       39
        
       , systemd

     
···

       126
        
             nspr

     

       127
        
             nss

     

       128
        
             pango

     

       129
       +
             pciutils

     

       130
        
             libheimdal

     

       131
        
             libpulseaudio

     

       132
        
             systemd

+2 -2

pkgs/applications/video/qstopmotion/default.nix

···

       24
        
       

     

       25
        
       mkDerivation rec {

     

       26
        
         pname = "qstopmotion";

     

       27
       -
         version = "2.4.1";

     

       28
        
       

     

       29
        
         src = fetchurl {

     

       30
        
           url = "mirror://sourceforge/project/${pname}/Version_${builtins.replaceStrings ["."] ["_"] version}/${pname}-${version}-Source.tar.gz";

     

       31
       -
           sha256 = "03r6jxyq0bak2vsy2b78nk27m7fm96hnl8cx11l3l17704j4iglh";

     

       32
        
         };

     

       33
        
       

     

       34
        
         buildInputs = [

···

       24
        
       

     

       25
        
       mkDerivation rec {

     

       26
        
         pname = "qstopmotion";

     

       27
       +
         version = "2.5.2";

     

       28
        
       

     

       29
        
         src = fetchurl {

     

       30
        
           url = "mirror://sourceforge/project/${pname}/Version_${builtins.replaceStrings ["."] ["_"] version}/${pname}-${version}-Source.tar.gz";

     

       31
       +
           sha256 = "sha256-jyBUyadkSuQKXOrr5XZ1jy6of1Qw8S2HPxuOrPc7RnE=";

     

       32
        
         };

     

       33
        
       

     

       34
        
         buildInputs = [

+2 -2

pkgs/development/compilers/go/1.15.nix

···

       11
        
       

     

       12
        
         inherit (lib) optionals optionalString;

     

       13
        
       

     

       14
       -
         version = "1.15.8";

     

       15
        
       

     

       16
        
         go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };

     

       17
        
       

     
···

       45
        
       

     

       46
        
         src = fetchurl {

     

       47
        
           url = "https://dl.google.com/go/go${version}.src.tar.gz";

     

       48
       -
           sha256 = "1hlphkrsvb5nza5ajm24x4nrhyg4b0afs88kk4jd310hg2vhl32l";

     

       49
        
         };

     

       50
        
       

     

       51
        
         # perl is used for testing go vet

···

       11
        
       

     

       12
        
         inherit (lib) optionals optionalString;

     

       13
        
       

     

       14
       +
         version = "1.15.10";

     

       15
        
       

     

       16
        
         go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };

     

       17
        
       

     
···

       45
        
       

     

       46
        
         src = fetchurl {

     

       47
        
           url = "https://dl.google.com/go/go${version}.src.tar.gz";

     

       48
       +
           sha256 = "0rfx20y13cflv68nn8jci1fx34vfdn7qgyavm5hivd0h15pcmny1";

     

       49
        
         };

     

       50
        
       

     

       51
        
         # perl is used for testing go vet

+2 -2

pkgs/development/compilers/go/1.16.nix

···

       11
        
       

     

       12
        
         inherit (lib) optionals optionalString;

     

       13
        
       

     

       14
       -
         version = "1.16";

     

       15
        
       

     

       16
        
         go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };

     

       17
        
       

     
···

       45
        
       

     

       46
        
         src = fetchurl {

     

       47
        
           url = "https://dl.google.com/go/go${version}.src.tar.gz";

     

       48
       -
           sha256 = "0nn98xiw8zrvxf9f36p8dzc7ihrrkakr0g9jiy4haqb5alyhd23n";

     

       49
        
         };

     

       50
        
       

     

       51
        
         # perl is used for testing go vet

···

       11
        
       

     

       12
        
         inherit (lib) optionals optionalString;

     

       13
        
       

     

       14
       +
         version = "1.16.2";

     

       15
        
       

     

       16
        
         go_bootstrap = buildPackages.callPackage ./bootstrap.nix { };

     

       17
        
       

     
···

       45
        
       

     

       46
        
         src = fetchurl {

     

       47
        
           url = "https://dl.google.com/go/go${version}.src.tar.gz";

     

       48
       +
           sha256 = "1sl33wkhp6pi9f15f6khp5a7l7xwmpc3sp1zmji8pjr3g8l19jip";

     

       49
        
         };

     

       50
        
       

     

       51
        
         # perl is used for testing go vet

+3 -3

pkgs/development/tools/wrangler/default.nix

···

       2
        
       

     

       3
        
       rustPlatform.buildRustPackage rec {

     

       4
        
         pname = "wrangler";

     

       5
       -
         version = "1.13.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "cloudflare";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "0xhldarzb71x4k7ydk4yd6g0qv6y2l0mn2lc43hvl9jm29pnz95q";

     

       12
        
         };

     

       13
        
       

     

       14
       -
         cargoSha256 = "0w845virvw7mvibc76ar2hbffhfzj2v8v1xkrsssrgzyaryb48jk";

     

       15
        
       

     

       16
        
         nativeBuildInputs = [ pkg-config ];

     

       17

···

       2
        
       

     

       3
        
       rustPlatform.buildRustPackage rec {

     

       4
        
         pname = "wrangler";

     

       5
       +
         version = "1.15.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "cloudflare";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-/5iIdEUbesX+IRQQzeJazt3i/xAtghblct718EmYci4=";

     

       12
        
         };

     

       13
        
       

     

       14
       +
         cargoSha256 = "sha256-6XWFhfY8QIl4S6zDyyM2YvFUoGMnKZQ3d/GT4yQWb7A=";

     

       15
        
       

     

       16
        
         nativeBuildInputs = [ pkg-config ];

     

       17

+2 -2

pkgs/development/web/insomnia/default.nix

···

       16
        
         ];

     

       17
        
       in stdenv.mkDerivation rec {

     

       18
        
         pname = "insomnia";

     

       19
       -
         version = "2020.5.2";

     

       20
        
       

     

       21
        
         src = fetchurl {

     

       22
        
           url =

     

       23
        
             "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb";

     

       24
       -
           sha256 = "03j76a0dj3ak5h6malwxqf7cdc2ycwgyr6993bhiq75yhxhblhc4";

     

       25
        
         };

     

       26
        
       

     

       27
        
         nativeBuildInputs =

···

       16
        
         ];

     

       17
        
       in stdenv.mkDerivation rec {

     

       18
        
         pname = "insomnia";

     

       19
       +
         version = "2021.1.0";

     

       20
        
       

     

       21
        
         src = fetchurl {

     

       22
        
           url =

     

       23
        
             "https://github.com/Kong/insomnia/releases/download/core%40${version}/Insomnia.Core-${version}.deb";

     

       24
       +
           sha256 = "sha256-3T334t+Oje6LOzUBqQCK6wdJ/4Mi4WLmW5vcHig8zj4=";

     

       25
        
         };

     

       26
        
       

     

       27
        
         nativeBuildInputs =

+1 -1

pkgs/os-specific/linux/firmware/firmware-linux-nonfree/default.nix

···

       6
        
       

     

       7
        
         src = fetchgit {

     

       8
        
           url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";

     

       9
       -
           rev = lib.replaceStrings ["-"] [""] version;

     

       10
        
           sha256 = "0c85cd659312isfz1r87qswsgfhy0rljagcwspnvjljqrh9bsgzq";

     

       11
        
         };

     

       12

···

       6
        
       

     

       7
        
         src = fetchgit {

     

       8
        
           url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git";

     

       9
       +
           rev = "refs/tags/" + lib.replaceStrings ["-"] [""] version;

     

       10
        
           sha256 = "0c85cd659312isfz1r87qswsgfhy0rljagcwspnvjljqrh9bsgzq";

     

       11
        
         };

     

       12

+3 -3

pkgs/servers/imgproxy/default.nix

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "imgproxy";

     

       5
       -
         version = "2.16.0";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = pname;

     

       9
        
           repo = pname;

     

       10
       -
           sha256 = "sha256-HUWDwUt/yHgwzqtQKsQ3DrBAfL8PBqGhFLMwS7ix5qE=";

     

       11
        
           rev = "v${version}";

     

       12
        
         };

     

       13
        
       

     

       14
       -
         vendorSha256 = "sha256-A03Qdwxv/uUKI4Lfmatqwu1RDH9vKU63Y+x25AdfZXs=";

     

       15
        
       

     

       16
        
         doCheck = false;

     

       17

···

       2
        
       

     

       3
        
       buildGoModule rec {

     

       4
        
         pname = "imgproxy";

     

       5
       +
         version = "2.16.2";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = pname;

     

       9
        
           repo = pname;

     

       10
       +
           sha256 = "sha256-wr4yOrzZT/4WtRze9Yp+M18jusxdddoDd4xs5P7d5oQ=";

     

       11
        
           rev = "v${version}";

     

       12
        
         };

     

       13
        
       

     

       14
       +
         vendorSha256 = "sha256-7IpMgsATQ1SMuBOF9agHIN2Lx6OKxRr0Zk5SRFxHiQ4=";

     

       15
        
       

     

       16
        
         doCheck = false;

     

       17

+2 -2

pkgs/servers/nats-streaming-server/default.nix

···

       4
        
       

     

       5
        
       buildGoPackage rec {

     

       6
        
         pname   = "nats-streaming-server";

     

       7
       -
         version = "0.21.0";

     

       8
        
         goPackagePath = "github.com/nats-io/${pname}";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           rev    = "v${version}";

     

       12
        
           owner  = "nats-io";

     

       13
        
           repo   = pname;

     

       14
       -
           sha256 = "sha256-vZFX5YDf722c7xc4oh4SoL91s7XuZsXzFxW+i//mOUw=";

     

       15
        
         };

     

       16
        
       

     

       17
        
         meta = {

···

       4
        
       

     

       5
        
       buildGoPackage rec {

     

       6
        
         pname   = "nats-streaming-server";

     

       7
       +
         version = "0.21.1";

     

       8
        
         goPackagePath = "github.com/nats-io/${pname}";

     

       9
        
       

     

       10
        
         src = fetchFromGitHub {

     

       11
        
           rev    = "v${version}";

     

       12
        
           owner  = "nats-io";

     

       13
        
           repo   = pname;

     

       14
       +
           sha256 = "sha256-GqnIGnXcOcfbAgUruVxsTSvi6pH1E3QugEmZr3tPiIY=";

     

       15
        
         };

     

       16
        
       

     

       17
        
         meta = {

+3 -3

pkgs/tools/admin/procs/default.nix

···

       2
        
       

     

       3
        
       rustPlatform.buildRustPackage rec {

     

       4
        
         pname = "procs";

     

       5
       -
         version = "0.11.3";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "dalance";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       -
           sha256 = "sha256-OaHsNxrOrPlAwtFDY3Tnx+nOabax98xcGQeNds32iOA=";

     

       12
        
         };

     

       13
        
       

     

       14
       -
         cargoSha256 = "sha256-miOfm1Sw6tIICkT9T2V82cdGG2STo9vuLPWsAN/8wuM=";

     

       15
        
       

     

       16
        
         nativeBuildInputs = [ installShellFiles ];

     

       17

···

       2
        
       

     

       3
        
       rustPlatform.buildRustPackage rec {

     

       4
        
         pname = "procs";

     

       5
       +
         version = "0.11.4";

     

       6
        
       

     

       7
        
         src = fetchFromGitHub {

     

       8
        
           owner = "dalance";

     

       9
        
           repo = pname;

     

       10
        
           rev = "v${version}";

     

       11
       +
           sha256 = "sha256-jqcI0ne6fZkgr4bWJ0ysVNvB7q9ErYbsmZoXI38XUng=";

     

       12
        
         };

     

       13
        
       

     

       14
       +
         cargoSha256 = "sha256-0s5MeWX+rXTyftwg6sReNMRgBzhUMIdHu5buKwg1Yi4=";

     

       15
        
       

     

       16
        
         nativeBuildInputs = [ installShellFiles ];

     

       17

+2 -2

pkgs/tools/filesystems/catcli/default.nix

···

       7
        
       buildPythonApplication rec {

     

       8
        
       

     

       9
        
         pname = "catcli";

     

       10
       -
         version = "0.6.1";

     

       11
        
       

     

       12
        
         src = fetchFromGitHub {

     

       13
        
           owner = "deadc0de6";

     

       14
        
           repo = pname;

     

       15
        
           rev = "v${version}";

     

       16
       -
           sha256 = "1k5xjz353ry0vbmq1ql7brb9g4wwsijzix2zh5zpd768xl8nc1z8";

     

       17
        
         };

     

       18
        
       

     

       19
        
         propagatedBuildInputs = [ docopt anytree ];

···

       7
        
       buildPythonApplication rec {

     

       8
        
       

     

       9
        
         pname = "catcli";

     

       10
       +
         version = "0.6.2";

     

       11
        
       

     

       12
        
         src = fetchFromGitHub {

     

       13
        
           owner = "deadc0de6";

     

       14
        
           repo = pname;

     

       15
        
           rev = "v${version}";

     

       16
       +
           sha256 = "0704022gbm987q6x6vcflq4b4p4hvcqm5ikiyndy5n8fj1q8lq95";

     

       17
        
         };

     

       18
        
       

     

       19
        
         propagatedBuildInputs = [ docopt anytree ];

+2 -2

pkgs/tools/misc/units/default.nix

···

       11
        
       

     

       12
        
       stdenv.mkDerivation rec {

     

       13
        
         pname = "units";

     

       14
       -
         version = "2.19";

     

       15
        
       

     

       16
        
         src = fetchurl {

     

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

     

       18
       -
           sha256 = "0mk562g7dnidjgfgvkxxpvlba66fh1ykmfd9ylzvcln1vxmi6qj2";

     

       19
        
         };

     

       20
        
       

     

       21
        
         pythonEnv = pythonPackages.python.withPackages(ps: [

···

       11
        
       

     

       12
        
       stdenv.mkDerivation rec {

     

       13
        
         pname = "units";

     

       14
       +
         version = "2.21";

     

       15
        
       

     

       16
        
         src = fetchurl {

     

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

     

       18
       +
           sha256 = "sha256-bD6AqfmAWJ/ZYqWFKiZ0ZCJX2xxf1bJ8TZ5mTzSGy68=";

     

       19
        
         };

     

       20
        
       

     

       21
        
         pythonEnv = pythonPackages.python.withPackages(ps: [

+21 -18

pkgs/tools/networking/boundary/default.nix

···

       1
        
       { stdenv, lib, fetchzip }:

     

       2
        
       

     

       3
       -
       let

     

       4
       -
         inherit (stdenv.hostPlatform) system;

     

       5
       -
         suffix = {

     

       6
       -
           x86_64-linux = "linux_amd64";

     

       7
       -
           aarch64-linux = "linux_arm64";

     

       8
       -
           x86_64-darwin = "darwin_amd64";

     

       9
       -
         }."${system}" or (throw "Unsupported system: ${system}");

     

       10
       -
         fetchsrc = version: sha256: fetchzip {

     

       11
       -
             url = "https://releases.hashicorp.com/boundary/${version}/boundary_${version}_${suffix}.zip";

     

       12
       -
             sha256 = sha256."${system}";

     

       13
       -
           };

     

       14
       -
       in

     

       15
        
       stdenv.mkDerivation rec {

     

       16
        
         pname = "boundary";

     

       17
       -
         version = "0.1.7";

     

       18
        
       

     

       19
       -
         src = fetchsrc version {

     

       20
       -
           x86_64-linux = "sha256-cSD9V/Hj/eEc6k+LMNRnSEA94fA6bQUfCgA+XdqAR4k=";

     

       21
       -
           aarch64-linux = "sha256-MG97PhG/t1rdmTF3n2YHYsTo8VODCaY3cfnv8YHgAY8=";

     

       22
       -
           x86_64-darwin = "sha256-p60UiIy9DGx7AaEvmyo4FLa0Z67MQRNJkw1nHaM6eww=";

     

       23
       -
         };

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       24
        
       

     

       25
        
         dontConfigure = true;

     

       26
        
         dontBuild = true;

     

       27
        
       

     

       28
        
         installPhase = ''

     

       0
        
       
     

       29
        
           install -D boundary $out/bin/boundary

     

       0
        
       
     

       30
        
         '';

     

       31
        
       

     

       32
        
         doInstallCheck = true;

···

       1
        
       { stdenv, lib, fetchzip }:

     

       2
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       3
        
       stdenv.mkDerivation rec {

     

       4
        
         pname = "boundary";

     

       5
       +
         version = "0.1.8";

     

       6
        
       

     

       7
       +
         src =

     

       8
       +
           let

     

       9
       +
             inherit (stdenv.hostPlatform) system;

     

       10
       +
             suffix = {

     

       11
       +
               x86_64-linux = "linux_amd64";

     

       12
       +
               aarch64-linux = "linux_arm64";

     

       13
       +
               x86_64-darwin = "darwin_amd64";

     

       14
       +
             }.${system} or (throw "Unsupported system: ${system}");

     

       15
       +
             fetchsrc = version: sha256: fetchzip {

     

       16
       +
               url = "https://releases.hashicorp.com/boundary/${version}/boundary_${version}_${suffix}.zip";

     

       17
       +
               sha256 = sha256.${system};

     

       18
       +
             };

     

       19
       +
           in

     

       20
       +
           fetchsrc version {

     

       21
       +
             x86_64-linux = "sha256-CZueZqN1XoSmqOsocGwUoIZ5878uSHFYW2KDURWRHhM=";

     

       22
       +
             aarch64-linux = "sha256-/pl9MzR4GFjiefc7Sde+jTGi/QaY3U/An8J5+KQR/68=";

     

       23
       +
             x86_64-darwin = "sha256-kkqROFXvEpxRySByGtmGtFJPBr5Dw3BOPQ+bArqLxAA=";

     

       24
       +
           };

     

       25
        
       

     

       26
        
         dontConfigure = true;

     

       27
        
         dontBuild = true;

     

       28
        
       

     

       29
        
         installPhase = ''

     

       30
       +
           runHook preInstall

     

       31
        
           install -D boundary $out/bin/boundary

     

       32
       +
           runHook postInstall

     

       33
        
         '';

     

       34
        
       

     

       35
        
         doInstallCheck = true;

+2 -2

pkgs/tools/system/snooze/default.nix

···

       1
        
       { lib, stdenv, fetchFromGitHub }:

     

       2
        
       stdenv.mkDerivation rec {

     

       3
        
         pname = "snooze";

     

       4
       -
         version = "0.4";

     

       5
        
         src = fetchFromGitHub {

     

       6
        
           owner = "leahneukirchen";

     

       7
        
           repo = "snooze";

     

       8
        
           rev = "v${version}";

     

       9
       -
           sha256 = "0a114brvvjf6vl7grviv0gd6gmikr447m8kq1wilp4yj51sfyxa9";

     

       10
        
         };

     

       11
        
         makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" ];

     

       12

···

       1
        
       { lib, stdenv, fetchFromGitHub }:

     

       2
        
       stdenv.mkDerivation rec {

     

       3
        
         pname = "snooze";

     

       4
       +
         version = "0.5";

     

       5
        
         src = fetchFromGitHub {

     

       6
        
           owner = "leahneukirchen";

     

       7
        
           repo = "snooze";

     

       8
        
           rev = "v${version}";

     

       9
       +
           sha256 = "sha256-K77axli/mapUr3yxpmUfFq4iWwgRmEVUlP6+/0Iezwo=";

     

       10
        
         };

     

       11
        
         makeFlags = [ "DESTDIR=$(out)" "PREFIX=/" ];

     

       12

+2

pkgs/top-level/all-packages.nix

···

       24666
        
       

     

       24667
        
         pidgin-window-merge = callPackage ../applications/networking/instant-messengers/pidgin-plugins/window-merge { };

     

       24668
        
       

     

       0
        
       
     

       0
        
       
     

       24669
        
         purple-discord = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-discord { };

     

       24670
        
       

     

       24671
        
         purple-hangouts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-hangouts { };

···

       24666
        
       

     

       24667
        
         pidgin-window-merge = callPackage ../applications/networking/instant-messengers/pidgin-plugins/window-merge { };

     

       24668
        
       

     

       24669
       +
         pika-backup = callPackage ../applications/backup/pika-backup { };

     

       24670
       +
       

     

       24671
        
         purple-discord = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-discord { };

     

       24672
        
       

     

       24673
        
         purple-hangouts = callPackage ../applications/networking/instant-messengers/pidgin-plugins/purple-hangouts { };