commit f876e1f1e910b70ce100da7a555dd5262d407960 · pyrox.dev/nixpkgs

+2 -2

doc/languages-frameworks/haskell.section.md

···

       195
       195
        
       possible to get the dependencies of a legacy project from nixpkgs or to use a

     

       196
       196
        
       specific stack solver for compiling a project.

     

       197
       197
        
       

     

       198
       198
       -
       Even though we couldn‘t use them directly in nixpkgs, it would be desirable

     

       198
       198
       +
       Even though we couldn’t use them directly in nixpkgs, it would be desirable

     

       199
       199
        
       to have tooling to generate working Nix package sets from build plans generated

     

       200
       200
        
       by `cabal-install` or a specific Stackage snapshot via import-from-derivation.

     

       201
       201
        
       Sadly we currently don’t have tooling for this. For this you might be

     
···

       538
       538
        
       When using `cabal-install` for dependency resolution you need to be a bit

     

       539
       539
        
       careful to achieve build purity. `cabal-install` will find and use all

     

       540
       540
        
       dependencies installed from the packages `env` via Nix, but it will also

     

       541
       541
       -
       consult Hackage to potentially download and compile dependencies if it can‘t

     

       541
       541
       +
       consult Hackage to potentially download and compile dependencies if it can’t

     

       542
       542
        
       find a valid build plan locally. To prevent this you can either never run

     

       543
       543
        
       `cabal update`, remove the cabal database from your `~/.cabal` folder or run

     

       544
       544
        
       `cabal` with `--offline`. Note though, that for some usecases `cabal2nix` needs

+1

doc/languages-frameworks/index.xml

···

       38
       38
        
        <xi:include href="r.section.xml" />

     

       39
       39
        
        <xi:include href="ruby.section.xml" />

     

       40
       40
        
        <xi:include href="rust.section.xml" />

     

       41
       41
       +
        <xi:include href="swift.section.xml" />

     

       41
       42
        
        <xi:include href="texlive.section.xml" />

     

       42
       43
        
        <xi:include href="titanium.section.xml" />

     

       43
       44
        
        <xi:include href="vim.section.xml" />

+45 -3

doc/languages-frameworks/pkg-config.section.md

···

       4
       4
        
       

     

       5
       5
        
       Nixpkgs provides a couple of facilities for working with this tool.

     

       6
       6
        
       

     

       7
       7
       -
        - A [setup hook](#setup-hook-pkg-config) bundled with in the `pkg-config` package, to bring a derivation's declared build inputs into the environment.

     

       8
       8
       -
        - The [`validatePkgConfig` setup hook](https://nixos.org/manual/nixpkgs/stable/#validatepkgconfig), for packages that provide pkg-config modules.

     

       9
       9
       -
        - The `defaultPkgConfigPackages` package set: a set of aliases, named after the modules they provide. This is meant to be used by language-to-nix integrations. Hand-written packages should use the normal Nixpkgs attribute name instead.

     

       7
       7
       +
       ## Writing packages providing pkg-config modules

     

       8
       8
       +
       

     

       9
       9
       +
       Packages should set `meta.pkgConfigProvides` with the list of package config modules they provide.

     

       10
       10
       +
       They should also use `testers.testMetaPkgConfig` to check that the final built package matches that list.

     

       11
       11
       +
       Additionally, the [`validatePkgConfig` setup hook](https://nixos.org/manual/nixpkgs/stable/#validatepkgconfig), will do extra checks on to-be-installed pkg-config modules.

     

       12
       12
       +
       

     

       13
       13
       +
       A good example of all these things is zlib:

     

       14
       14
       +
       

     

       15
       15
       +
       ```

     

       16
       16
       +
       { pkg-config, testers, ... }:

     

       17
       17
       +
       

     

       18
       18
       +
       stdenv.mkDerivation (finalAttrs: {

     

       19
       19
       +
         ...

     

       20
       20
       +
       

     

       21
       21
       +
         nativeBuildInputs = [ pkg-config validatePkgConfig ];

     

       22
       22
       +
       

     

       23
       23
       +
         passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

     

       24
       24
       +
       

     

       25
       25
       +
         meta = {

     

       26
       26
       +
           ...

     

       27
       27
       +
           pkgConfigModules = [ "zlib" ];

     

       28
       28
       +
         };

     

       29
       29
       +
       })

     

       30
       30
       +
       ```

     

       31
       31
       +
       

     

       32
       32
       +
       ## Accessing packages via pkg-config module name

     

       33
       33
       +
       

     

       34
       34
       +
       ### Within Nixpkgs

     

       35
       35
       +
       

     

       36
       36
       +
       A [setup hook](#setup-hook-pkg-config) is bundled in the `pkg-config` package to bring a derivation's declared build inputs into the environment.

     

       37
       37
       +
       This will populate environment variables like `PKG_CONFIG_PATH`, `PKG_CONFIG_PATH_FOR_BUILD`, and `PKG_CONFIG_PATH_HOST` based on:

     

       38
       38
       +
       

     

       39
       39
       +
        - how `pkg-config` itself is depended upon

     

       40
       40
       +
       

     

       41
       41
       +
        - how other dependencies are depended upon

     

       42
       42
       +
       

     

       43
       43
       +
       For more details see the section on [specifying dependencies in general](#ssec-stdenv-dependencies).

     

       44
       44
       +
       

     

       45
       45
       +
       Normal pkg-config commands to look up dependencies by name will then work with those environment variables defined by the hook.

     

       46
       46
       +
       

     

       47
       47
       +
       ### Externally

     

       48
       48
       +
       

     

       49
       49
       +
       The `defaultPkgConfigPackages` package set is a set of aliases, named after the modules they provide.

     

       50
       50
       +
       This is meant to be used by language-to-nix integrations.

     

       51
       51
       +
       Hand-written packages should use the normal Nixpkgs attribute name instead.

+176

doc/languages-frameworks/swift.section.md

···

       1
       1
       +
       # Swift {#swift}

     

       2
       2
       +
       

     

       3
       3
       +
       The Swift compiler is provided by the `swift` package:

     

       4
       4
       +
       

     

       5
       5
       +
       ```sh

     

       6
       6
       +
       # Compile and link a simple executable.

     

       7
       7
       +
       nix-shell -p swift --run 'swiftc -' <<< 'print("Hello world!")'

     

       8
       8
       +
       # Run it!

     

       9
       9
       +
       ./main

     

       10
       10
       +
       ```

     

       11
       11
       +
       

     

       12
       12
       +
       The `swift` package also provides the `swift` command, with some caveats:

     

       13
       13
       +
       

     

       14
       14
       +
       - Swift Package Manager (SwiftPM) is packaged separately as `swiftpm`. If you

     

       15
       15
       +
         need functionality like `swift build`, `swift run`, `swift test`, you must

     

       16
       16
       +
         also add the `swiftpm` package to your closure.

     

       17
       17
       +
       - On Darwin, the `swift repl` command requires an Xcode installation. This is

     

       18
       18
       +
         because it uses the system LLDB debugserver, which has special entitlements.

     

       19
       19
       +
       

     

       20
       20
       +
       ## Module search paths {#ssec-swift-module-search-paths}

     

       21
       21
       +
       

     

       22
       22
       +
       Like other toolchains in Nixpkgs, the Swift compiler executables are wrapped

     

       23
       23
       +
       to help Swift find your application's dependencies in the Nix store. These

     

       24
       24
       +
       wrappers scan the `buildInputs` of your package derivation for specific

     

       25
       25
       +
       directories where Swift modules are placed by convention, and automatically

     

       26
       26
       +
       add those directories to the Swift compiler search paths.

     

       27
       27
       +
       

     

       28
       28
       +
       Swift follows different conventions depending on the platform. The wrappers

     

       29
       29
       +
       look for the following directories:

     

       30
       30
       +
       

     

       31
       31
       +
       - On Darwin platforms: `lib/swift/macosx`

     

       32
       32
       +
         (If not targeting macOS, replace `macosx` with the Xcode platform name.)

     

       33
       33
       +
       - On other platforms: `lib/swift/linux/x86_64`

     

       34
       34
       +
         (Where `linux` and `x86_64` are from lowercase `uname -sm`.)

     

       35
       35
       +
       - For convenience, Nixpkgs also adds simply `lib/swift` to the search path.

     

       36
       36
       +
         This can save a bit of work packaging Swift modules, because many Nix builds

     

       37
       37
       +
         will produce output for just one target any way.

     

       38
       38
       +
       

     

       39
       39
       +
       ## Core libraries {#ssec-swift-core-libraries}

     

       40
       40
       +
       

     

       41
       41
       +
       In addition to the standard library, the Swift toolchain contains some

     

       42
       42
       +
       additional 'core libraries' that, on Apple platforms, are normally distributed

     

       43
       43
       +
       as part of the OS or Xcode. These are packaged separately in Nixpkgs, and can

     

       44
       44
       +
       be found (for use in `buildInputs`) as:

     

       45
       45
       +
       

     

       46
       46
       +
       - `swiftPackages.Dispatch`

     

       47
       47
       +
       - `swiftPackages.Foundation`

     

       48
       48
       +
       - `swiftPackages.XCTest`

     

       49
       49
       +
       

     

       50
       50
       +
       ## Packaging with SwiftPM {#ssec-swift-packaging-with-swiftpm}

     

       51
       51
       +
       

     

       52
       52
       +
       Nixpkgs includes a small helper `swiftpm2nix` that can fetch your SwiftPM

     

       53
       53
       +
       dependencies for you, when you need to write a Nix expression to package your

     

       54
       54
       +
       application.

     

       55
       55
       +
       

     

       56
       56
       +
       The first step is to run the generator:

     

       57
       57
       +
       

     

       58
       58
       +
       ```sh

     

       59
       59
       +
       cd /path/to/my/project

     

       60
       60
       +
       # Enter a Nix shell with the required tools.

     

       61
       61
       +
       nix-shell -p swift swiftpm swiftpm2nix

     

       62
       62
       +
       # First, make sure the workspace is up-to-date.

     

       63
       63
       +
       swift package resolve

     

       64
       64
       +
       # Now generate the Nix code.

     

       65
       65
       +
       swiftpm2nix

     

       66
       66
       +
       ```

     

       67
       67
       +
       

     

       68
       68
       +
       This produces some files in a directory `nix`, which will be part of your Nix

     

       69
       69
       +
       expression. The next step is to write that expression:

     

       70
       70
       +
       

     

       71
       71
       +
       ```nix

     

       72
       72
       +
       { stdenv, swift, swiftpm, swiftpm2nix, fetchFromGitHub }:

     

       73
       73
       +
       

     

       74
       74
       +
       let

     

       75
       75
       +
         # Pass the generated files to the helper.

     

       76
       76
       +
         generated = swiftpm2nix.helpers ./nix;

     

       77
       77
       +
       in

     

       78
       78
       +
       

     

       79
       79
       +
       stdenv.mkDerivation rec {

     

       80
       80
       +
         pname = "myproject";

     

       81
       81
       +
         version = "0.0.0";

     

       82
       82
       +
       

     

       83
       83
       +
         src = fetchFromGitHub {

     

       84
       84
       +
           owner = "nixos";

     

       85
       85
       +
           repo = pname;

     

       86
       86
       +
           rev = version;

     

       87
       87
       +
           hash = "sha256-AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA=";

     

       88
       88
       +
         };

     

       89
       89
       +
       

     

       90
       90
       +
         # Including SwiftPM as a nativeBuildInput provides a buildPhase for you.

     

       91
       91
       +
         # This by default performs a release build using SwiftPM, essentially:

     

       92
       92
       +
         #   swift build -c release

     

       93
       93
       +
         nativeBuildInputs = [ swift swiftpm ];

     

       94
       94
       +
       

     

       95
       95
       +
         # The helper provides a configure snippet that will prepare all dependencies

     

       96
       96
       +
         # in the correct place, where SwiftPM expects them.

     

       97
       97
       +
         configurePhase = generated.configure;

     

       98
       98
       +
       

     

       99
       99
       +
         installPhase = ''

     

       100
       100
       +
           # This is a special function that invokes swiftpm to find the location

     

       101
       101
       +
           # of the binaries it produced.

     

       102
       102
       +
           binPath="$(swiftpmBinPath)"

     

       103
       103
       +
           # Now perform any installation steps.

     

       104
       104
       +
           mkdir -p $out/bin

     

       105
       105
       +
           cp $binPath/myproject $out/bin/

     

       106
       106
       +
         '';

     

       107
       107
       +
       }

     

       108
       108
       +
       ```

     

       109
       109
       +
       

     

       110
       110
       +
       ### Custom build flags {#ssec-swiftpm-custom-build-flags}

     

       111
       111
       +
       

     

       112
       112
       +
       If you'd like to build a different configuration than `release`:

     

       113
       113
       +
       

     

       114
       114
       +
       ```nix

     

       115
       115
       +
       swiftpmBuildConfig = "debug";

     

       116
       116
       +
       ```

     

       117
       117
       +
       

     

       118
       118
       +
       It is also possible to provide additional flags to `swift build`:

     

       119
       119
       +
       

     

       120
       120
       +
       ```nix

     

       121
       121
       +
       swiftpmFlags = [ "--disable-dead-strip" ];

     

       122
       122
       +
       ```

     

       123
       123
       +
       

     

       124
       124
       +
       The default `buildPhase` already passes `-j` for parallel building.

     

       125
       125
       +
       

     

       126
       126
       +
       If these two customization options are insufficient, simply provide your own

     

       127
       127
       +
       `buildPhase` that invokes `swift build`.

     

       128
       128
       +
       

     

       129
       129
       +
       ### Running tests {#ssec-swiftpm-running-tests}

     

       130
       130
       +
       

     

       131
       131
       +
       Including `swiftpm` in your `nativeBuildInputs` also provides a default

     

       132
       132
       +
       `checkPhase`, but it must be enabled with:

     

       133
       133
       +
       

     

       134
       134
       +
       ```nix

     

       135
       135
       +
       doCheck = true;

     

       136
       136
       +
       ```

     

       137
       137
       +
       

     

       138
       138
       +
       This essentially runs: `swift test -c release`

     

       139
       139
       +
       

     

       140
       140
       +
       ### Patching dependencies {#ssec-swiftpm-patching-dependencies}

     

       141
       141
       +
       

     

       142
       142
       +
       In some cases, it may be necessary to patch a SwiftPM dependency. SwiftPM

     

       143
       143
       +
       dependencies are located in `.build/checkouts`, but the `swiftpm2nix` helper

     

       144
       144
       +
       provides these as symlinks to read-only `/nix/store` paths. In order to patch

     

       145
       145
       +
       them, we need to make them writable.

     

       146
       146
       +
       

     

       147
       147
       +
       A special function `swiftpmMakeMutable` is available to replace the symlink

     

       148
       148
       +
       with a writable copy:

     

       149
       149
       +
       

     

       150
       150
       +
       ```

     

       151
       151
       +
       configurePhase = generated.configure ++ ''

     

       152
       152
       +
         # Replace the dependency symlink with a writable copy.

     

       153
       153
       +
         swiftpmMakeMutable swift-crypto

     

       154
       154
       +
         # Now apply a patch.

     

       155
       155
       +
         patch -p1 -d .build/checkouts/swift-crypto -i ${./some-fix.patch}

     

       156
       156
       +
       '';

     

       157
       157
       +
       ```

     

       158
       158
       +
       

     

       159
       159
       +
       ## Considerations for custom build tools {#ssec-swift-considerations-for-custom-build-tools}

     

       160
       160
       +
       

     

       161
       161
       +
       ### Linking the standard library {#ssec-swift-linking-the-standard-library}

     

       162
       162
       +
       

     

       163
       163
       +
       The `swift` package has a separate `lib` output containing just the Swift

     

       164
       164
       +
       standard library, to prevent Swift applications needing a dependency on the

     

       165
       165
       +
       full Swift compiler at run-time. Linking with the Nixpkgs Swift toolchain

     

       166
       166
       +
       already ensures binaries correctly reference the `lib` output.

     

       167
       167
       +
       

     

       168
       168
       +
       Sometimes, Swift is used only to compile part of a mixed codebase, and the

     

       169
       169
       +
       link step is manual. Custom build tools often locate the standard library

     

       170
       170
       +
       relative to the `swift` compiler executable, and while the result will work,

     

       171
       171
       +
       when this path ends up in the binary, it will have the Swift compiler as an

     

       172
       172
       +
       unintended dependency.

     

       173
       173
       +
       

     

       174
       174
       +
       In this case, you should investigate how your build process discovers the

     

       175
       175
       +
       standard library, and override the path. The correct path will be something

     

       176
       176
       +
       like: `"${swift.swift.lib}/${swift.swiftModuleSubdir}"`

+1 -1

nixos/maintainers/scripts/lxd/lxd-image-inner.nix

···

       89
       89
        
       

     

       90
       90
        
         # This value determines the NixOS release from which the default

     

       91
       91
        
         # settings for stateful data, like file locations and database versions

     

       92
       92
       -
         # on your system were taken. It‘s perfectly fine and recommended to leave

     

       92
       92
       +
         # on your system were taken. It’s perfectly fine and recommended to leave

     

       93
       93
        
         # this value at the release version of the first install of this system.

     

       94
       94
        
         # Before changing this value read the documentation for this option

     

       95
       95
        
         # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).

+1

nixos/modules/config/no-x-libs.nix

···

       46
       46
        
             libextractor = super.libextractor.override { gtkSupport = false; };

     

       47
       47
        
             libva = super.libva-minimal;

     

       48
       48
        
             limesuite = super.limesuite.override { withGui = false; };

     

       49
       49
       +
             mc = super.mc.override { x11Support = false; };

     

       49
       50
        
             mpv-unwrapped = super.mpv-unwrapped.override { sdl2Support = false; x11Support = false; };

     

       50
       51
        
             msmtp = super.msmtp.override { withKeyring = false; };

     

       51
       52
        
             neofetch = super.neofetch.override { x11Support = false; };

+1 -1

nixos/modules/installer/tools/tools.nix

···

       217
       217
        
       

     

       218
       218
        
               # This value determines the NixOS release from which the default

     

       219
       219
        
               # settings for stateful data, like file locations and database versions

     

       220
       220
       -
               # on your system were taken. It‘s perfectly fine and recommended to leave

     

       220
       220
       +
               # on your system were taken. It’s perfectly fine and recommended to leave

     

       221
       221
        
               # this value at the release version of the first install of this system.

     

       222
       222
        
               # Before changing this value read the documentation for this option

     

       223
       223
        
               # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).

+1 -1

nixos/modules/misc/version.nix

···

       130
       130
        
               to be compatible. The effect is that NixOS will use

     

       131
       131
        
               defaults corresponding to the specified release (such as using

     

       132
       132
        
               an older version of PostgreSQL).

     

       133
       133
       -
               It‘s perfectly fine and recommended to leave this value at the

     

       133
       133
       +
               It’s perfectly fine and recommended to leave this value at the

     

       134
       134
        
               release version of the first install of this system.

     

       135
       135
        
               Changing this option will not upgrade your system. In fact it

     

       136
       136
        
               is meant to stay constant exactly when you upgrade your system.

+2 -2

pkgs/applications/audio/musikcube/default.nix

···

       28
       28
        
       

     

       29
       29
        
       stdenv.mkDerivation rec {

     

       30
       30
        
         pname = "musikcube";

     

       31
       31
       -
         version = "0.99.4";

     

       31
       31
       +
         version = "0.99.5";

     

       32
       32
        
       

     

       33
       33
        
         src = fetchFromGitHub {

     

       34
       34
        
           owner = "clangen";

     

       35
       35
        
           repo = pname;

     

       36
       36
        
           rev = version;

     

       37
       37
       -
           sha256 = "sha256-GAO3CKtlZF8Ol4K+40lD8n2RtewiHj3f59d5RIatNws=";

     

       37
       37
       +
           sha256 = "sha256-SbWL36GRIJPSvxZyj6sebJxTkSPsUcsKyC3TmcIq2O0";

     

       38
       38
        
         };

     

       39
       39
        
       

     

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

+4 -7

pkgs/applications/file-managers/mc/default.nix

···

       6
       6
        
       , gpm

     

       7
       7
        
       , file

     

       8
       8
        
       , e2fsprogs

     

       9
       9
       -
       , libX11

     

       10
       9
        
       , libICE

     

       11
       10
        
       , perl

     

       12
       11
        
       , zip

     
···

       17
       16
        
       , openssl

     

       18
       17
        
       , coreutils

     

       19
       18
        
       , autoSignDarwinBinariesHook

     

       19
       19
       +
       , x11Support ? true, libX11

     

       20
       20
        
       

     

       21
       21
        
       # updater only

     

       22
       22
        
       , writeScript

     
···

       43
       43
        
           gettext

     

       44
       44
        
           glib

     

       45
       45
        
           libICE

     

       46
       46
       -
           libX11

     

       47
       46
        
           libssh2

     

       48
       47
        
           openssl

     

       49
       48
        
           slang

     

       50
       49
        
           zip

     

       51
       51
       -
         ] ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];

     

       50
       50
       +
         ] ++ lib.optional x11Support [ libX11 ]

     

       51
       51
       +
           ++ lib.optionals (!stdenv.isDarwin) [ e2fsprogs gpm ];

     

       52
       52
        
       

     

       53
       53
        
         enableParallelBuilding = true;

     

       54
       54
        
       

     
···

       66
       66
        
         postPatch = ''

     

       67
       67
        
           substituteInPlace src/filemanager/ext.c \

     

       68
       68
        
             --replace /bin/rm ${coreutils}/bin/rm

     

       69
       69
       -
       

     

       70
       70
       -
           substituteInPlace misc/ext.d/misc.sh.in \

     

       71
       71
       -
             --replace /bin/cat ${coreutils}/bin/cat

     

       72
       69
        
         '';

     

       73
       70
        
       

     

       74
       74
       -
         postFixup = lib.optionalString (!stdenv.isDarwin) ''

     

       71
       71
       +
         postFixup = lib.optionalString ((!stdenv.isDarwin) && x11Support) ''

     

       75
       72
        
           # libX11.so is loaded dynamically so autopatch doesn't detect it

     

       76
       73
        
           patchelf \

     

       77
       74
        
             --add-needed ${libX11}/lib/libX11.so \

+2 -1

pkgs/applications/misc/auto-multiple-choice/default.nix

···

       42
       42
        
           # Relative paths.

     

       43
       43
        
           "BINDIR=/bin"

     

       44
       44
        
           "PERLDIR=/share/perl5"

     

       45
       45
       -
           "MODSDIR=/lib/"

     

       45
       45
       +
           "MODSDIR=/nonexistent" # AMC will test for that dir before

     

       46
       46
       +
           # defaulting to the "portable" strategy, so this test *must* fail.

     

       46
       47
        
           "TEXDIR=/tex/latex/" # what texlive.combine expects

     

       47
       48
        
           "TEXDOCDIR=/share/doc/texmf/" # TODO where to put this?

     

       48
       49
        
           "MAN1DIR=/share/man/man1"

+2 -2

pkgs/applications/misc/toot/default.nix

···

       2
       2
        
       

     

       3
       3
        
       python3Packages.buildPythonApplication rec {

     

       4
       4
        
         pname = "toot";

     

       5
       5
       -
         version = "0.33.1";

     

       5
       5
       +
         version = "0.34.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner  = "ihabunek";

     

       9
       9
        
           repo   = "toot";

     

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

     

       11
       11
       -
           sha256 = "sha256-qZk42zGHWpeN5rZPFw7xAmDIvhPzqTePU3If+p/L98c=";

     

       11
       11
       +
           sha256 = "sha256-UQR3BaBcnD2o7QJEBQmdZdtVaTo9R5vSHiUxywy1OaY=";

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
        
         nativeCheckInputs = with python3Packages; [ pytest ];

+8 -2

pkgs/applications/video/obs-studio/plugins/obs-vaapi/default.nix

···

       11
       11
        
       

     

       12
       12
        
       stdenv.mkDerivation rec {

     

       13
       13
        
         pname = "obs-vaapi";

     

       14
       14
       -
         version = "0.1.0";

     

       14
       14
       +
         version = "0.2.0";

     

       15
       15
        
       

     

       16
       16
        
         src = fetchFromGitHub {

     

       17
       17
        
           owner = "fzwoch";

     

       18
       18
        
           repo = pname;

     

       19
       19
        
           rev = version;

     

       20
       20
       -
           hash = "sha256-qA4xVVShkp40QHp2HmmRzVxQaBwskRpUNEULKetVMu8=";

     

       20
       20
       +
           hash = "sha256-wrbVuqIe+DY3R+Jp3zCy2Uw3fv5ejYHtRV2Sv+y/n0w=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         nativeBuildInputs = [ pkg-config meson ninja ];

     
···

       38
       38
        
             gst-plugins-bad

     

       39
       39
        
             gst-vaapi

     

       40
       40
        
           ];

     

       41
       41
       +
       

     

       42
       42
       +
         # Fix output directory

     

       43
       43
       +
         postInstall = ''

     

       44
       44
       +
           mkdir $out/lib/obs-plugins

     

       45
       45
       +
           mv $out/lib/obs-vaapi.so $out/lib/obs-plugins/

     

       46
       46
       +
         '';

     

       41
       47
        
       

     

       42
       48
        
         meta = with lib; {

     

       43
       49
        
           description = "OBS Studio VAAPI support via GStreamer";

+1

pkgs/build-support/testers/default.nix

···

       123
       123
        
       

     

       124
       124
        
         hasPkgConfigModule = callPackage ./hasPkgConfigModule/tester.nix { };

     

       125
       125
        
       

     

       126
       126
       +
         testMetaPkgConfig = callPackage ./testMetaPkgConfig/tester.nix { };

     

       126
       127
        
       }

+14

pkgs/build-support/testers/testMetaPkgConfig/tester.nix

···

       1
       1
       +
       { lib, runCommand, testers }:

     

       2
       2
       +
       

     

       3
       3
       +
       package:

     

       4
       4
       +
       

     

       5
       5
       +
       runCommand "check-meta-pkg-config-modules-for-${package.name}" {

     

       6
       6
       +
         meta = {

     

       7
       7
       +
           description = "Test whether ${package.name} exposes all pkg-config modules ${toString package.meta.pkgConfigModules}";

     

       8
       8
       +
         };

     

       9
       9
       +
         dependsOn = map

     

       10
       10
       +
           (moduleName: testers.hasPkgConfigModule { inherit package moduleName; })

     

       11
       11
       +
           package.meta.pkgConfigModules;

     

       12
       12
       +
       } ''

     

       13
       13
       +
         echo "found all of ${toString package.meta.pkgConfigModules}" > "$out"

     

       14
       14
       +
       ''

+1 -1

pkgs/development/haskell-modules/configuration-common.nix

···

       1139
       1139
        
         # 2021-12-26: Too strict bounds on doctest

     

       1140
       1140
        
         polysemy-plugin = doJailbreak super.polysemy-plugin;

     

       1141
       1141
        
       

     

       1142
       1142
       -
         # hasn‘t bumped upper bounds

     

       1142
       1142
       +
         # hasn’t bumped upper bounds

     

       1143
       1143
        
         # upstream: https://github.com/obsidiansystems/which/pull/6

     

       1144
       1144
        
         which = doJailbreak super.which;

     

       1145
       1145

+2 -2

pkgs/development/haskell-modules/configuration-ghc-8.10.x.nix

···

       69
       69
        
         # Pick right versions for GHC-specific packages

     

       70
       70
        
         ghc-api-compat = doDistribute (unmarkBroken self.ghc-api-compat_8_10_7);

     

       71
       71
        
       

     

       72
       72
       -
         # ghc versions which don‘t match the ghc-lib-parser-ex version need the

     

       72
       72
       +
         # ghc versions which don’t match the ghc-lib-parser-ex version need the

     

       73
       73
        
         # additional dependency to compile successfully.

     

       74
       74
        
         ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser super.ghc-lib-parser-ex;

     

       75
       75
        
       

     
···

       77
       77
        
         base-noprelude = doJailbreak super.base-noprelude;

     

       78
       78
        
         unliftio-core = doJailbreak super.unliftio-core;

     

       79
       79
        
       

     

       80
       80
       -
         # Jailbreaking because monoidal-containers hasn‘t bumped it's base dependency for 8.10.

     

       80
       80
       +
         # Jailbreaking because monoidal-containers hasn’t bumped it's base dependency for 8.10.

     

       81
       81
        
         monoidal-containers = doJailbreak super.monoidal-containers;

     

       82
       82
        
       

     

       83
       83
        
         # Jailbreak to fix the build.

+2 -2

pkgs/development/haskell-modules/configuration-ghc-8.6.x.nix

···

       94
       94
        
         # ghc versions prior to 8.8.x needs additional dependency to compile successfully.

     

       95
       95
        
         ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser super.ghc-lib-parser-ex;

     

       96
       96
        
       

     

       97
       97
       -
         # This became a core library in ghc 8.10., so we don‘t have an "exception" attribute anymore.

     

       97
       97
       +
         # This became a core library in ghc 8.10., so we don’t have an "exception" attribute anymore.

     

       98
       98
        
         exceptions = super.exceptions_0_10_4;

     

       99
       99
        
       

     

       100
       100
        
         # Older compilers need the latest ghc-lib to build this package.

     

       101
       101
        
         hls-hlint-plugin = addBuildDepend self.ghc-lib super.hls-hlint-plugin;

     

       102
       102
        
       

     

       103
       103
       -
         # vector 0.12.2 indroduced doctest checks that don‘t work on older compilers

     

       103
       103
       +
         # vector 0.12.2 indroduced doctest checks that don’t work on older compilers

     

       104
       104
        
         vector = dontCheck super.vector;

     

       105
       105
        
       

     

       106
       106
        
         mmorph = super.mmorph_1_1_3;

+3 -3

pkgs/development/haskell-modules/configuration-ghc-8.8.x.nix

···

       125
       125
        
         liquid-vector = markBroken super.liquid-vector;

     

       126
       126
        
         liquidhaskell = markBroken super.liquidhaskell;

     

       127
       127
        
       

     

       128
       128
       -
         # This became a core library in ghc 8.10., so we don‘t have an "exception" attribute anymore.

     

       128
       128
       +
         # This became a core library in ghc 8.10., so we don’t have an "exception" attribute anymore.

     

       129
       129
        
         exceptions = super.exceptions_0_10_7;

     

       130
       130
        
       

     

       131
       131
        
         ormolu = super.ormolu_0_2_0_0;

     

       132
       132
        
       

     

       133
       133
       -
         # vector 0.12.2 indroduced doctest checks that don‘t work on older compilers

     

       133
       133
       +
         # vector 0.12.2 indroduced doctest checks that don’t work on older compilers

     

       134
       134
        
         vector = dontCheck super.vector;

     

       135
       135
        
       

     

       136
       136
        
         ghc-api-compat = doDistribute (unmarkBroken super.ghc-api-compat_8_6);

     
···

       143
       143
        
       

     

       144
       144
        
         ghc-lib-parser = self.ghc-lib-parser_8_10_7_20220219;

     

       145
       145
        
       

     

       146
       146
       -
         # ghc versions which don‘t match the ghc-lib-parser-ex version need the

     

       146
       146
       +
         # ghc versions which don’t match the ghc-lib-parser-ex version need the

     

       147
       147
        
         # additional dependency to compile successfully.

     

       148
       148
        
         ghc-lib-parser-ex = addBuildDepend self.ghc-lib-parser self.ghc-lib-parser-ex_8_10_0_24;

     

       149
       149

+1 -1

pkgs/development/haskell-modules/configuration-hackage2nix/main.yaml

···

       667
       667
        
         - yices-easy

     

       668
       668
        
         - yices-painless

     

       669
       669
        
       

     

       670
       670
       -
         # These packages don‘t build because they use deprecated webkit versions.

     

       670
       670
       +
         # These packages don’t build because they use deprecated webkit versions.

     

       671
       671
        
         - diagrams-hsqml

     

       672
       672
        
         - dialog

     

       673
       673
        
         - ghcjs-dom-webkit

+1 -1

pkgs/development/haskell-modules/configuration-nix.nix

···

       1115
       1115
        
           hls-splice-plugin

     

       1116
       1116
        
           hls-refactor-plugin

     

       1117
       1117
        
           hls-cabal-plugin;

     

       1118
       1118
       -
         # Tests have file permissions expections that don‘t work with the nix store.

     

       1118
       1118
       +
         # Tests have file permissions expections that don’t work with the nix store.

     

       1119
       1119
        
         hls-stylish-haskell-plugin = dontCheck super.hls-stylish-haskell-plugin;

     

       1120
       1120
        
         hls-gadt-plugin = dontCheck super.hls-gadt-plugin;

     

       1121
       1121

+2 -2

pkgs/development/interpreters/clojure/babashka.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGraalvmNativeImage rec {

     

       4
       4
        
         pname = "babashka";

     

       5
       5
       -
         version = "1.1.172";

     

       5
       5
       +
         version = "1.1.173";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/babashka/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar";

     

       9
       9
       -
           sha256 = "sha256-mdcG4zKC9zX0J2S2lWCvFdFFr5sOxfOe9/iPzvEyImM=";

     

       9
       9
       +
           sha256 = "sha256-p/KGDCocTksvUwj6x5l1xUEM1OZ4pNHtXL4mTgg7JUI=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         executable = "bb";

+2 -2

pkgs/development/libraries/qt-6/modules/qtbase.nix

···

       222
       222
        
           "-DQT_FEATURE_journald=${if systemdSupport then "ON" else "OFF"}"

     

       223
       223
        
           "-DQT_FEATURE_vulkan=ON"

     

       224
       224
        
         ] ++ lib.optionals stdenv.isDarwin [

     

       225
       225
       -
           # build as a set of dynamic libraries

     

       226
       226
       -
           "-DFEATURE_framework=OFF"

     

       225
       225
       +
           # error: 'path' is unavailable: introduced in macOS 10.15

     

       226
       226
       +
           "-DQT_FEATURE_cxx17_filesystem=OFF"

     

       227
       227
        
         ];

     

       228
       228
        
       

     

       229
       229
        
         NIX_LDFLAGS = toString (lib.optionals stdenv.isDarwin [

+9 -3

pkgs/development/libraries/zlib/default.nix

···

       8
       8
        
       # the `.pc` file lists only the main output's lib dir.

     

       9
       9
        
       # If false, and if `{ static = true; }`, the .a stays in the main output.

     

       10
       10
        
       , splitStaticOutput ? shared && static

     

       11
       11
       +
       , testers

     

       11
       12
        
       }:

     

       12
       13
        
       

     

       13
       14
        
       # Without either the build will actually still succeed because the build

     
···

       21
       22
        
       

     

       22
       23
        
       assert splitStaticOutput -> static;

     

       23
       24
        
       

     

       24
       24
       -
       stdenv.mkDerivation rec {

     

       25
       25
       +
       stdenv.mkDerivation (finalAttrs: {

     

       25
       26
        
         pname = "zlib";

     

       26
       27
        
         version = "1.2.13";

     

       27
       28
        
       

     

       28
       28
       -
         src = fetchurl {

     

       29
       29
       +
         src = let

     

       30
       30
       +
           inherit (finalAttrs) version;

     

       31
       31
       +
         in fetchurl {

     

       29
       32
        
           urls = [

     

       30
       33
        
             # This URL works for 1.2.13 only; hopefully also for future releases.

     

       31
       34
        
             "https://github.com/madler/zlib/releases/download/v${version}/zlib-${version}.tar.gz"

     
···

       125
       128
        
           "SHARED_MODE=1"

     

       126
       129
        
         ];

     

       127
       130
        
       

     

       131
       131
       +
         passthru.tests.pkg-config = testers.testMetaPkgConfig finalAttrs.finalPackage;

     

       132
       132
       +
       

     

       128
       133
        
         meta = with lib; {

     

       129
       134
        
           homepage = "https://zlib.net";

     

       130
       135
        
           description = "Lossless data-compression library";

     

       131
       136
        
           license = licenses.zlib;

     

       132
       137
        
           platforms = platforms.all;

     

       138
       138
       +
           pkgConfigModules = [ "zlib" ];

     

       133
       139
        
         };

     

       134
       134
       -
       }

     

       140
       140
       +
       })

+2 -2

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

···

       16
       16
        
       

     

       17
       17
        
       buildPythonPackage rec {

     

       18
       18
        
         pname = "bellows";

     

       19
       19
       -
         version = "0.34.7";

     

       19
       19
       +
         version = "0.34.8";

     

       20
       20
        
         format = "setuptools";

     

       21
       21
        
       

     

       22
       22
        
         disabled = pythonOlder "3.7";

     
···

       25
       25
        
           owner = "zigpy";

     

       26
       26
        
           repo = "bellows";

     

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

     

       28
       28
       -
           hash = "sha256-+4OWiIRbCLvZWt5zn2djW20PrZJK4c5KOcz4Owbkozg=";

     

       28
       28
       +
           hash = "sha256-0pSMBPUA3djl7roVyFWe6ml9OOmWooAhwNXjsBgeLmU=";

     

       29
       29
        
         };

     

       30
       30
        
       

     

       31
       31
        
         propagatedBuildInputs = [

+2 -2

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

···

       12
       12
        
       

     

       13
       13
        
       buildPythonPackage rec {

     

       14
       14
        
         pname = "duecredit";

     

       15
       15
       -
         version = "0.9.1";

     

       15
       15
       +
         version = "0.9.2";

     

       16
       16
        
         disabled = isPy27;

     

       17
       17
        
       

     

       18
       18
        
         src = fetchPypi {

     

       19
       19
        
           inherit pname version;

     

       20
       20
       -
           sha256 = "f6192ce9315b35f6a67174761291e61d0831e496e8ff4acbc061731e7604faf8";

     

       20
       20
       +
           sha256 = "sha256-Dg/Yfp5GzmyUMI6feAwgP+g22JYoQE+L9a+Wp0V77Rw=";

     

       21
       21
        
         };

     

       22
       22
        
       

     

       23
       23
        
         propagatedBuildInputs = [ citeproc-py requests six ];

+2 -2

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

···

       10
       10
        
       

     

       11
       11
        
       buildPythonPackage rec {

     

       12
       12
        
         pname = "getmac";

     

       13
       13
       -
         version = "0.9.1";

     

       13
       13
       +
         version = "0.9.2";

     

       14
       14
        
         format = "setuptools";

     

       15
       15
        
       

     

       16
       16
        
         disabled = pythonOlder "3.7";

     
···

       19
       19
        
           owner = "GhostofGoes";

     

       20
       20
        
           repo = pname;

     

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

     

       22
       22
       -
           hash = "sha256-U04mtg7DCC78X5Fd0wGaHrf8XkUpDLi4+ctKCyR4dKg=";

     

       22
       22
       +
           hash = "sha256-n4WpEbkaYUS0aGdZKO5T/cuDr5OxauiuOAAdK56/+AM=";

     

       23
       23
        
         };

     

       24
       24
        
       

     

       25
       25
        
         nativeCheckInputs = [

+2 -2

pkgs/development/python-modules/google-cloud-container/default.nix

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "google-cloud-container";

     

       16
       16
       -
         version = "2.17.1";

     

       16
       16
       +
         version = "2.17.2";

     

       17
       17
        
         format = "setuptools";

     

       18
       18
        
       

     

       19
       19
        
         disabled = pythonOlder "3.7";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchPypi {

     

       22
       22
        
           inherit pname version;

     

       23
       23
       -
           hash = "sha256-PXDUjipUG7cYqeO2ivqrqLybHzDIssvBtdZixEMqXOA=";

     

       23
       23
       +
           hash = "sha256-VDhWYfAdU2PPzjSIhh0XMEnt9krogXV1fNTAFk6R3WM=";

     

       24
       24
        
         };

     

       25
       25
        
       

     

       26
       26
        
         propagatedBuildInputs = [

+2 -2

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

···

       6
       6
        
       

     

       7
       7
        
       buildPythonPackage rec {

     

       8
       8
        
         pname = "peaqevcore";

     

       9
       9
       -
         version = "11.0.4";

     

       9
       9
       +
         version = "11.1.2";

     

       10
       10
        
         format = "setuptools";

     

       11
       11
        
       

     

       12
       12
        
         disabled = pythonOlder "3.7";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchPypi {

     

       15
       15
        
           inherit pname version;

     

       16
       16
       -
           hash = "sha256-SU8vsKwZio/5UD2SMhLenfkBjXRuMZCPo2k6+1hx8Y4=";

     

       16
       16
       +
           hash = "sha256-ZuXc/7xCCFl20+GAMpL1c4iavjr7iR0pTvAoDCMnxx4=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         postPatch = ''

+2 -2

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

···

       21
       21
        
       

     

       22
       22
        
       buildPythonPackage rec {

     

       23
       23
        
         pname = "plugwise";

     

       24
       24
       -
         version = "0.27.5";

     

       24
       24
       +
         version = "0.27.6";

     

       25
       25
        
         format = "setuptools";

     

       26
       26
        
       

     

       27
       27
        
         disabled = pythonOlder "3.7";

     
···

       30
       30
        
           owner = pname;

     

       31
       31
        
           repo = "python-plugwise";

     

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

     

       33
       33
       -
           hash = "sha256-qEAXyWa5OjTpF4foi0ljHKbemIEHORPGE6vIVL57BOU=";

     

       33
       33
       +
           hash = "sha256-lG41y7bJkb7JdSsbv4PA2uaapkND59CDQq6Fvi+0hgU=";

     

       34
       34
        
         };

     

       35
       35
        
       

     

       36
       36
        
         propagatedBuildInputs = [

+2 -2

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

···

       13
       13
        
       

     

       14
       14
        
       buildPythonPackage rec {

     

       15
       15
        
         pname = "pydmd";

     

       16
       16
       -
         version = "0.4.0.post2301";

     

       16
       16
       +
         version = "0.4.0.post2302";

     

       17
       17
        
         format = "setuptools";

     

       18
       18
        
       

     

       19
       19
        
         disabled = pythonOlder "3.6";

     
···

       22
       22
        
           owner = "mathLab";

     

       23
       23
        
           repo = "PyDMD";

     

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

     

       25
       25
       -
           hash = "sha256-0ss7yyT6u0if+YjBYNbKtx5beJU43JC1LD9rqHPKBS8=";

     

       25
       25
       +
           hash = "sha256-EYVmaxwOxje3KVrNbvsjwRqQBD7Rje/JK+qB1F7EqA0=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
        
         propagatedBuildInputs = [

+27

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

···

       1
       1
       +
       { buildPythonPackage

     

       2
       2
       +
       , lib

     

       3
       3
       +
       , fetchPypi

     

       4
       4
       +
       , scipy

     

       5
       5
       +
       }:

     

       6
       6
       +
       

     

       7
       7
       +
       buildPythonPackage rec {

     

       8
       8
       +
         pname = "rmsd";

     

       9
       9
       +
         version = "1.5.1";

     

       10
       10
       +
       

     

       11
       11
       +
         propagatedBuildInputs = [ scipy ];

     

       12
       12
       +
       

     

       13
       13
       +
         src = fetchPypi {

     

       14
       14
       +
           inherit pname version;

     

       15
       15
       +
           hash = "sha256-wDQoIUMqrBDpgImHeHWizYu/YkFjlxB22TaGpA8Q0Sc=";

     

       16
       16
       +
         };

     

       17
       17
       +
       

     

       18
       18
       +
         pythonImportsCheck = [ "rmsd" ];

     

       19
       19
       +
       

     

       20
       20
       +
         meta = with lib; {

     

       21
       21
       +
           description = "Calculate root-mean-square deviation (RMSD) between two sets of cartesian coordinates";

     

       22
       22
       +
           homepage = "https://github.com/charnley/rmsd";

     

       23
       23
       +
           license = licenses.bsd2;

     

       24
       24
       +
           platforms = platforms.linux;

     

       25
       25
       +
           maintainers = with maintainers; [ sheepforce markuskowa ];

     

       26
       26
       +
         };

     

       27
       27
       +
       }

+2 -2

pkgs/development/python-modules/solc-select/default.nix

···

       7
       7
        
       

     

       8
       8
        
       buildPythonPackage rec {

     

       9
       9
        
         pname = "solc-select";

     

       10
       10
       -
         version = "1.0.2";

     

       10
       10
       +
         version = "1.0.3";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchPypi {

     

       13
       13
        
           inherit pname version;

     

       14
       14
       -
           sha256 = "sha256-zrpWHQdoCVDGaDGDf9fWhnRsTe1GVwqk1qls1PyvlLw=";

     

       14
       14
       +
           sha256 = "sha256-850IA1NVvQ4KiH5KEIjqEKFd1k5ECMx/zXLZE7Rvx5k=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         propagatedBuildInputs = [

+4 -4

pkgs/development/tools/yj/default.nix

···

       2
       2
        
       

     

       3
       3
        
       buildGoModule rec {

     

       4
       4
        
         pname = "yj";

     

       5
       5
       -
         version = "5.0.0";

     

       5
       5
       +
         version = "5.1.0";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchFromGitHub {

     

       8
       8
        
           owner = "sclevine";

     

       9
       9
        
           repo = "yj";

     

       10
       10
       -
           rev = "c4c13b7641389c76ea028b48091f851f3efb6376";

     

       11
       11
       -
           sha256 = "0bnb88wfm2vagh4yb1h9xhp3045ga0b6a77n3j2z5b4mvwshx5dr";

     

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

     

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

     

       12
       12
        
         };

     

       13
       13
        
       

     

       14
       14
       -
         vendorSha256 = "0y0n9fsb85qlpf9slwsxzarmfi98asa4x04qp2r8pagl28l0i8wv";

     

       14
       14
       +
         vendorHash = "sha256-NeSOoL9wtFzq6ba8ghseB6D+Qq8Z5holQExcAUbtYrs=";

     

       15
       15
        
       

     

       16
       16
        
         ldflags = [ "-s" "-w" "-X main.Version=${version}" ];

     

       17
       17

+21 -3

pkgs/development/tools/zed/default.nix

···

       1
       1
        
       { lib

     

       2
       2
        
       , buildGoModule

     

       3
       3
        
       , fetchFromGitHub

     

       4
       4
       +
       , testers

     

       5
       5
       +
       , zed

     

       4
       6
        
       }:

     

       5
       7
        
       

     

       6
       8
        
       buildGoModule rec {

     
···

       18
       20
        
       

     

       19
       21
        
         subPackages = [ "cmd/zed" "cmd/zq" ];

     

       20
       22
        
       

     

       23
       23
       +
         ldflags = [

     

       24
       24
       +
           "-s"

     

       25
       25
       +
           "-w"

     

       26
       26
       +
           "-X=github.com/brimdata/zed/cli.Version=${version}"

     

       27
       27
       +
         ];

     

       28
       28
       +
       

     

       29
       29
       +
         passthru.tests = {

     

       30
       30
       +
           zed-version = testers.testVersion {

     

       31
       31
       +
             package = zed;

     

       32
       32
       +
           };

     

       33
       33
       +
           zq-version = testers.testVersion {

     

       34
       34
       +
             package = zed;

     

       35
       35
       +
             command = "zq --version";

     

       36
       36
       +
           };

     

       37
       37
       +
         };

     

       38
       38
       +
       

     

       21
       39
        
         meta = with lib; {

     

       22
       40
        
           description = "A novel data lake based on super-structured data";

     

       23
       23
       -
           homepage = "https://github.com/brimdata/zed";

     

       24
       24
       -
           license = licenses.bsd3;

     

       25
       25
       -
           maintainers = with maintainers; [ dit7ya ];

     

       41
       41
       +
           homepage = "https://zed.brimdata.io";

     

       26
       42
        
           changelog = "https://github.com/brimdata/zed/blob/v${version}/CHANGELOG.md";

     

       43
       43
       +
           license = licenses.bsd3;

     

       44
       44
       +
           maintainers = with maintainers; [ dit7ya knl ];

     

       27
       45
        
         };

     

       28
       46
        
       }

-34

pkgs/development/tools/zq/default.nix

···

       1
       1
       -
       { lib

     

       2
       2
       -
       , stdenv

     

       3
       3
       -
       , fetchFromGitHub

     

       4
       4
       -
       , buildGoModule

     

       5
       5
       -
       , testers

     

       6
       6
       -
       , zq

     

       7
       7
       -
       }:

     

       8
       8
       -
       

     

       9
       9
       -
       buildGoModule rec {

     

       10
       10
       -
         pname = "zq";

     

       11
       11
       -
         version = "1.4.0";

     

       12
       12
       -
       

     

       13
       13
       -
         src = fetchFromGitHub {

     

       14
       14
       -
           owner = "brimdata";

     

       15
       15
       -
           repo = "zed";

     

       16
       16
       -
           rev = "v${version}";

     

       17
       17
       -
           hash = "sha256-ias2HKwZo5Q/0M4YZI4wLgzMVWmannruXlhp8IsOuyU=";

     

       18
       18
       -
         };

     

       19
       19
       -
       

     

       20
       20
       -
         vendorHash = "sha256-h5NYx6xhIh4i/tS5cGHXBomnVZCUn8jJuzL6k1+IdKk=";

     

       21
       21
       -
       

     

       22
       22
       -
         subPackages = [ "cmd/zq" ];

     

       23
       23
       -
       

     

       24
       24
       -
         ldflags = [ "-s" "-X" "github.com/brimdata/zed/cli.Version=${version}" ];

     

       25
       25
       -
       

     

       26
       26
       -
         passthru.tests = testers.testVersion { package = zq; };

     

       27
       27
       -
       

     

       28
       28
       -
         meta = with lib; {

     

       29
       29
       -
           description = "A command-line tool for processing data in diverse input formats, providing search, analytics, and extensive transformations using the Zed language";

     

       30
       30
       -
           homepage = "https://zed.brimdata.io";

     

       31
       31
       -
           license = licenses.bsd3;

     

       32
       32
       -
           maintainers = with maintainers; [ knl ];

     

       33
       33
       -
         };

     

       34
       34
       -
       }

+12 -12

pkgs/games/ecwolf/default.nix

···

       1
       1
        
       { stdenv

     

       2
       2
        
       , lib

     

       3
       3
        
       , fetchFromBitbucket

     

       4
       4
       -
       , makeDesktopItem

     

       5
       5
       -
       , copyDesktopItems

     

       6
       4
        
       , cmake

     

       5
       5
       +
       , copyDesktopItems

     

       7
       6
        
       , pkg-config

     

       7
       7
       +
       , makeWrapper

     

       8
       8
        
       , zlib

     

       9
       9
        
       , bzip2

     

       10
       10
        
       , libjpeg

     
···

       16
       16
        
       

     

       17
       17
        
       stdenv.mkDerivation rec {

     

       18
       18
        
         pname = "ecwolf";

     

       19
       19
       -
         version = "1.4.0";

     

       19
       19
       +
         version = "1.4.1";

     

       20
       20
        
       

     

       21
       21
        
         src = fetchFromBitbucket {

     

       22
       22
        
           owner = pname;

     

       23
       23
        
           repo = pname;

     

       24
       24
        
           rev = version;

     

       25
       25
       -
           sha256 = "n1G1zvfE1l42fbJ7ZaMdV0QXn45PjMpaaZTDQAOBtYk=";

     

       25
       25
       +
           sha256 = "V2pSP8i20zB50WtUMujzij+ISSupdQQ/oCYYrOaTU1g=";

     

       26
       26
        
         };

     

       27
       27
        
       

     

       28
       28
       -
         nativeBuildInputs = [ cmake copyDesktopItems pkg-config ];

     

       28
       28
       +
         nativeBuildInputs = [ cmake copyDesktopItems pkg-config ]

     

       29
       29
       +
           ++ lib.optionals stdenv.isDarwin [ makeWrapper ];

     

       29
       30
        
         buildInputs = [ zlib bzip2 libjpeg SDL2 SDL2_net SDL2_mixer gtk3 ];

     

       30
       31
        
       

     

       31
       31
       -
         # Disable app bundle creation on Darwin. It fails, and it is not needed to run it from the Nix store

     

       32
       32
       -
         preConfigure = lib.optionalString stdenv.isDarwin ''

     

       33
       33
       -
           sed -i -e "s|include(\''${CMAKE_CURRENT_SOURCE_DIR}/macosx/install.txt)||" src/CMakeLists.txt

     

       34
       34
       -
         '';

     

       32
       32
       +
         NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit";

     

       35
       33
        
       

     

       36
       34
        
         # ECWolf installs its binary to the games/ directory, but Nix only adds bin/

     

       37
       35
        
         # directories to the PATH.

     

       38
       38
       -
         postInstall = ''

     

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

     

       39
       37
        
           mv "$out/games" "$out/bin"

     

       38
       38
       +
         '' + lib.optionalString stdenv.isDarwin ''

     

       39
       39
       +
           mkdir -p $out/{Applications,bin}

     

       40
       40
       +
           cp -R ecwolf.app $out/Applications

     

       41
       41
       +
           makeWrapper $out/{Applications/ecwolf.app/Contents/MacOS,bin}/ecwolf

     

       40
       42
        
         '';

     

       41
       43
        
       

     

       42
       44
        
         meta = with lib; {

     
···

       45
       47
        
           license = licenses.gpl2Plus;

     

       46
       48
        
           maintainers = with maintainers; [ jayman2000 sander ];

     

       47
       49
        
           platforms = platforms.all;

     

       48
       48
       -
           # On Darwin, the linker fails to find a bunch of symbols.

     

       49
       49
       -
           broken = stdenv.isDarwin;

     

       50
       50
        
         };

     

       51
       51
        
       }

+4 -2

pkgs/games/wesnoth/default.nix

···

       5
       5
        
       

     

       6
       6
        
       stdenv.mkDerivation rec {

     

       7
       7
        
         pname = "wesnoth";

     

       8
       8
       -
         version = "1.16.7";

     

       8
       8
       +
         version = "1.16.8";

     

       9
       9
        
       

     

       10
       10
        
         src = fetchFromGitHub {

     

       11
       11
        
           rev = version;

     

       12
       12
        
           owner = "wesnoth";

     

       13
       13
        
           repo = "wesnoth";

     

       14
       14
       -
           sha256 = "sha256-YcBF/iNr6Q5NaA+G55xa0SOCCHW2BCoJlmXsTtkF1fk=";

     

       14
       14
       +
           hash = "sha256-P7OUiKJxJZ0rGdesnxpQMbRBgCHsLpyt8+pRDh27JYQ=";

     

       15
       15
        
         };

     

       16
       16
        
       

     

       17
       17
        
         nativeBuildInputs = [ cmake pkg-config ];

     
···

       19
       19
        
         buildInputs = [ SDL2 SDL2_image SDL2_mixer SDL2_net SDL2_ttf pango gettext boost

     

       20
       20
        
                         libvorbis fribidi dbus libpng pcre openssl icu ]

     

       21
       21
        
                       ++ lib.optionals stdenv.isDarwin [ Cocoa Foundation];

     

       22
       22
       +
       

     

       23
       23
       +
         NIX_LDFLAGS = lib.optionalString stdenv.isDarwin "-framework AppKit";

     

       22
       24
        
       

     

       23
       25
        
         meta = with lib; {

     

       24
       26
        
           description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme";

+10 -10

pkgs/os-specific/linux/kernel/hardened/patches.json

···

       22
       22
        
           "5.10": {

     

       23
       23
        
               "patch": {

     

       24
       24
        
                   "extra": "-hardened1",

     

       25
       25
       -
                   "name": "linux-hardened-5.10.165-hardened1.patch",

     

       26
       26
       -
                   "sha256": "0gnvnywagqqdsdrbd9fbl671pzfv49mf2xqan9bk3q41mgcyyfgg",

     

       27
       27
       -
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.165-hardened1/linux-hardened-5.10.165-hardened1.patch"

     

       25
       25
       +
                   "name": "linux-hardened-5.10.166-hardened1.patch",

     

       26
       26
       +
                   "sha256": "1ygxald6mq47n7i6x80mv9d5idfpwk6gpcijci8bsazhndwvi7qy",

     

       27
       27
       +
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.166-hardened1/linux-hardened-5.10.166-hardened1.patch"

     

       28
       28
        
               },

     

       29
       29
       -
               "sha256": "03dg8yx0gdzm8zbwd1f9jn4c5jhr8qilhjzxgwm0mv8riz2fy7cp",

     

       30
       30
       -
               "version": "5.10.165"

     

       29
       29
       +
               "sha256": "1bz1sgkqniwg84wv9vcg08mksa5q533vgynsd3y0xnjv1rwa2l80",

     

       30
       30
       +
               "version": "5.10.166"

     

       31
       31
        
           },

     

       32
       32
        
           "5.15": {

     

       33
       33
        
               "patch": {

     

       34
       34
        
                   "extra": "-hardened1",

     

       35
       35
       -
                   "name": "linux-hardened-5.15.90-hardened1.patch",

     

       36
       36
       -
                   "sha256": "1zj80v6xpgz00z1lpw5j9qdm0gp44pk7vkflrngbk8m3cwmpw5ha",

     

       37
       37
       -
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.90-hardened1/linux-hardened-5.15.90-hardened1.patch"

     

       35
       35
       +
                   "name": "linux-hardened-5.15.91-hardened1.patch",

     

       36
       36
       +
                   "sha256": "041yigcqzp7m6cibl9h3jgsz20xhxc9y7y5pay9c7fkh2ypy9zgz",

     

       37
       37
       +
                   "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.91-hardened1/linux-hardened-5.15.91-hardened1.patch"

     

       38
       38
        
               },

     

       39
       39
       -
               "sha256": "0hiv74mxkp3v04lphnyw16akgavaz527bzhnfnpm6rv848047zg6",

     

       40
       40
       -
               "version": "5.15.90"

     

       39
       39
       +
               "sha256": "107yw7mibibhfrggm8idzn5bayjvkxaq1kv3kkm1lpxipsqjng56",

     

       40
       40
       +
               "version": "5.15.91"

     

       41
       41
        
           },

     

       42
       42
        
           "5.4": {

     

       43
       43
        
               "patch": {

+2 -2

pkgs/os-specific/linux/kernel/linux-4.14.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "4.14.304";

     

       6
       6
       +
         version = "4.14.305";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = versions.pad 3 version;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "1ma9qpsx0nvi0szlivf8v5l3pjykqwrv4x6y5g0nn6bcwhsb5jv4";

     

       16
       16
       +
           sha256 = "16lmhxqpbhyqmgmlyicjadzz3axhl5smfrr230x45ahkdghwsnx3";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or {}))

+2 -2

pkgs/os-specific/linux/kernel/linux-4.19.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "4.19.271";

     

       6
       6
       +
         version = "4.19.272";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = versions.pad 3 version;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "06lxh9skp9213n29ynx7a9cinz7wggaxjsz52kghdbwfnjf3yvb3";

     

       16
       16
       +
           sha256 = "1y8kyc48v8bsl53zc6dsy5xhazv0vyna98fycj181aypicvbk7s8";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or {}))

+2 -2

pkgs/os-specific/linux/kernel/linux-5.10.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "5.10.166";

     

       6
       6
       +
         version = "5.10.167";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = versions.pad 3 version;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "1bz1sgkqniwg84wv9vcg08mksa5q533vgynsd3y0xnjv1rwa2l80";

     

       16
       16
       +
           sha256 = "1iprbgwdgnylzw4dc8jgims54x8dkq070c9vs4642rp529wgj1yq";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or {}))

+2 -2

pkgs/os-specific/linux/kernel/linux-5.15.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "5.15.91";

     

       6
       6
       +
         version = "5.15.92";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = versions.pad 3 version;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "107yw7mibibhfrggm8idzn5bayjvkxaq1kv3kkm1lpxipsqjng56";

     

       16
       16
       +
           sha256 = "14ggwrvk9n2nvk38fp4g486k864knf3n9979mm51m8wrvd8h8hlz";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or { }))

+2 -2

pkgs/os-specific/linux/kernel/linux-5.4.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "5.4.230";

     

       6
       6
       +
         version = "5.4.231";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = versions.pad 3 version;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "0bz6hfhsahymys2g9s4nzf862z0zfq4346577cpvf98hrhnd6kx7";

     

       16
       16
       +
           sha256 = "1a1nbyvkf6iaj5lz6ahg7kk9pyrx7j77jmaj92fyihdl3mzyml4d";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or {}))

+2 -2

pkgs/os-specific/linux/kernel/linux-6.1.nix

···

       3
       3
        
       with lib;

     

       4
       4
        
       

     

       5
       5
        
       buildLinux (args // rec {

     

       6
       6
       -
         version = "6.1.9";

     

       6
       6
       +
         version = "6.1.10";

     

       7
       7
        
       

     

       8
       8
        
         # modDirVersion needs to be x.y.z, will automatically add .0 if needed

     

       9
       9
        
         modDirVersion = versions.pad 3 version;

     
···

       13
       13
        
       

     

       14
       14
        
         src = fetchurl {

     

       15
       15
        
           url = "mirror://kernel/linux/kernel/v6.x/linux-${version}.tar.xz";

     

       16
       16
       -
           sha256 = "0awjynyy049px0h7li59w3zgn3z39alv6glzrmx6wf1wd62z236n";

     

       16
       16
       +
           sha256 = "17fifhfh2jrvlhry696n428ldl5ag3g2km5l9hx8gx8wm6dr3qhb";

     

       17
       17
        
         };

     

       18
       18
        
       } // (args.argsOverride or { }))

+2 -2

pkgs/os-specific/linux/kernel/linux-libre.nix

···

       1
       1
        
       { stdenv, lib, fetchsvn, linux

     

       2
       2
        
       , scripts ? fetchsvn {

     

       3
       3
        
           url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/";

     

       4
       4
       -
           rev = "19027";

     

       5
       5
       -
           sha256 = "0g7sf48rwicwzwhjpzs82j6v3j4s17xhrgfgysdd523r07437ryv";

     

       4
       4
       +
           rev = "19044";

     

       5
       5
       +
           sha256 = "1xiykp6lwvlz8x48i7f1f3izra2hfz75iihw3y4w5f1jlji6y56m";

     

       6
       6
        
         }

     

       7
       7
        
       , ...

     

       8
       8
        
       }:

+3 -3

pkgs/servers/invidious/versions.json

···

       4
       4
        
           "sha256": "sha256-EU6T9yQCdOLx98Io8o01rEsgxDFF/Xoy42LgPopD2/A="

     

       5
       5
        
         },

     

       6
       6
        
         "invidious": {

     

       7
       7
       -
           "rev": "3b8e6c6040fe341fe4b9fc16cdbd3aea697dfad3",

     

       8
       8
       -
           "sha256": "sha256-gESGo8zRJtGJZrZEkW0OS/O65ZwVzpDA3jmyLCV0RpI=",

     

       9
       9
       -
           "version": "unstable-2023-01-26"

     

       7
       7
       +
           "rev": "d6dd341594cc837001ed57cbea3103d22c9988c1",

     

       8
       8
       +
           "sha256": "sha256-BHCbIX7Qi2adixIY+hcU8t5kBXBGAv8DTviJ7BPHKCg=",

     

       9
       9
       +
           "version": "unstable-2023-02-02"

     

       10
       10
        
         },

     

       11
       11
        
         "lsquic": {

     

       12
       12
        
           "sha256": "sha256-hG8cUvhbCNeMOsKkaJlgGpzUrIx47E/WhmPIdI5F3qM=",

+3 -3

pkgs/servers/klipper/default.nix

···

       7
       7
        
       

     

       8
       8
        
       stdenv.mkDerivation rec {

     

       9
       9
        
         pname = "klipper";

     

       10
       10
       -
         version = "unstable-2023-01-07";

     

       10
       10
       +
         version = "unstable-2023-02-03";

     

       11
       11
        
       

     

       12
       12
        
         src = fetchFromGitHub {

     

       13
       13
        
           owner = "KevinOConnor";

     

       14
       14
        
           repo = "klipper";

     

       15
       15
       -
           rev = "f1203d56f6bc2c84d00605a76525be4c13430324";

     

       16
       16
       -
           sha256 = "sha256-7FJ+omzXpj49AThcv0xDilIekCyehtvpvck1+nrMS70=";

     

       15
       15
       +
           rev = "5644481590a16ac5b3d8c20874f0477d5d51a963";

     

       16
       16
       +
           sha256 = "sha256-OGFVcUPw0sqTbJyrMvCxp8nER9/42ZRN4zIrpm/qh4E=";

     

       17
       17
        
         };

     

       18
       18
        
       

     

       19
       19
        
         sourceRoot = "source/klippy";

+2 -2

pkgs/servers/web-apps/wiki-js/default.nix

···

       2
       2
        
       

     

       3
       3
        
       stdenv.mkDerivation rec {

     

       4
       4
        
         pname = "wiki-js";

     

       5
       5
       -
         version = "2.5.295";

     

       5
       5
       +
         version = "2.5.296";

     

       6
       6
        
       

     

       7
       7
        
         src = fetchurl {

     

       8
       8
        
           url = "https://github.com/Requarks/wiki/releases/download/v${version}/${pname}.tar.gz";

     

       9
       9
       -
           sha256 = "sha256-itiW9/QtNpc8cFS5skwlc3JSWoVqbBbIcSlEd+GRkH0=";

     

       9
       9
       +
           sha256 = "sha256-05rGNKL7K4FgEUXH34jl9h4diCdwFRY98qDO+w9B52s=";

     

       10
       10
        
         };

     

       11
       11
        
       

     

       12
       12
        
         sourceRoot = ".";

+1

pkgs/stdenv/generic/check-meta.nix

···

       271
       271
        
           sourceProvenance = listOf lib.types.attrs;

     

       272
       272
        
           maintainers = listOf (attrsOf anything); # TODO use the maintainer type from lib/tests/maintainer-module.nix

     

       273
       273
        
           priority = int;

     

       274
       274
       +
           pkgConfigModules = listOf str;

     

       274
       275
        
           platforms = listOf (either str (attrsOf anything));   # see lib.meta.platformMatch

     

       275
       276
        
           hydraPlatforms = listOf str;

     

       276
       277
        
           broken = bool;

+22 -9

pkgs/tools/security/yubihsm-shell/default.nix

···

       10
       10
        
       , pkg-config

     

       11
       11
        
       , pcsclite

     

       12
       12
        
       , help2man

     

       13
       13
       +
       , darwin

     

       14
       14
       +
       , libiconv

     

       13
       15
        
       }:

     

       14
       16
        
       

     

       15
       17
        
       stdenv.mkDerivation rec {

     

       16
       18
        
         pname = "yubihsm-shell";

     

       17
       17
       -
         version = "2.3.2";

     

       19
       19
       +
         version = "2.4.0";

     

       18
       20
        
       

     

       19
       21
        
         src = fetchFromGitHub {

     

       20
       22
        
           owner = "Yubico";

     

       21
       23
        
           repo = "yubihsm-shell";

     

       22
       24
        
           rev = version;

     

       23
       23
       -
           sha256 = "sha256-rSIdI6ECLte+dEbT8NOUqS8jkozRhbo+eqFrdhTIKpY=";

     

       25
       25
       +
           hash = "sha256-zWhvECPdZnrbSAVPDVZk54SWHVkd/HEQxS3FgXoqXHY=";

     

       24
       26
        
         };

     

       27
       27
       +
       

     

       28
       28
       +
         postPatch = ''

     

       29
       29
       +
           # Can't find libyubihsm at runtime because of dlopen() in C code

     

       30
       30
       +
           substituteInPlace lib/yubihsm.c \

     

       31
       31
       +
             --replace "libyubihsm_usb.so" "$out/lib/libyubihsm_usb.so" \

     

       32
       32
       +
             --replace "libyubihsm_http.so" "$out/lib/libyubihsm_http.so"

     

       33
       33
       +
           # ld: unknown option: -z

     

       34
       34
       +
           substituteInPlace CMakeLists.txt cmake/SecurityFlags.cmake \

     

       35
       35
       +
             --replace "AppleClang" "Clang"

     

       36
       36
       +
         '';

     

       25
       37
        
       

     

       26
       38
        
         nativeBuildInputs = [

     

       27
       39
        
           pkg-config

     
···

       34
       46
        
           libusb1

     

       35
       47
        
           libedit

     

       36
       48
        
           curl

     

       37
       37
       -
           pcsclite

     

       38
       49
        
           openssl

     

       50
       50
       +
         ] ++ lib.optionals stdenv.isLinux [

     

       51
       51
       +
           pcsclite

     

       52
       52
       +
         ] ++ lib.optionals stdenv.isDarwin [

     

       53
       53
       +
           darwin.apple_sdk.frameworks.PCSC

     

       54
       54
       +
           libiconv

     

       39
       55
        
         ];

     

       40
       56
        
       

     

       41
       41
       -
         postPatch = ''

     

       42
       42
       -
           # Can't find libyubihsm at runtime because of dlopen() in C code

     

       43
       43
       -
           substituteInPlace lib/yubihsm.c \

     

       44
       44
       -
             --replace "libyubihsm_usb.so" "$out/lib/libyubihsm_usb.so" \

     

       45
       45
       -
             --replace "libyubihsm_http.so" "$out/lib/libyubihsm_http.so"

     

       46
       46
       -
         '';

     

       57
       57
       +
         cmakeFlags = lib.optionals stdenv.isDarwin [

     

       58
       58
       +
           "-DDISABLE_LTO=ON"

     

       59
       59
       +
         ];

     

       47
       60
        
       

     

       48
       61
        
         meta = with lib; {

     

       49
       62
        
           description = "yubihsm-shell and libyubihsm";

+25

pkgs/tools/system/erdtree/default.nix

···

       1
       1
       +
       { lib

     

       2
       2
       +
       , rustPlatform

     

       3
       3
       +
       , fetchFromGitHub

     

       4
       4
       +
       }:

     

       5
       5
       +
       

     

       6
       6
       +
       rustPlatform.buildRustPackage rec {

     

       7
       7
       +
         pname = "erdtree";

     

       8
       8
       +
         version = "1.0.0";

     

       9
       9
       +
       

     

       10
       10
       +
         src = fetchFromGitHub {

     

       11
       11
       +
           owner = "solidiquis";

     

       12
       12
       +
           repo = pname;

     

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

     

       14
       14
       +
           hash = "sha256-gZC90flsfH03Grc1netzlv/iX/9DH+rpaSstfXFearc=";

     

       15
       15
       +
         };

     

       16
       16
       +
       

     

       17
       17
       +
         cargoHash = "sha256-0I60lUYyR4Za2Q3FqcdqJhUKFjX5+PE88G6JxxxiBXw=";

     

       18
       18
       +
       

     

       19
       19
       +
         meta = with lib; {

     

       20
       20
       +
           description = "File-tree visualizer and disk usage analyzer";

     

       21
       21
       +
           homepage = "https://github.com/solidiquis/erdtree";

     

       22
       22
       +
           license = licenses.mit;

     

       23
       23
       +
           maintainers = with maintainers; [ zendo ];

     

       24
       24
       +
         };

     

       25
       25
       +
       }

+2 -2

pkgs/tools/system/gdu/default.nix

···

       9
       9
        
       

     

       10
       10
        
       buildGoModule rec {

     

       11
       11
        
         pname = "gdu";

     

       12
       12
       -
         version = "5.21.1";

     

       12
       12
       +
         version = "5.22.0";

     

       13
       13
        
       

     

       14
       14
        
         src = fetchFromGitHub {

     

       15
       15
        
           owner = "dundee";

     

       16
       16
        
           repo = pname;

     

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

     

       18
       18
       -
           hash = "sha256-QxepFU/ZQWVH19AeoSnXAAUhLO6VKmrZIIpVw1tTft4=";

     

       18
       18
       +
           hash = "sha256-bWeMZ1tQkJsRJbolZBue9UzM4Qs7K5Rj5Z80Uotyb8I=";

     

       19
       19
        
         };

     

       20
       20
        
       

     

       21
       21
        
         vendorHash = "sha256-UP6IdJLc93gRP4vwKKOJl3sNt4sOFeYXjvwk8QM+D48=";

+1

pkgs/top-level/aliases.nix

···

       1698
       1698
        
         zdfmediathk = throw "'zdfmediathk' has been renamed to/replaced by 'mediathekview'"; # Converted to throw 2022-02-22

     

       1699
       1699
        
         zimreader = throw "zimreader has been removed from nixpkgs as it has been replaced by kiwix-serve and stopped working with modern zimlib versions"; # Added 2021-03-28

     

       1700
       1700
        
         zimwriterfs = throw "zimwriterfs is now part of zim-tools"; # Added 2022-06-10.

     

       1701
       1701
       +
         zq = zed.overrideAttrs (old: { meta = old.meta // { mainProgram = "zq"; }; }); # Added 2023-02-06

     

       1701
       1702
        
       

     

       1702
       1703
        
         # TODO(ekleog): add ‘wasm’ alias to ‘ocamlPackages.wasm’ after 19.03

     

       1703
       1704
        
         # branch-off

+2 -2

pkgs/top-level/all-packages.nix

···

       1628
       1628
        
       

     

       1629
       1629
        
         breitbandmessung = callPackage ../applications/networking/breitbandmessung { };

     

       1630
       1630
        
       

     

       1631
       1631
       -
         zq = callPackage ../development/tools/zq { };

     

       1632
       1632
       -
       

     

       1633
       1631
        
         ### APPLICATIONS/VERSION-MANAGEMENT

     

       1634
       1632
        
       

     

       1635
       1633
        
         deepgit = callPackage ../applications/version-management/deepgit {};

     
···

       4532
       4530
        
         envfs = callPackage ../tools/filesystems/envfs { };

     

       4533
       4531
        
       

     

       4534
       4532
        
         er-patcher = callPackage ../tools/games/er-patcher { };

     

       4533
       4533
       +
       

     

       4534
       4534
       +
         erdtree = callPackage ../tools/system/erdtree { };

     

       4535
       4535
        
       

     

       4536
       4536
        
         errcheck = callPackage ../development/tools/errcheck { };

     

       4537
       4537

+5 -5

pkgs/top-level/perl-packages.nix

···

       5200
       5200
        
       

     

       5201
       5201
        
         CryptOpenSSLRSA = buildPerlPackage {

     

       5202
       5202
        
           pname = "Crypt-OpenSSL-RSA";

     

       5203
       5203
       -
           version = "0.31";

     

       5203
       5203
       +
           version = "0.33";

     

       5204
       5204
        
           src = fetchurl {

     

       5205
       5205
       -
             url = "mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.31.tar.gz";

     

       5206
       5206
       -
             hash = "sha256-QXNAOtTPdnMhkgmfgz+/vzzYEE4CRrOEQYeuOE0sVDY=";

     

       5205
       5205
       +
             url = "mirror://cpan/authors/id/T/TO/TODDR/Crypt-OpenSSL-RSA-0.33.tar.gz";

     

       5206
       5206
       +
             hash = "sha256-vb5jD21vVAMldGrZmXcnKshmT/gb0Z8K2rptb0Xv2GQ=";

     

       5207
       5207
        
           };

     

       5208
       5208
        
           propagatedBuildInputs = [ CryptOpenSSLRandom ];

     

       5209
       5209
       -
           NIX_CFLAGS_COMPILE = "-I${pkgs.openssl_1_1.dev}/include";

     

       5210
       5210
       -
           NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl_1_1}/lib -lcrypto";

     

       5209
       5209
       +
           NIX_CFLAGS_COMPILE = "-I${pkgs.openssl.dev}/include";

     

       5210
       5210
       +
           NIX_CFLAGS_LINK = "-L${lib.getLib pkgs.openssl}/lib -lcrypto";

     

       5211
       5211
        
           buildInputs = [ CryptOpenSSLGuess ];

     

       5212
       5212
        
           meta = {

     

       5213
       5213
        
             description = "RSA encoding and decoding, using the openSSL libraries";

+2

pkgs/top-level/python-packages.nix

···

       10067
       10067
        
       

     

       10068
       10068
        
         rmrl = callPackage ../development/python-modules/rmrl { };

     

       10069
       10069
        
       

     

       10070
       10070
       +
         rmsd = callPackage ../development/python-modules/rmsd { };

     

       10071
       10071
       +
       

     

       10070
       10072
        
         rnc2rng = callPackage ../development/python-modules/rnc2rng { };

     

       10071
       10073
        
       

     

       10072
       10074
        
         rnginline = callPackage ../development/python-modules/rnginline { };