nathan/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2026-09-18 13:50:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge master into haskell-updates

Browse Source
This commit is contained in:
github-actions[bot]
2023-06-30 00:13:53 +00:00
committed by GitHub
parent 10844fd0b3 6df7cf2979
commit 7db53dc44c
206 changed files with 3834 additions and 1990 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CONTRIBUTING.md
View File

@@ -61,6 +61,15 @@ Pull requests should not be squash merged in order to keep complete commit messa
This means that, when addressing review comments in order to keep the pull request in an always mergeable status, you will sometimes need to rewrite your branch's history and then force-push it with `git push --force-with-lease`.
Useful git commands that can help a lot with this are `git commit --patch --amend` and `git rebase --interactive`. For more details consult the git man pages or online resources like [git-rebase.io](https://git-rebase.io/) or [The Pro Git Book](https://git-scm.com/book/en/v2/Git-Tools-Rewriting-History).
## Testing changes
To run the main types of tests locally:
- Run package-internal tests with `nix-build --attr pkgs.PACKAGE.passthru.tests`
- Run [NixOS tests](https://nixos.org/manual/nixos/unstable/#sec-nixos-tests) with `nix-build --attr nixosTest.NAME`, where `NAME` is the name of the test listed in `nixos/tests/all-tests.nix`
- Run [global package tests](https://nixos.org/manual/nixpkgs/unstable/#sec-package-tests) with `nix-build --attr tests.PACKAGE`, where `PACKAGE` is the name of the test listed in `pkgs/test/default.nix`
- See `lib/tests/NAME.nix` for instructions on running specific library tests
## Rebasing between branches (i.e. from master to staging)
From time to time, changes between branches must be rebased, for example, if the

130
doc/languages-frameworks/haskell.section.md
View File

@@ -1066,6 +1066,18 @@ benchmark component.
`dontCoverage drv`
: Sets the `doCoverage` argument to `false` for `drv`.
`enableExecutableProfiling drv`
: Sets the `enableExecutableProfiling` argument to `true` for `drv`.
`disableExecutableProfiling drv`
: Sets the `enableExecutableProfiling` argument to `false` for `drv`.
`enableLibraryProfiling drv`
: Sets the `enableLibraryProfiling` argument to `true` for `drv`.
`disableLibraryProfiling drv`
: Sets the `enableLibraryProfiling` argument to `false` for `drv`.
#### Library functions in the Haskell package sets {#haskell-package-set-lib-functions}
Some library functions depend on packages from the Haskell package sets. Thus they are
@@ -1140,6 +1152,124 @@ covered in the old [haskell4nix docs](https://haskell4nix.readthedocs.io/).
If you feel any important topic is not documented at all, feel free to comment
on the issue linked above.
### How to enable or disable profiling builds globally? {#haskell-faq-override-profiling}
By default, Nixpkgs builds a profiling version of each Haskell library. The
exception to this rule are some platforms where it is disabled due to concerns
over output size. You may want to…
* …enable profiling globally so that you can build a project you are working on
with profiling ability giving you insight in the time spent across your code
and code you depend on using [GHC's profiling feature][profiling].
* …disable profiling (globally) to reduce the time spent building the profiling
versions of libraries which a significant amount of build time is spent on
(although they are not as expensive as the “normal” build of a Haskell library).
::: {.note}
The method described below affects the build of all libraries in the
respective Haskell package set as well as GHC. If your choices differ from
Nixpkgs' default for your (host) platform, you will lose the ability to
substitute from the official binary cache.
If you are concerned about build times and thus want to disable profiling, it
probably makes sense to use `haskell.lib.compose.disableLibraryProfiling` (see
[](#haskell-trivial-helpers)) on the packages you are building locally while
continuing to substitute their dependencies and GHC.
:::
Since we need to change the profiling settings for the desired Haskell package
set _and_ GHC (as the core libraries like `base`, `filepath` etc. are bundled
with GHC), it is recommended to use overlays for Nixpkgs to change them.
Since the interrelated parts, i.e. the package set and GHC, are connected
via the Nixpkgs fixpoint, we need to modify them both in a way that preserves
their connection (or else we'd have to wire it up again manually). This is
achieved by changing GHC and the package set in seperate overlays to prevent
the package set from pulling in GHC from `prev`.
The result is two overlays like the ones shown below. Adjustable parts are
annotated with comments, as are any optional or alternative ways to achieve
the desired profiling settings without causing too many rebuilds.
<!-- TODO(@sternenseemann): buildHaskellPackages != haskellPackages with this overlay,
affected by https://github.com/NixOS/nixpkgs/issues/235960 which needs to be fixed
properly still.
-->
```nix
let
# Name of the compiler and package set you want to change. If you are using
# the default package set `haskellPackages`, you need to look up what version
# of GHC it currently uses (note that this is subject to change).
ghcName = "ghc92";
# Desired new setting
enableProfiling = true;
in
[
# The first overlay modifies the GHC derivation so that it does or does not
# build profiling versions of the core libraries bundled with it. It is
# recommended to only use such an overlay if you are enabling profiling on a
# platform that doesn't by default, because compiling GHC from scratch is
# quite expensive.
(final: prev:
let
inherit (final) lib;
in
{
haskell = lib.recursiveUpdate prev.haskell {
compiler.${ghcName} = prev.haskell.compiler.${ghcName}.override {
# Unfortunately, the GHC setting is named differently for historical reasons
enableProfiledLibs = enableProfiling;
};
};
})
(final: prev:
let
inherit (final) lib;
haskellLib = final.haskell.lib.compose;
in
{
haskell = lib.recursiveUpdate prev.haskell {
packages.${ghcName} = prev.haskell.packages.${ghcName}.override {
overrides = hfinal: hprev: {
mkDerivation = args: hprev.mkDerivation (args // {
# Since we are forcing our ideas upon mkDerivation, this change will
# affect every package in the package set.
enableLibraryProfiling = enableProfiling;
# To actually use profiling on an executable, executable profiling
# needs to be enabled for the executable you want to profile. You
# can either do this globally or…
enableExecutableProfiling = enableProfiling;
});
# …only for the package that contains an executable you want to profile.
# That saves on unnecessary rebuilds for packages that you only depend
# on for their library, but also contain executables (e.g. pandoc).
my-executable = haskellLib.enableExecutableProfiling hprev.my-executable;
# If you are disabling profiling to save on build time, but want to
# retain the ability to substitute from the binary cache. Drop the
# override for mkDerivation above and instead have an override like
# this for the specific packages you are building locally and want
# to make cheaper to build.
my-library = haskellLib.disableLibraryProfiling hprev.my-library;
};
};
};
})
]
```
<!-- TODO(@sternenseemann): write overriding mkDerivation, overriding GHC, and
overriding the entire package set sections and link to them from here where
relevant.
-->
[Stackage]: https://www.stackage.org
[cabal-project-files]: https://cabal.readthedocs.io/en/latest/cabal-project.html
[cabal2nix]: https://github.com/nixos/cabal2nix

21
doc/languages-frameworks/python.section.md
View File

@@ -512,9 +512,10 @@ when building the bindings and are therefore added as `buildInputs`.
```nix
{ lib
, pkgs
, buildPythonPackage
, fetchPypi
, libxml2
, libxslt
}:
buildPythonPackage rec {
@@ -528,8 +529,8 @@ buildPythonPackage rec {
};
buildInputs = [
pkgs.libxml2
pkgs.libxslt
libxml2
libxslt
];
meta = with lib; {
@@ -554,11 +555,13 @@ therefore we have to set `LDFLAGS` and `CFLAGS`.
```nix
{ lib
, pkgs
, buildPythonPackage
, fetchPypi
# dependencies
, fftw
, fftwFloat
, fftwLongDouble
, numpy
, scipy
}:
@@ -574,9 +577,9 @@ buildPythonPackage rec {
};
buildInputs = [
pkgs.fftw
pkgs.fftwFloat
pkgs.fftwLongDouble
fftw
fftwFloat
fftwLongDouble
];
propagatedBuildInputs = [
@@ -585,8 +588,8 @@ buildPythonPackage rec {
];
preConfigure = ''
export LDFLAGS="-L${pkgs.fftw.dev}/lib -L${pkgs.fftwFloat.out}/lib -L${pkgs.fftwLongDouble.out}/lib"
export CFLAGS="-I${pkgs.fftw.dev}/include -I${pkgs.fftwFloat.dev}/include -I${pkgs.fftwLongDouble.dev}/include"
export LDFLAGS="-L${fftw.dev}/lib -L${fftwFloat.out}/lib -L${fftwLongDouble.out}/lib"
export CFLAGS="-I${fftw.dev}/include -I${fftwFloat.dev}/include -I${fftwLongDouble.dev}/include"
'';
# Tests cannot import pyfftw. pyfftw works fine though.

2
lib/systems/inspect.nix
View File

@@ -87,7 +87,7 @@ rec {
isNone = { kernel = kernels.none; };
isAndroid = [ { abi = abis.android; } { abi = abis.androideabi; } ];
isGnu = with abis; map (a: { abi = a; }) [ gnuabi64 gnu gnueabi gnueabihf gnuabielfv1 gnuabielfv2 ];
isGnu = with abis; map (a: { abi = a; }) [ gnuabi64 gnuabin32 gnu gnueabi gnueabihf gnuabielfv1 gnuabielfv2 ];
isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf muslabin32 muslabi64 ];
isUClibc = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ];

16
maintainers/maintainer-list.nix
View File

@@ -8196,6 +8196,13 @@
githubId = 21160136;
name = "Julien Moutinho";
};
Julow = {
email = "jules@j3s.fr";
matrix = "@juloo:matrix.org";
github = "Julow";
githubId = 2310568;
name = "Jules Aguillon";
};
jumper149 = {
email = "felixspringer149@gmail.com";
github = "jumper149";
@@ -17275,6 +17282,15 @@
githubId = 5228243;
name = "waelwindows";
};
wahtique = {
name = "William Veal Phan";
email = "williamvphan@yahoo.fr";
github = "wahtique";
githubId = 55251330;
keys = [{
fingerprint = "9262 E3A7 D129 C4DD A7C1 26CE 370D D9BE 9121 F0B3";
}];
};
waiting-for-dev = {
email = "marc@lamarciana.com";
github = "waiting-for-dev";

2
nixos/doc/manual/release-notes/rl-2305.section.md
View File

@@ -192,7 +192,7 @@ In addition to numerous new and updated packages, this release has the following
"hmac-sha2-512"
"hmac-sha2-256"
"umac-128@openssh.com"
};
];
```
- `podman` now uses the `netavark` network stack. Users will need to delete all of their local containers, images, volumes, etc, by running `podman system reset --force` once before upgrading their systems.

2
nixos/doc/manual/release-notes/rl-2311.section.md
View File

@@ -82,6 +82,8 @@
- The module `services.calibre-server` has new options to configure the `host`, `port`, `auth.enable`, `auth.mode` and `auth.userDb` path, see [#216497](https://github.com/NixOS/nixpkgs/pull/216497/) for more details.
- `services.prometheus.exporters` has a new [exporter](https://github.com/hipages/php-fpm_exporter) to monitor PHP-FPM processes, see [#240394](https://github.com/NixOS/nixpkgs/pull/240394) for more details.
## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals}
- The `qemu-vm.nix` module by default now identifies block devices via

1
nixos/lib/testing/nodes.nix
View File

@@ -16,6 +16,7 @@ let
baseOS =
import ../eval-config.nix {
inherit lib;
system = null; # use modularly defined system
inherit (config.node) specialArgs;
modules = [ config.defaults ];

71
nixos/modules/services/games/minetest-server.nix
View File

@@ -3,15 +3,52 @@
with lib;
let
CONTAINS_NEWLINE_RE = ".*\n.*";
# The following values are reserved as complete option values:
# { - start of a group.
# """ - start of a multi-line string.
RESERVED_VALUE_RE = "[[:space:]]*(\"\"\"|\\{)[[:space:]]*";
NEEDS_MULTILINE_RE = "${CONTAINS_NEWLINE_RE}|${RESERVED_VALUE_RE}";
# There is no way to encode """ on its own line in a Minetest config.
UNESCAPABLE_RE = ".*\n\"\"\"\n.*";
toConfMultiline = name: value:
assert lib.assertMsg
((builtins.match UNESCAPABLE_RE value) == null)
''""" can't be on its own line in a minetest config.'';
"${name} = \"\"\"\n${value}\n\"\"\"\n";
toConf = values:
lib.concatStrings
(lib.mapAttrsToList
(name: value: {
bool = "${name} = ${toString value}\n";
int = "${name} = ${toString value}\n";
null = "";
set = "${name} = {\n${toConf value}}\n";
string =
if (builtins.match NEEDS_MULTILINE_RE value) != null
then toConfMultiline name value
else "${name} = ${value}\n";
}.${builtins.typeOf value})
values);
cfg = config.services.minetest-server;
flag = val: name: optionalString (val != null) "--${name} ${toString val} ";
flag = val: name: lib.optionals (val != null) ["--${name}" "${toString val}"];
flags = [
(flag cfg.gameId "gameid")
(flag cfg.world "world")
(flag cfg.configPath "config")
(flag cfg.logPath "logfile")
(flag cfg.port "port")
];
"--server"
]
++ (
if cfg.configPath != null
then ["--config" cfg.configPath]
else ["--config" (builtins.toFile "minetest.conf" (toConf cfg.config))])
++ (flag cfg.gameId "gameid")
++ (flag cfg.world "world")
++ (flag cfg.logPath "logfile")
++ (flag cfg.port "port")
++ cfg.extraArgs;
in
{
options = {
@@ -55,6 +92,16 @@ in
'';
};
config = mkOption {
type = types.attrsOf types.anything;
default = {};
description = lib.mdDoc ''
Settings to add to the minetest config file.
This option is ignored if `configPath` is set.
'';
};
logPath = mkOption {
type = types.nullOr types.path;
default = null;
@@ -75,6 +122,14 @@ in
If set to null, the default 30000 will be used.
'';
};
extraArgs = mkOption {
type = types.listOf types.str;
default = [];
description = lib.mdDoc ''
Additional command line flags to pass to the minetest executable.
'';
};
};
};
@@ -100,7 +155,7 @@ in
script = ''
cd /var/lib/minetest
exec ${pkgs.minetest}/bin/minetest --server ${concatStrings flags}
exec ${pkgs.minetest}/bin/minetest ${lib.escapeShellArgs flags}
'';
};
};

1
nixos/modules/services/monitoring/prometheus/exporters.nix
View File

@@ -56,6 +56,7 @@ let
"nut"
"openldap"
"openvpn"
"php-fpm"
"pihole"
"postfix"
"postgres"

65
nixos/modules/services/monitoring/prometheus/exporters/php-fpm.nix Normal file
View File

@@ -0,0 +1,65 @@
{ config
, lib
, pkgs
, options
}:
let
logPrefix = "services.prometheus.exporter.php-fpm";
cfg = config.services.prometheus.exporters.php-fpm;
in {
port = 9253;
extraOpts = {
package = lib.mkPackageOptionMD pkgs "prometheus-php-fpm-exporter" {};
telemetryPath = lib.mkOption {
type = lib.types.str;
default = "/metrics";
description = lib.mdDoc ''
Path under which to expose metrics.
'';
};
environmentFile = lib.mkOption {
type = lib.types.nullOr lib.types.path;
default = null;
example = "/root/prometheus-php-fpm-exporter.env";
description = lib.mdDoc ''
Environment file as defined in {manpage}`systemd.exec(5)`.
Secrets may be passed to the service without adding them to the
world-readable Nix store, by specifying placeholder variables as
the option value in Nix and setting these variables accordingly in the
environment file.
Environment variables from this file will be interpolated into the
config file using envsubst with this syntax:
`$ENVIRONMENT ''${VARIABLE}`
For variables to use see [options and defaults](https://github.com/hipages/php-fpm_exporter#options-and-defaults).
The main use is to set the PHP_FPM_SCRAPE_URI that indicate how to connect to PHP-FPM process.
```
# Content of the environment file
PHP_FPM_SCRAPE_URI="unix:///tmp/php.sock;/status"
```
Note that this file needs to be available on the host on which
this exporter is running.
'';
};
};
serviceOpts = {
serviceConfig = {
EnvironmentFile = lib.mkIf (cfg.environmentFile != null) [ cfg.environmentFile ];
ExecStart = ''
${lib.getExe cfg.package} server \
--web.listen-address ${cfg.listenAddress}:${toString cfg.port} \
--web.telemetry-path ${cfg.telemetryPath} \
${lib.concatStringsSep " \\\n " cfg.extraFlags}
'';
};
};
}

1
nixos/modules/services/x11/desktop-managers/pantheon.nix
View File

@@ -315,7 +315,6 @@ in
environment.systemPackages = with pkgs.pantheon; [
contractor
file-roller-contract
gnome-bluetooth-contract
];
environment.pathsToLink = [

1
nixos/tests/all-tests.nix
View File

@@ -87,6 +87,7 @@ in {
# Testing the test driver
nixos-test-driver = {
extra-python-packages = handleTest ./nixos-test-driver/extra-python-packages.nix {};
lib-extend = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./nixos-test-driver/lib-extend.nix {};
node-name = runTest ./nixos-test-driver/node-name.nix;
};

1
nixos/tests/kernel-generic.nix
View File

@@ -31,6 +31,7 @@ let
linux_5_10_hardened
linux_5_15_hardened
linux_6_1_hardened
linux_6_3_hardened
linux_testing;
};

31
nixos/tests/nixos-test-driver/lib-extend.nix Normal file
View File

@@ -0,0 +1,31 @@
{ pkgs, ... }:
let
patchedPkgs = pkgs.extend (new: old: {
lib = old.lib.extend (self: super: {
sorry_dave = "sorry dave";
});
});
testBody = {
name = "demo lib overlay";
nodes = {
machine = { lib, ... }: {
environment.etc."got-lib-overlay".text = lib.sorry_dave;
};
};
# We don't need to run an actual test. Instead we build the `machine` configuration
# and call it a day, because that already proves that `lib` is wired up correctly.
# See the attrset returned at the bottom of this file.
testScript = "";
};
inherit (patchedPkgs.testers) nixosTest runNixOSTest;
evaluationNixosTest = nixosTest testBody;
evaluationRunNixOSTest = runNixOSTest testBody;
in {
nixosTest = evaluationNixosTest.driver.nodes.machine.system.build.toplevel;
runNixOSTest = evaluationRunNixOSTest.driver.nodes.machine.system.build.toplevel;
}

43
nixos/tests/prometheus-exporters.nix
View File

@@ -6,7 +6,7 @@
let
inherit (import ../lib/testing-python.nix { inherit system pkgs; }) makeTest;
inherit (pkgs.lib) concatStringsSep maintainers mapAttrs mkMerge
removeSuffix replaceStrings singleton splitString;
removeSuffix replaceStrings singleton splitString makeBinPath;
/*
* The attrset `exporterTests` contains one attribute
@@ -914,6 +914,47 @@ let
'';
};
php-fpm = {
nodeName = "php_fpm";
exporterConfig = {
enable = true;
environmentFile = pkgs.writeTextFile {
name = "/tmp/prometheus-php-fpm-exporter.env";
text = ''
PHP_FPM_SCRAPE_URI="tcp://127.0.0.1:9000/status"
'';
};
};
metricProvider = {
users.users."php-fpm-exporter" = {
isSystemUser = true;
group = "php-fpm-exporter";
};
users.groups."php-fpm-exporter" = {};
services.phpfpm.pools."php-fpm-exporter" = {
user = "php-fpm-exporter";
group = "php-fpm-exporter";
settings = {
"pm" = "dynamic";
"pm.max_children" = 32;
"pm.max_requests" = 500;
"pm.start_servers" = 2;
"pm.min_spare_servers" = 2;
"pm.max_spare_servers" = 5;
"pm.status_path" = "/status";
"listen" = "127.0.0.1:9000";
"listen.allowed_clients" = "127.0.0.1";
};
phpEnv."PATH" = makeBinPath [ pkgs.php ];
};
};
exporterTest = ''
wait_for_unit("phpfpm-php-fpm-exporter.service")
wait_for_unit("prometheus-php-fpm-exporter.service")
succeed("curl -sSf http://localhost:9253/metrics | grep 'phpfpm_up{.*} 1'")
'';
};
postfix = {
exporterConfig = {
enable = true;

4
pkgs/applications/audio/flacon/default.nix
View File

@@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "flacon";
version = "11.1.0";
version = "11.2.0";
src = fetchFromGitHub {
owner = "flacon";
repo = "flacon";
rev = "v${version}";
sha256 = "sha256-nAJKTRkx8d53v1tPnu5ARrRoESKh4jUOCcD54bhE8TU=";
sha256 = "sha256-pDTBA9HpFzwagz9B5AmaHzML361ON3XA+OIZJQyAuJo=";
};
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];

9
pkgs/applications/blockchains/lightwalletd/default.nix
View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "lightwalletd";
version = "0.4.10";
version = "0.4.13";
src = fetchFromGitHub {
owner = "zcash";
repo = "lightwalletd";
rev = "68789356fb1a75f62735a529b38389ef08ea7582";
sha256 = "sha256-7gZhr6YMarGdgoGjg+oD4nZ/SAJ5cnhEDKmA4YMqJTo=";
rev = "v${version}";
hash = "sha256-oFP1VHDhbx95QLGcIraHjeKSnLfvagJg4bcd3Lem+s4=";
};
vendorSha256 = null;
vendorHash = "sha256-RojAxNU5ggjTMPDF2BuB4NyuSRG6HMe3amYTjG2PRFc=";
ldflags = [
"-s" "-w"
@@ -38,6 +38,5 @@ buildGoModule rec {
homepage = "https://github.com/zcash/lightwalletd";
maintainers = with maintainers; [ centromere ];
license = licenses.mit;
platforms = platforms.linux ++ platforms.darwin;
};
}

6
pkgs/applications/blockchains/snarkos/default.nix
View File

@@ -10,16 +10,16 @@
}:
rustPlatform.buildRustPackage rec {
pname = "snarkos";
version = "2.1.1";
version = "2.1.3";
src = fetchFromGitHub {
owner = "AleoHQ";
repo = "snarkOS";
rev = "v${version}";
sha256 = "sha256-ewWsiDyPaQ2GOMA31b1bc+wtRbkoWXyPzDhy0Qq2vKI=";
sha256 = "sha256-IdV92JDZQja0xVlB5JjuBfC/FdWM4PK2UDndb8DDBR0=";
};
cargoHash = "sha256-HD+oVwFMUK00GQbJCrvLC+VWJ9p1L3j2f8rpQUIDKf8=";
cargoHash = "sha256-/oI1RJHZdPFZrAojtYAO1cT8yW8dJNcGQCxUY9DMtx8=";
# buildAndTestSubdir = "cli";

21
pkgs/applications/blockchains/sparrow/default.nix
View File

@@ -21,11 +21,11 @@
let
pname = "sparrow";
version = "1.7.6";
version = "1.7.7";
src = fetchurl {
url = "https://github.com/sparrowwallet/${pname}/releases/download/${version}/${pname}-${version}-x86_64.tar.gz";
sha256 = "01ksl790i8swvj8nvl2r27bbd8kad80shsbw3di39925841dp8z3";
sha256 = "07mgh6xjj8i4d2pvwldl2y586y4fw9ir0rzxr97bh379fdcfqfxa";
};
launcher = writeScript "sparrow" ''
@@ -47,9 +47,11 @@ let
--add-opens javafx.controls/com.sun.javafx.scene.control=centerdevice.nsmenufx
--add-opens javafx.graphics/com.sun.javafx.menu=centerdevice.nsmenufx
--add-opens javafx.graphics/com.sun.glass.ui=com.sparrowwallet.sparrow
--add-opens=javafx.graphics/javafx.scene.input=com.sparrowwallet.sparrow
--add-opens javafx.graphics/com.sun.javafx.application=com.sparrowwallet.sparrow
--add-opens java.base/java.net=com.sparrowwallet.sparrow
--add-opens java.base/java.io=com.google.gson
--add-opens=java.smartcardio/sun.security.smartcardio=com.sparrowwallet.sparrow
--add-reads com.sparrowwallet.merged.module=java.desktop
--add-reads com.sparrowwallet.merged.module=java.sql
--add-reads com.sparrowwallet.merged.module=com.sparrowwallet.sparrow
@@ -165,9 +167,9 @@ stdenv.mkDerivation rec {
desktopItems = [
(makeDesktopItem {
name = "Sparrow";
exec = pname;
icon = pname;
name = "sparrow-desktop";
exec = "sparrow-desktop";
icon = "sparrow-desktop";
desktopName = "Sparrow Bitcoin Wallet";
genericName = "Bitcoin Wallet";
categories = [ "Finance" "Network" ];
@@ -185,7 +187,7 @@ stdenv.mkDerivation rec {
for n in 16 24 32 48 64 96 128 256; do
size=$n"x"$n
mkdir -p $out/hicolor/$size/apps
convert lib/Sparrow.png -resize $size $out/hicolor/$size/apps/sparrow.png
convert lib/Sparrow.png -resize $size $out/hicolor/$size/apps/sparrow-desktop.png
done;
'';
};
@@ -195,9 +197,9 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin $out
ln -s ${sparrow-modules}/modules $out/lib
install -D -m 777 ${launcher} $out/bin/sparrow
substituteAllInPlace $out/bin/sparrow
substituteInPlace $out/bin/sparrow --subst-var-by jdkModules ${jdk-modules}
install -D -m 777 ${launcher} $out/bin/sparrow-desktop
substituteAllInPlace $out/bin/sparrow-desktop
substituteInPlace $out/bin/sparrow-desktop --subst-var-by jdkModules ${jdk-modules}
mkdir -p $out/share/icons
ln -s ${sparrow-icons}/hicolor $out/share/icons
@@ -220,5 +222,6 @@ stdenv.mkDerivation rec {
license = licenses.asl20;
maintainers = with maintainers; [ emmanuelrosa _1000101 ];
platforms = [ "x86_64-linux" ];
mainProgram = "sparrow-desktop";
};
}

4
pkgs/applications/blockchains/sparrow/fhsenv.nix
View File

@@ -4,9 +4,9 @@
}:
buildFHSEnv {
name = "sparrow";
name = "sparrow-desktop";
runScript = "${sparrow-unwrapped}/bin/sparrow";
runScript = "${sparrow-unwrapped}/bin/sparrow-desktop";
targetPkgs = pkgs: with pkgs; [
sparrow-unwrapped

22
pkgs/applications/editors/molsketch/default.nix
View File

@@ -1,9 +1,9 @@
{ lib
, stdenv
, mkDerivation
, fetchurl
, cmake
, pkg-config
, wrapQtAppsHook
, hicolor-icon-theme
, openbabel
, desktop-file-utils
@@ -12,18 +12,32 @@
mkDerivation rec {
pname = "molsketch";
version = "0.7.3";
version = "0.8.0";
src = fetchurl {
url = "mirror://sourceforge/molsketch/Molsketch-${version}-src.tar.gz";
hash = "sha256-82iNJRiXqESwidjifKBf0+ljcqbFD1WehsXI8VUgrwQ=";
hash = "sha256-Mpx4fHktxqBAkmdwqg2pXvEgvvGUQPbgqxKwXKjhJuQ=";
};
# uses C++17 APIs like std::transform_reduce
postPatch = ''
substituteInPlace molsketch/CMakeLists.txt \
--replace "CXX_STANDARD 14" "CXX_STANDARD 17"
substituteInPlace libmolsketch/CMakeLists.txt \
--replace "CXX_STANDARD 14" "CXX_STANDARD 17"
substituteInPlace obabeliface/CMakeLists.txt \
--replace "CXX_STANDARD 14" "CXX_STANDARD 17"
'';
preConfigure = ''
cmakeFlags="$cmakeFlags -DMSK_PREFIX=$out"
'';
nativeBuildInputs = [ cmake pkg-config ];
postFixup = ''
mv $out/lib/molsketch/* $out/lib
'';
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];
buildInputs = [
hicolor-icon-theme
openbabel

224
pkgs/applications/editors/vim/plugins/generated.nix
View File

@@ -173,12 +173,12 @@ final: prev:
LazyVim = buildVimPluginFrom2Nix {
pname = "LazyVim";
version = "2023-06-28";
version = "2023-06-29";
src = fetchFromGitHub {
owner = "LazyVim";
repo = "LazyVim";
rev = "c03b9a3ff1fa1e6acc1db8d7db0c89c562637f7d";
sha256 = "03s8dx5mjdvijrs4smvhnsg3nn4r7c0gjzj1wqbzcmw0jz7cwmnc";
rev = "0e33010937d9f759d5f6de04c2ef6f2340ff1483";
sha256 = "034853449qa8shg4i98hazv7azz6q0vam6vgv2mvsh7fm1xi011x";
};
meta.homepage = "https://github.com/LazyVim/LazyVim/";
};
@@ -351,6 +351,18 @@ final: prev:
meta.homepage = "https://github.com/tmhedberg/SimpylFold/";
};
SmartCase = buildVimPluginFrom2Nix {
pname = "SmartCase";
version = "2010-10-18";
src = fetchFromGitHub {
owner = "vim-scripts";
repo = "SmartCase";
rev = "e8a737fae8961e45f270f255d43d16c36ac18f27";
sha256 = "06hf56a3gyc6zawdjfvs1arl62aq5fzncl8bpwv35v66bbkjvw3w";
};
meta.homepage = "https://github.com/vim-scripts/SmartCase/";
};
SpaceCamp = buildVimPluginFrom2Nix {
pname = "SpaceCamp";
version = "2023-06-22";
@@ -1099,12 +1111,12 @@ final: prev:
bufdelete-nvim = buildVimPluginFrom2Nix {
pname = "bufdelete.nvim";
version = "2023-06-15";
version = "2023-06-29";
src = fetchFromGitHub {
owner = "famiu";
repo = "bufdelete.nvim";
rev = "8d15a0a3189b02ac7ad9dd6dc089cc62edf095c6";
sha256 = "07a2ncdwyh848d4zwp0zxhc8py11wvdzxjn3x4i4sgf0cq4pm37n";
rev = "07d1f8ba79dec59d42b975a4df1c732b2e4e37b4";
sha256 = "10whb4jd96h41qkmwvdsnn6cvj005x9l0dz7b0yrypa0yi2xirjj";
};
meta.homepage = "https://github.com/famiu/bufdelete.nvim/";
};
@@ -1963,12 +1975,12 @@ final: prev:
codeium-vim = buildVimPluginFrom2Nix {
pname = "codeium.vim";
version = "2023-06-28";
version = "2023-06-29";
src = fetchFromGitHub {
owner = "Exafunction";
repo = "codeium.vim";
rev = "3cd85d90c112c72ecd93763e0602b93e263f194c";
sha256 = "074jw9h972ngax0pm6yi9qfppq73lkadn7m94snn86qjchn4fw24";
rev = "f053fad7826a77860b5bc33a6076c86408f3b255";
sha256 = "0a43zx7pxy6z3pnl7w31b9g73brpffqwigwz20bc9pasnw3x5zaw";
};
meta.homepage = "https://github.com/Exafunction/codeium.vim/";
};
@@ -2239,12 +2251,12 @@ final: prev:
copilot-lua = buildVimPluginFrom2Nix {
pname = "copilot.lua";
version = "2023-06-24";
version = "2023-06-29";
src = fetchFromGitHub {
owner = "zbirenbaum";
repo = "copilot.lua";
rev = "33aa9419da8f9bf9b6a992e6c9c7b7f9e36dac06";
sha256 = "1r9ync87w3vk9zb2l75qlp2xwibdm67v051crznmms1wzp067npd";
rev = "686670843e6f555b8a42fb0a269c1bbaee745421";
sha256 = "00nrc6ywmc51gh6pphdhxlanw03vn9r6xxlm2lx7f8yf1gpg3ajn";
};
meta.homepage = "https://github.com/zbirenbaum/copilot.lua/";
};
@@ -2299,12 +2311,12 @@ final: prev:
coq_nvim = buildVimPluginFrom2Nix {
pname = "coq_nvim";
version = "2023-06-28";
version = "2023-06-29";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "coq_nvim";
rev = "b31a6fc0ac3794780e60d3f12bffc43727ac859e";
sha256 = "1y3d8avbhabgw97yx21524zz9svanavlyc3rqwk26ha194k0p3b7";
rev = "5f51b80d08321fb0854f71b663aeca1828895835";
sha256 = "1q3d1gq6cj51a7va10mv8ljsrn6yy8xs9k2fwp7p4g8sgfacdv8n";
};
meta.homepage = "https://github.com/ms-jpq/coq_nvim/";
};
@@ -2853,12 +2865,12 @@ final: prev:
diffview-nvim = buildVimPluginFrom2Nix {
pname = "diffview.nvim";
version = "2023-06-26";
version = "2023-06-29";
src = fetchFromGitHub {
owner = "sindrets";
repo = "diffview.nvim";
rev = "ff8e57a966618e973f443b2df177cab02e7f325c";
sha256 = "08yh8amr3401xk5c86gfgbv919c58x82csqzyn1fc19scsi72vrj";
rev = "766a4f210e67e522659302dc6bd8a8d3b8c08c54";
sha256 = "1fyq8d68j4n9659s1gpm7bgkx9x0y17hf5mdgh51rhcmfqx148ah";
};
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
};
@@ -3069,6 +3081,18 @@ final: prev:
meta.homepage = "https://github.com/vim-scripts/emodeline/";
};
errormarker-vim = buildVimPluginFrom2Nix {
pname = "errormarker.vim";
version = "2015-01-26";
src = fetchFromGitHub {
owner = "vim-scripts";
repo = "errormarker.vim";
rev = "eab7ae1d8961d3512703aa9eadefbde5f062a970";
sha256 = "11fh1468fr0vrgf73hjkvvpslh2s2pmghnkq8nny38zvf6kwzhxa";
};
meta.homepage = "https://github.com/vim-scripts/errormarker.vim/";
};
everforest = buildVimPluginFrom2Nix {
pname = "everforest";
version = "2023-05-19";
@@ -3252,12 +3276,12 @@ final: prev:
flash-nvim = buildVimPluginFrom2Nix {
pname = "flash.nvim";
version = "2023-06-28";
version = "2023-06-29";
src = fetchFromGitHub {
owner = "folke";
repo = "flash.nvim";
rev = "feda1d5a98a1705e86966e62a052661a7369b3c0";
sha256 = "1rh9gkpaabqs98a4q57xqwqaf7ds193b4yfkhs6b2h3mbgw3p0w2";
rev = "cdf8f0e07527657b7cf6143f77181cac1e04419b";
sha256 = "03izlyq8p9y80dbxd3gja667sm7rb2lm3jmzsgvqp8nf68qa7vg9";
};
meta.homepage = "https://github.com/folke/flash.nvim/";
};
@@ -3372,12 +3396,12 @@ final: prev:
friendly-snippets = buildVimPluginFrom2Nix {
pname = "friendly-snippets";
version = "2023-06-21";
version = "2023-06-28";
src = fetchFromGitHub {
owner = "rafamadriz";
repo = "friendly-snippets";
rev = "5749f093759c29e3694053d048ceb940fe12c3d3";
sha256 = "1shzw4886qifn90n5kpjhz9iqckqmfgfwmfk9ahkggd6l5844rw9";
rev = "1723ae01d83f3b3ac1530f1ae22b7b9d5da7749b";
sha256 = "1vkdfzyjsjg3j34l7byxsiai9izqcijcdmxm8ynlf54gigihzzpz";
};
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
};
@@ -5171,12 +5195,12 @@ final: prev:
mason-lspconfig-nvim = buildVimPluginFrom2Nix {
pname = "mason-lspconfig.nvim";
version = "2023-06-28";
version = "2023-06-29";
src = fetchFromGitHub {
owner = "williamboman";
repo = "mason-lspconfig.nvim";
rev = "4c3baba22189aa2a08d32bb8d08b32c7e22a2e84";
sha256 = "0yakim6qqjacii1q8rp4ywwmlyn4pr47325qiwvzysz1yw2angcl";
rev = "4f1c72767bec31397d59554f84096909b2887195";
sha256 = "0bw94dqidb294xy8zkqxz4xbvpf0f311wpbxpk1zvwv19vxqvba3";
};
meta.homepage = "https://github.com/williamboman/mason-lspconfig.nvim/";
};
@@ -5199,8 +5223,8 @@ final: prev:
src = fetchFromGitHub {
owner = "williamboman";
repo = "mason.nvim";
rev = "8adaf0bc58ddadd70dad563f949042fb1cb0211c";
sha256 = "0c4y6gjc7f2yd83hm09arqyq9bli5f7k2h80qd114n2snarvd09f";
rev = "b68d3be4b664671002221d43c82e74a0f1006b26";
sha256 = "1hmkn4r4n2qqv9g3yyngh0g4lmb8cbn7xbpk9y1lxrwl3xcg9ljs";
};
meta.homepage = "https://github.com/williamboman/mason.nvim/";
};
@@ -5327,12 +5351,12 @@ final: prev:
modicator-nvim = buildVimPluginFrom2Nix {
pname = "modicator.nvim";
version = "2023-06-16";
version = "2023-06-29";
src = fetchFromGitHub {
owner = "mawkler";
repo = "modicator.nvim";
rev = "9e508c350d1794d1ac61d42d56106637d95bd84b";
sha256 = "0gcapl7yg21n6da47xz4qlrgl2s28aaahx6a0r83mm15fnb0fmv4";
rev = "2c19ec450532159fa4cf8f89a01d3de07d929c59";
sha256 = "0k40hxc8vi745rpxnsrwlv437rfydgiad7nmzi44iskarm0la257";
};
meta.homepage = "https://github.com/mawkler/modicator.nvim/";
};
@@ -5627,12 +5651,12 @@ final: prev:
neo-tree-nvim = buildVimPluginFrom2Nix {
pname = "neo-tree.nvim";
version = "2023-06-25";
version = "2023-06-29";
src = fetchFromGitHub {
owner = "nvim-neo-tree";
repo = "neo-tree.nvim";
rev = "70d3daa22bf24de9e3e284ac659506b1374e3ae2";
sha256 = "1w5rvkshf1hlz176dqk3jrp1msabl339lfsvmy0b9kw4gxqf0w2j";
rev = "f765e75e7d2444629b5ace3cd7609c12251de254";
sha256 = "0bybiksbxx5z9gwg9xivhi3bsqimkvlvdz4xmxh7pkqnbw5qq2am";
};
meta.homepage = "https://github.com/nvim-neo-tree/neo-tree.nvim/";
};
@@ -5651,12 +5675,12 @@ final: prev:
neoconf-nvim = buildVimPluginFrom2Nix {
pname = "neoconf.nvim";
version = "2023-06-27";
version = "2023-06-29";
src = fetchFromGitHub {
owner = "folke";
repo = "neoconf.nvim";
rev = "3454d48dce19e0fe534e3e4849aa17c47c47d15f";
sha256 = "1rgxp5hhh7qavabj17m1wkxjllcs3qpn08fjnlxcyxg5z2731z7s";
rev = "08f146d53e075055500dca35e93281faff95716b";
sha256 = "1qrb9pk2m0zfdm6qsdlhp2jjqbk8sg3h2s5lmvd0q14ixb26bxbv";
};
meta.homepage = "https://github.com/folke/neoconf.nvim/";
};
@@ -5999,12 +6023,12 @@ final: prev:
neotest-rust = buildVimPluginFrom2Nix {
pname = "neotest-rust";
version = "2023-06-23";
version = "2023-06-28";
src = fetchFromGitHub {
owner = "rouge8";
repo = "neotest-rust";
rev = "5072eeb9f9f74856cbd95486699f5c17ab174f5c";
sha256 = "1yij2s8h6ip75qnzqd8maknlwcbxhlbrzzl6inch6l4iam66vs2n";
rev = "e9015a5e343dc47dac90dc74effb3dd11ff7d2ae";
sha256 = "0aix8phfsyb7hsyqxg6f8nfzhhpy7vzk2if3g8n0dzq1krmm6dk3";
};
meta.homepage = "https://github.com/rouge8/neotest-rust/";
};
@@ -6047,12 +6071,12 @@ final: prev:
neovim-ayu = buildVimPluginFrom2Nix {
pname = "neovim-ayu";
version = "2023-04-16";
version = "2023-06-29";
src = fetchFromGitHub {
owner = "Shatur";
repo = "neovim-ayu";
rev = "762ff24bd429fbb1c1e20b13043b4c8f0266bcf1";
sha256 = "0qwaxnk2ywdfi04c0dgx438w765vq9df7g4dicb73626jfdvy141";
rev = "76dbf939b38e03ac5f9bd711ab3e434999f715c8";
sha256 = "1rkhjz24wfc6am1r9rqk0cndw82lqjaxxpmvfqjw1rdi2vb9xpqd";
};
meta.homepage = "https://github.com/Shatur/neovim-ayu/";
};
@@ -6215,12 +6239,12 @@ final: prev:
nlsp-settings-nvim = buildVimPluginFrom2Nix {
pname = "nlsp-settings.nvim";
version = "2023-06-27";
version = "2023-06-29";
src = fetchFromGitHub {
owner = "tamago324";
repo = "nlsp-settings.nvim";
rev = "19738dddb55273c244b03a94ff1b912563c8295d";
sha256 = "152jy6si32v1qc2rlkcfl9sx4sshpd1pxfifxrfdmkznq8yj0dnj";
rev = "64976a5ac70a9a43f3b1b42c5b1564f7f0e4077e";
sha256 = "0gvhazyc9cdzd1c6a2i740h1b50h947vbk3rz195sryi3zb7l2pb";
};
meta.homepage = "https://github.com/tamago324/nlsp-settings.nvim/";
};
@@ -6335,12 +6359,12 @@ final: prev:
null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls.nvim";
version = "2023-06-15";
version = "2023-06-28";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "null-ls.nvim";
rev = "bbaf5a96913aa92281f154b08732be2f57021c45";
sha256 = "1hhqwk2jd22bd6215ax9n865xjn3djqbfmrki2nk9wjn4jmij4ik";
rev = "b919452c84e461c21a79185bef90c96e1cfecff9";
sha256 = "1liw8w2hfgk99ix4rfg1la9yb1yr36nf77ymz2042rjr0zc8qjfk";
};
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
};
@@ -6359,12 +6383,12 @@ final: prev:
nvchad = buildVimPluginFrom2Nix {
pname = "nvchad";
version = "2023-06-24";
version = "2023-06-28";
src = fetchFromGitHub {
owner = "nvchad";
repo = "nvchad";
rev = "286c951d7b1f4531c8f40873a3846f40a3503e33";
sha256 = "0pcavy26kd84m050z5dmxx9gava0zrvggbmn5p537hwq7x9zwara";
rev = "10b668d98aba6bce9b494d028174207e59e5c59a";
sha256 = "1yn01dfix232q2hlmbki9x446qbawa3dkiczg7hn270vvpipgspn";
};
meta.homepage = "https://github.com/nvchad/nvchad/";
};
@@ -6503,12 +6527,12 @@ final: prev:
nvim-cokeline = buildVimPluginFrom2Nix {
pname = "nvim-cokeline";
version = "2023-06-20";
version = "2023-06-29";
src = fetchFromGitHub {
owner = "willothy";
repo = "nvim-cokeline";
rev = "cb4bbdf9bb6c8a070a655f04842bb86a101e040d";
sha256 = "0wrjqlyhyxfrd3g1c2gh6qzysc0v6n9nfgpgx19j8r0icxribsvq";
rev = "469800429c6e71cd46ee226c40035c31bc6a6ba1";
sha256 = "1z13lfghyb9a24myb4k1jkf75ipcxs5hnhci9bcwgz2l3smz31ww";
};
meta.homepage = "https://github.com/willothy/nvim-cokeline/";
};
@@ -6767,12 +6791,12 @@ final: prev:
nvim-jdtls = buildVimPluginFrom2Nix {
pname = "nvim-jdtls";
version = "2023-06-22";
version = "2023-06-29";
src = fetchFromGitHub {
owner = "mfussenegger";
repo = "nvim-jdtls";
rev = "c6a3c47a0c57c6c0c9b5fb92d3770bb59e92d9c6";
sha256 = "0239v4y3hr3g8njd14ii79ndrk56i494nfp1rx4lzj3a2jmx0b4r";
rev = "0261cf5a76cf2ef807c4ae0ede18fc9d791ebf02";
sha256 = "1r49yyrl7a6x41gyw1c486wwcw6b2619d1cca4kirswmxbk3c9gy";
};
meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/";
};
@@ -6863,12 +6887,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
version = "2023-06-23";
version = "2023-06-29";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
rev = "b6b34b9acf84949f0ac1c00747765e62b81fb38d";
sha256 = "12p1flmk9qp71kmy9sgv8a5izdwk1n4fggdpmiz42wyg7znzjxmp";
rev = "a2c8ad6c7b4e35ed33d648795dcb1e08dbd4ec01";
sha256 = "1zqhxk33513ncc0d9ljlvfcdd0p358awdhb1n99y80l9w1qmf3n1";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@@ -7199,12 +7223,12 @@ final: prev:
nvim-treesitter = buildVimPluginFrom2Nix {
pname = "nvim-treesitter";
version = "2023-06-28";
version = "2023-06-29";
src = fetchFromGitHub {
owner = "nvim-treesitter";
repo = "nvim-treesitter";
rev = "e7f2b1276b7aa68099acc8169ce51f7e389b1772";
sha256 = "0q8wgw46pxdgs41agf9ldwyzn3gjznrq66kxza74s6mn20blmpwc";
rev = "4c3912dfa865e3ee97c8164322847b8b487779b2";
sha256 = "1ma9yai44j2224migk1zjdq5dqgdj397b1ikllmhzmccwas3sdk5";
};
meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/";
};
@@ -9656,12 +9680,12 @@ final: prev:
treesj = buildVimPluginFrom2Nix {
pname = "treesj";
version = "2023-05-10";
version = "2023-06-29";
src = fetchFromGitHub {
owner = "Wansmer";
repo = "treesj";
rev = "b1e2976c2d7ba922371cc7f3ab08b75136c27231";
sha256 = "0lnilplr42d2vih4bpm3wgk4b5ir2bjr4nn11z36scswf3by4i4y";
rev = "3203aa553217921fd4dcb79245f9df07278910b2";
sha256 = "1a7ym8rdq1zb1w8pb3bvq75bid5r0sggj0xz7r2q2sk3m80dz6a5";
};
meta.homepage = "https://github.com/Wansmer/treesj/";
};
@@ -9764,12 +9788,12 @@ final: prev:
typescript-nvim = buildVimPluginFrom2Nix {
pname = "typescript.nvim";
version = "2023-06-06";
version = "2023-06-28";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "typescript.nvim";
rev = "5b3680e5c386e8778c081173ea0c978c14a40ccb";
sha256 = "0ixxgbcz8y42xlbin2dv3ycrlrgjd53shi9i8iyy0kxpr57cjldz";
rev = "de304087e6e49981fde01af8ccc5b21e8519306f";
sha256 = "0l3i9fj76y3yl63fh6hprs5fja0h0jl11lidv3p76bdr041gw06g";
};
meta.homepage = "https://github.com/jose-elias-alvarez/typescript.nvim/";
};
@@ -9828,8 +9852,8 @@ final: prev:
src = fetchFromGitHub {
owner = "unisonweb";
repo = "unison";
rev = "bb0e539222c8169353380b4822190c08e12a0f60";
sha256 = "0qs40nzidvf8zhrawkfz9y1d9b594ia1gnv2cyvqm1x4s8i8vy2h";
rev = "f30648e1a56f4c528a01e83fafbb93b05a11d4e9";
sha256 = "0nnlwl8wm20m266b6a039h6ld254xgwqczphm8hqvqmdkr8vnfgw";
};
meta.homepage = "https://github.com/unisonweb/unison/";
};
@@ -10434,6 +10458,18 @@ final: prev:
meta.homepage = "https://github.com/benizi/vim-automkdir/";
};
vim-autosource = buildVimPluginFrom2Nix {
pname = "vim-autosource";
version = "2021-12-22";
src = fetchFromGitHub {
owner = "jenterkin";
repo = "vim-autosource";
rev = "569440e157d6eb37fb098dfe95252533553a56f5";
sha256 = "0myg0knv0ld2jdhvdz9hx9rfngh1qh6668wbmnf4g1d25vccr2i1";
};
meta.homepage = "https://github.com/jenterkin/vim-autosource/";
};
vim-autoswap = buildVimPluginFrom2Nix {
pname = "vim-autoswap";
version = "2019-01-09";
@@ -10722,6 +10758,18 @@ final: prev:
meta.homepage = "https://github.com/alvan/vim-closetag/";
};
vim-cmake = buildVimPluginFrom2Nix {
pname = "vim-cmake";
version = "2021-06-25";
src = fetchFromGitHub {
owner = "vhdirk";
repo = "vim-cmake";
rev = "d4a6d1836987b933b064ba8ce5f3f0040a976880";
sha256 = "1xhak5cdnh0mg0w1hy0y4pgwaz9gcw1x1pbxidfxz0w903d0x5zw";
};
meta.homepage = "https://github.com/vhdirk/vim-cmake/";
};
vim-code-dark = buildVimPluginFrom2Nix {
pname = "vim-code-dark";
version = "2023-06-05";
@@ -11502,6 +11550,18 @@ final: prev:
meta.homepage = "https://github.com/maxjacobson/vim-fzf-coauthorship/";
};
vim-gas = buildVimPluginFrom2Nix {
pname = "vim-gas";
version = "2022-03-07";
src = fetchFromGitHub {
owner = "Shirk";
repo = "vim-gas";
rev = "2ca95211b465be8e2871a62ee12f16e01e64bd98";
sha256 = "1lc75g9spww221n64pjxwmill5rw5vix21nh0lhlaq1rl2y89vd6";
};
meta.homepage = "https://github.com/Shirk/vim-gas/";
};
vim-gh-line = buildVimPluginFrom2Nix {
pname = "vim-gh-line";
version = "2022-11-25";
@@ -15338,12 +15398,12 @@ final: prev:
chad = buildVimPluginFrom2Nix {
pname = "chad";
version = "2023-06-28";
version = "2023-06-29";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
rev = "c9e066075d440a246caeb5434abd31e79e788ee6";
sha256 = "12dq2b7w6pkf4qbq48qz0drqzdm2fq3ndcz5czrlkq1pimh1zjr4";
rev = "5f19d1797ca5f05a0b7cccd69e644c690fa72899";
sha256 = "07a4qlypr6zqxr3m8sj9vpfd82pwpia6f7jcpkfilqzmdyrdvn5l";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -15480,6 +15540,18 @@ final: prev:
meta.homepage = "https://github.com/rose-pine/neovim/";
};
tinykeymap = buildVimPluginFrom2Nix {
pname = "tinykeymap";
version = "2019-03-15";
src = fetchFromGitHub {
owner = "tomtom";
repo = "tinykeymap_vim";
rev = "be48fc729244f84c2d293c3db18420e7f5d74bb8";
sha256 = "1w4zplg0mbiv9jp70cnzb1aw5xx3x8ibnm38vsapvspzy9h8ygqx";
};
meta.homepage = "https://github.com/tomtom/tinykeymap_vim/";
};
vim-advanced-sorters = buildVimPluginFrom2Nix {
pname = "vim-advanced-sorters";
version = "2021-11-21";

37
pkgs/applications/editors/vim/plugins/nvim-treesitter/generated.nix
View File

@@ -590,12 +590,12 @@
};
gitcommit = buildGrammar {
language = "gitcommit";
version = "0.0.0+rev=5e3263c";
version = "0.0.0+rev=6856a5f";
src = fetchFromGitHub {
owner = "gbprod";
repo = "tree-sitter-gitcommit";
rev = "5e3263c856d2de7ecbcfb646352c8e29dc2b83e6";
hash = "sha256-Hzck3DfxzWz30ma52CbzC/Wyiqx2BlKoaqtiYgPKl/o=";
rev = "6856a5fd0ffeff17d83325a8ce4e57811010eff1";
hash = "sha256-OD+lGLsMRFRPHwnXoM78t95QvjO0OQN4ae3z3wy5DO4=";
};
meta.homepage = "https://github.com/gbprod/tree-sitter-gitcommit";
};
@@ -821,12 +821,12 @@
};
html = buildGrammar {
language = "html";
version = "0.0.0+rev=03e9435";
version = "0.0.0+rev=ab91d87";
src = fetchFromGitHub {
owner = "tree-sitter";
repo = "tree-sitter-html";
rev = "03e9435d5a95e3fcb9d7e2720c2aac5fc1b9ae8f";
hash = "sha256-iDdWrjvj7f4COanuqcRZQNpAJypLPQc7vbwrO8bSYnE=";
rev = "ab91d87963c47ffd08a7967b9aa73eb53293d120";
hash = "sha256-OJ1RcYRU2A8y3taXe+sO+HnUt2o2G8tznwDzwPL0H7Y=";
};
meta.homepage = "https://github.com/tree-sitter/tree-sitter-html";
};
@@ -997,12 +997,12 @@
};
kotlin = buildGrammar {
language = "kotlin";
version = "0.0.0+rev=100d79f";
version = "0.0.0+rev=8d43d90";
src = fetchFromGitHub {
owner = "fwcd";
repo = "tree-sitter-kotlin";
rev = "100d79fd96b56a1b99099a8d2f3c114b8687acfb";
hash = "sha256-+TLeB6S5MwbbxPZSvDasxAfTPV3YyjtR0pUTlFkdphc=";
rev = "8d43d90d568a97afee0891949d7cead3294ca94d";
hash = "sha256-nY+tGg8aD7ayAhE5HTBsrVMyYBl1lfjXmcTTYuYTSbY=";
};
meta.homepage = "https://github.com/fwcd/tree-sitter-kotlin";
};
@@ -1729,12 +1729,12 @@
};
sql = buildGrammar {
language = "sql";
version = "0.0.0+rev=7bd15d1";
version = "0.0.0+rev=bd53a6c";
src = fetchFromGitHub {
owner = "derekstride";
repo = "tree-sitter-sql";
rev = "7bd15d1ca789c5aaef5d2dbfdb14565ec8223d1b";
hash = "sha256-yX1Ttwl+GgmguThHpIsnM/x3O57WY+u4NcChSdokHo0=";
rev = "bd53a6c482d865365cbfb034168ca78364d1d136";
hash = "sha256-JpEi+bX2e7fo1Cgp3VZNZlsK850nBnBGBsMnt6UrQTA=";
};
meta.homepage = "https://github.com/derekstride/tree-sitter-sql";
};
@@ -2097,6 +2097,19 @@
};
meta.homepage = "https://github.com/theHamsta/tree-sitter-wgsl-bevy";
};
wing = buildGrammar {
language = "wing";
version = "0.0.0+rev=bb54f98";
src = fetchFromGitHub {
owner = "winglang";
repo = "wing";
rev = "bb54f98e55db82d67711abadefdbd3b933c9efc3";
hash = "sha256-z4n4VneiCfCoEg7GHa8GAyUYAbJkoe973aPMUEheU+Y=";
};
location = "libs/tree-sitter-wing";
generate = true;
meta.homepage = "https://github.com/winglang/wing";
};
yaml = buildGrammar {
language = "yaml";
version = "0.0.0+rev=0e36bed";

6
pkgs/applications/editors/vim/plugins/vim-plugin-names
View File

@@ -28,6 +28,7 @@ https://github.com/b0o/SchemaStore.nvim/,,
https://github.com/sunjon/Shade.nvim/,,
https://github.com/vim-scripts/ShowMultiBase/,,
https://github.com/tmhedberg/SimpylFold/,,
https://github.com/vim-scripts/SmartCase/,,
https://github.com/jaredgorski/SpaceCamp/,,
https://github.com/SpaceVim/SpaceVim/,,
https://github.com/chrisbra/SudoEdit.vim/,,
@@ -256,6 +257,7 @@ https://github.com/elmcast/elm-vim/,,
https://github.com/dmix/elvish.vim/,,
https://github.com/mattn/emmet-vim/,,
https://github.com/vim-scripts/emodeline/,,
https://github.com/vim-scripts/errormarker.vim/,,
https://github.com/sainnhe/everforest/,,
https://github.com/google/executor.nvim/,HEAD,
https://github.com/nvchad/extensions/,HEAD,nvchad-extensions
@@ -800,6 +802,7 @@ https://github.com/ron89/thesaurus_query.vim/,,
https://github.com/itchyny/thumbnail.vim/,,
https://github.com/vim-scripts/timestamp.vim/,,
https://github.com/levouh/tint.nvim/,HEAD,
https://github.com/tomtom/tinykeymap_vim/,,tinykeymap
https://github.com/tomtom/tlib_vim/,,
https://github.com/wellle/tmux-complete.vim/,,
https://github.com/aserowy/tmux.nvim/,HEAD,
@@ -882,6 +885,7 @@ https://github.com/hura/vim-asymptote/,,
https://github.com/907th/vim-auto-save/,,
https://github.com/vim-autoformat/vim-autoformat/,,
https://github.com/benizi/vim-automkdir/,,
https://github.com/jenterkin/vim-autosource/,,
https://github.com/gioele/vim-autoswap/,,
https://github.com/bazelbuild/vim-bazel/,,
https://github.com/moll/vim-bbye/,,
@@ -906,6 +910,7 @@ https://github.com/guns/vim-clojure-highlight/,,
https://github.com/guns/vim-clojure-static/,,
https://github.com/rstacruz/vim-closer/,,
https://github.com/alvan/vim-closetag/,,
https://github.com/vhdirk/vim-cmake/,,
https://github.com/tomasiser/vim-code-dark/,,
https://github.com/google/vim-codefmt/,,
https://github.com/kchmck/vim-coffee-script/,,
@@ -971,6 +976,7 @@ https://github.com/thinca/vim-ft-diff_fold/,,
https://github.com/tommcdo/vim-fubitive/,,
https://github.com/tpope/vim-fugitive/,,
https://github.com/maxjacobson/vim-fzf-coauthorship/,,
https://github.com/Shirk/vim-gas/,,
https://github.com/ruanyl/vim-gh-line/,,
https://github.com/raghur/vim-ghost/,,
https://github.com/mattn/vim-gist/,,

20
pkgs/applications/emulators/pcsx2/default.nix
View File

@@ -1,11 +1,11 @@
{ cmake
, fetchFromGitHub
, lib
, stdenv
, llvmPackages_16
, cubeb
, curl
, ffmpeg
, fmt
, fmt_8
, gettext
, harfbuzz
, libaio
@@ -37,25 +37,26 @@ let
pcsx2_patches = fetchFromGitHub {
owner = "PCSX2";
repo = "pcsx2_patches";
rev = "8db5ae467a35cc00dc50a65061aa78dc5115e6d1";
sha256 = "sha256-68kD7IAhBMASFmkGwvyQ7ppO/3B1csAKik+rU792JI4=";
rev = "c09d842168689aeba88b656e3e0a042128673a7c";
sha256 = "sha256-h1jqv3a3Ib/4C7toZpSlVB1VFNNF1MrrUxttqKJL794=";
};
in
stdenv.mkDerivation rec {
llvmPackages_16.stdenv.mkDerivation rec {
pname = "pcsx2";
version = "1.7.4554";
version = "1.7.4658";
src = fetchFromGitHub {
owner = "PCSX2";
repo = "pcsx2";
fetchSubmodules = true;
rev = "v${version}";
sha256 = "sha256-9MRbpm7JdVmZwv8zD4lErzVTm7A4tYM0FgXE9KpX+/8=";
sha256 = "sha256-5y7CYFWgNh9oCBuTITvw7Rn4sC6MbMczVMAwtWFkn9A=";
};
cmakeFlags = [
"-DDISABLE_ADVANCE_SIMD=TRUE"
"-DUSE_SYSTEM_LIBS=ON"
"-DUSE_LINKED_FFMPEG=ON"
"-DDISABLE_BUILD_DATE=TRUE"
];
@@ -70,7 +71,7 @@ stdenv.mkDerivation rec {
buildInputs = [
curl
ffmpeg
fmt
fmt_8
gettext
harfbuzz
libaio
@@ -98,7 +99,7 @@ stdenv.mkDerivation rec {
mkdir -p $out/bin
cp -a bin/pcsx2-qt bin/resources $out/bin/
install -Dm644 $src/pcsx2/Resources/AppIcon64.png $out/share/pixmaps/PCSX2.png
install -Dm644 $src/pcsx2-qt/resources/icons/AppIcon64.png $out/share/pixmaps/PCSX2.png
install -Dm644 $src/.github/workflows/scripts/linux/pcsx2-qt.desktop $out/share/applications/PCSX2.desktop
zip -jq $out/bin/resources/patches.zip ${pcsx2_patches}/patches/*
@@ -107,7 +108,6 @@ stdenv.mkDerivation rec {
qtWrapperArgs = [
"--prefix LD_LIBRARY_PATH : ${lib.makeLibraryPath ([
ffmpeg # It's loaded with dlopen. They plan to change it https://github.com/PCSX2/pcsx2/issues/8624
vulkan-loader
] ++ cubeb.passthru.backendLibs)}"
];

4
pkgs/applications/finance/denaro/default.nix
View File

@@ -14,13 +14,13 @@
buildDotnetModule rec {
pname = "denaro";
version = "2023.6.0";
version = "2023.6.2";
src = fetchFromGitHub {
owner = "NickvisionApps";
repo = "Denaro";
rev = version;
hash = "sha256-oLEk3xHDkz98wOMwqr+lLtsFmOJdyPYK1YAutegic7U=";
hash = "sha256-wnqk+UuOQc/Yph9MbQU8FRsNC/8ZQ9FxgF205pdHf+s=";
};
dotnet-sdk = dotnetCorePackages.sdk_7_0;

4
pkgs/applications/graphics/ImageMagick/default.nix
View File

@@ -47,13 +47,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "imagemagick";
version = "7.1.1-11";
version = "7.1.1-12";
src = fetchFromGitHub {
owner = "ImageMagick";
repo = "ImageMagick";
rev = finalAttrs.version;
hash = "sha256-/CZRnNy/p87sEcH94RkRYgYXexFSU0Bm809pcvDFdV4=";
hash = "sha256-URwSufiTcLGWRFNOJidJyEcIPxWUSdN7yHaCiFh7GEI=";
};
outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big

55
pkgs/applications/logging/humioctl/default.nix
View File

@@ -1,39 +1,32 @@
{ buildGoModule, fetchFromGitHub, installShellFiles, lib }:
let
humioCtlVersion = "0.30.2";
sha256 = "sha256-FqBS6PoEKMqK590f58re4ycYmrJScyij74Ngj+PLzLs=";
vendorSha256 = "sha256-70QxW2nn6PS6HZWllmQ8O39fbUcbe4c/nKAygLnD4n0=";
in buildGoModule {
name = "humioctl-${humioCtlVersion}";
pname = "humioctl";
version = humioCtlVersion;
buildGoModule rec {
pname = "humioctl";
version = "0.31.1";
vendorSha256 = vendorSha256;
src = fetchFromGitHub {
owner = "humio";
repo = "cli";
rev = "v${version}";
hash = "sha256-L5Ttos0TL8m62Y69riwnGmB1cOVF6XIH7jMVU8NuFKI=";
};
doCheck = false;
vendorHash = "sha256-GTPEHw3QsID9K6DcYNZRyDJzTqfDV9lHP2Trvd2aC8Y=";
src = fetchFromGitHub {
owner = "humio";
repo = "cli";
rev = "v${humioCtlVersion}";
sha256 = sha256;
};
ldflags = [ "-s" "-w" "-X main.version=${version}" ];
ldflags = [ "-X main.version=${humioCtlVersion}" ];
nativeBuildInputs = [ installShellFiles ];
nativeBuildInputs = [ installShellFiles ];
postInstall = ''
installShellCompletion --cmd humioctl \
--bash <($out/bin/humioctl completion bash) \
--zsh <($out/bin/humioctl completion zsh)
'';
postInstall = ''
$out/bin/humioctl completion bash > humioctl.bash
$out/bin/humioctl completion zsh > humioctl.zsh
installShellCompletion humioctl.{bash,zsh}
'';
meta = with lib; {
homepage = "https://github.com/humio/cli";
description = "A CLI for managing and sending data to Humio";
license = licenses.asl20;
maintainers = with maintainers; [ lucperkins ];
};
}
meta = with lib; {
homepage = "https://github.com/humio/cli";
description = "A CLI for managing and sending data to Humio";
license = licenses.asl20;
maintainers = with maintainers; [ lucperkins ];
};
}

31
pkgs/applications/misc/gimoji/default.nix Normal file
View File

@@ -0,0 +1,31 @@
{ lib
, rustPlatform
, fetchFromGitHub
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "gimoji";
version = "0.5.0";
src = fetchFromGitHub {
owner = "zeenix";
repo = "gimoji";
rev = version;
hash = "sha256-fRAi+ac/NzG6FQZq6ohpan5ZNtiwJXLV6k1BsMwaJsg=";
};
cargoHash = "sha256-57A/D6XgedQEaTn+lx5Ce/O8wR2xO3ozemLQOOF8/84=";
buildInputs = lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.AppKit
];
meta = with lib; {
description = "Easily add emojis to your git commit messages";
homepage = "https://github.com/zeenix/gimoji";
license = licenses.mit;
maintainers = with maintainers; [ a-kenji ];
};
}

40
pkgs/applications/misc/go-thumbnailer/default.nix Normal file
View File

@@ -0,0 +1,40 @@
{ lib
, buildGoModule
, fetchFromGitHub
, pkg-config
, vips
}:
buildGoModule rec {
pname = "go-thumbnailer";
version = "0.1.0";
src = fetchFromGitHub {
owner = "donovanglover";
repo = pname;
rev = version;
sha256 = "sha256-sgd5kNnDXcSesGT+OignZ+APjNSxSP0Z60dr8cWO6sU=";
};
buildInputs = [
vips
];
nativeBuildInputs = [
pkg-config
];
vendorSha256 = "sha256-4zgsoExdhEqvycGerNVxZ6LnjeRRO+f6DhJdINR5ZyI=";
postInstall = ''
mkdir -p $out/share/thumbnailers
substituteAll ${./go.thumbnailer} $out/share/thumbnailers/go.thumbnailer
'';
meta = with lib; {
description = "A cover thumbnailer written in Go for performance and reliability";
homepage = "https://github.com/donovanglover/go-thumbnailer";
license = licenses.mit;
maintainers = with maintainers; [ donovanglover ];
};
}

3
pkgs/applications/misc/go-thumbnailer/go.thumbnailer Normal file
View File

@@ -0,0 +1,3 @@
[Thumbnailer Entry]
Exec=@out@/bin/go-thumbnailer %s %i %o
MimeType=inode/directory

38
pkgs/applications/misc/moonlight-qt/darwin.diff Normal file
View File

@@ -0,0 +1,38 @@
--- a/app/app.pro 2023-06-24 19:10:00.653377668 +0800
+++ b/app/app.pro 2023-06-24 19:20:06.632188299 +0800
@@ -49,19 +49,8 @@
INCLUDEPATH += $$PWD/../libs/windows/include
LIBS += ws2_32.lib winmm.lib dxva2.lib ole32.lib gdi32.lib user32.lib d3d9.lib dwmapi.lib dbghelp.lib
}
-macx {
- INCLUDEPATH += $$PWD/../libs/mac/include
- INCLUDEPATH += $$PWD/../libs/mac/Frameworks/SDL2.framework/Versions/A/Headers
- INCLUDEPATH += $$PWD/../libs/mac/Frameworks/SDL2_ttf.framework/Versions/A/Headers
- LIBS += -L$$PWD/../libs/mac/lib -F$$PWD/../libs/mac/Frameworks
-
- # QMake doesn't handle framework-style includes correctly on its own
- QMAKE_CFLAGS += -F$$PWD/../libs/mac/Frameworks
- QMAKE_CXXFLAGS += -F$$PWD/../libs/mac/Frameworks
- QMAKE_OBJECTIVE_CFLAGS += -F$$PWD/../libs/mac/Frameworks
-}
-unix:!macx {
+unix {
CONFIG += link_pkgconfig
PKGCONFIG += openssl sdl2 SDL2_ttf opus
@@ -120,13 +109,12 @@
CONFIG += soundio discord-rpc
}
macx {
- LIBS += -lssl -lcrypto -lavcodec.59 -lavutil.57 -lopus -framework SDL2 -framework SDL2_ttf
LIBS += -lobjc -framework VideoToolbox -framework AVFoundation -framework CoreVideo -framework CoreGraphics -framework CoreMedia -framework AppKit -framework Metal
# For libsoundio
LIBS += -framework CoreAudio -framework AudioUnit
- CONFIG += ffmpeg soundio discord-rpc
+ CONFIG += ffmpeg soundio
}
SOURCES += \

26
pkgs/applications/misc/moonlight-qt/default.nix
View File

@@ -16,8 +16,13 @@
, libopus
, ffmpeg
, wayland
, darwin
}:
let
inherit (darwin.apple_sdk_11_0.frameworks) AVFoundation AppKit AudioUnit VideoToolbox;
in
stdenv.mkDerivation rec {
pname = "moonlight-qt";
version = "4.3.1";
@@ -30,6 +35,8 @@ stdenv.mkDerivation rec {
fetchSubmodules = true;
};
patches = [ ./darwin.diff ];
nativeBuildInputs = [
wrapQtAppsHook
pkg-config
@@ -40,17 +47,30 @@ stdenv.mkDerivation rec {
qtquickcontrols2
SDL2
SDL2_ttf
openssl
libopus
ffmpeg
] ++ lib.optionals stdenv.isLinux [
libva
libvdpau
libxkbcommon
alsa-lib
libpulseaudio
openssl
libopus
ffmpeg
wayland
] ++ lib.optionals stdenv.isDarwin [
AVFoundation
AppKit
AudioUnit
VideoToolbox
];
postInstall = lib.optionalString stdenv.isDarwin ''
mkdir $out/Applications $out/bin
mv app/Moonlight.app $out/Applications
rm -r $out/Applications/Moonlight.app/Contents/Frameworks
ln -s $out/Applications/Moonlight.app/Contents/MacOS/Moonlight $out/bin/moonlight
'';
meta = with lib; {
description = "Play your PC games on almost any device";
homepage = "https://moonlight-stream.org";

4
pkgs/applications/misc/spicetify-cli/default.nix
View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "spicetify-cli";
version = "2.20.1";
version = "2.20.3";
src = fetchFromGitHub {
owner = "spicetify";
repo = "spicetify-cli";
rev = "v${version}";
hash = "sha256-VcTvtB/q4+n4DlYG8/QQ014Yqn+pmXoRyZx4Ldwu7Lc=";
hash = "sha256-1Auvx2KZ97iD9EDm6QQdgS5YF9smw4dTvXF1IXtYrSI=";
};
vendorHash = "sha256-61j3HVDe6AbXpdmxhQQctv4C2hNBK/rWvZeC+KtISKY=";

44
pkgs/applications/misc/tui-journal/default.nix Normal file
View File

@@ -0,0 +1,44 @@
{ lib
, rustPlatform
, fetchFromGitHub
, pkg-config
, libgit2
, openssl
, zlib
, stdenv
, darwin
}:
rustPlatform.buildRustPackage rec {
pname = "tui-journal";
version = "0.2.0";
src = fetchFromGitHub {
owner = "AmmarAbouZor";
repo = "tui-journal";
rev = "v${version}";
hash = "sha256-B3GxxkFT2Z7WtV9RSmtKBjvzRRqmcoukUKc6LUZ/JyM=";
};
cargoHash = "sha256-DCKW8eGLSTx9U7mkGruPphzFpDlpL8ULCOKhj6HJwhw=";
nativeBuildInputs = [
pkg-config
];
buildInputs = [
libgit2
openssl
zlib
] ++ lib.optionals stdenv.isDarwin [
darwin.apple_sdk.frameworks.Security
];
meta = with lib; {
description = "Your journal app if you live in a terminl";
homepage = "https://github.com/AmmarAbouZor/tui-journal";
changelog = "https://github.com/AmmarAbouZor/tui-journal/blob/${src.rev}/CHANGELOG.ron";
license = licenses.mit;
maintainers = with maintainers; [ figsoda ];
};
}

4
pkgs/applications/networking/browsers/brave/default.nix
View File

@@ -90,11 +90,11 @@ in
stdenv.mkDerivation rec {
pname = "brave";
version = "1.52.126";
version = "1.52.129";
src = fetchurl {
url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb";
sha256 = "sha256-M/25YFqET4G89S7ihiFige047+fk/jWKpEiD8O22W74=";
sha256 = "sha256-v5C8YbYv2gr2Tf+koM3+4s2xtHTabLcJcIlsQx3UxfM=";
};
dontConfigure = true;

10
pkgs/applications/networking/browsers/chromium/upstream-info.json
View File

@@ -45,9 +45,9 @@
}
},
"ungoogled-chromium": {
"version": "114.0.5735.133",
"sha256": "0qnj4gr4b9gmla1hbz1ir64hfmpc45vzkg0hmw9h6m72r4gfr2c2",
"sha256bin64": "0gk9l1xspbqdxv9q16zdcrrr6bxx677cnz7vv4pgg85k1pwhyw3g",
"version": "114.0.5735.198",
"sha256": "1shxlkass3s744mwc571cyzlb9cc8lxvi5wp35mzaldbxq7l9wx9",
"sha256bin64": "0367sks2z7xj130bszimznkjjimfdimknd7qzi68335y9qzl1y92",
"deps": {
"gn": {
"version": "2023-04-19",
@@ -56,8 +56,8 @@
"sha256": "01xrh9m9m6x8lz0vxwdw2mrhrvnw93zpg09hwdhqakj06agf4jjk"
},
"ungoogled-patches": {
"rev": "114.0.5735.133-1",
"sha256": "1i9ql4b2rn9jryyc3hfr9kh8ccf5a4gvpwsp9lnp9jc2gryrv70y"
"rev": "114.0.5735.198-1",
"sha256": "1zda5c7n43zviwj3n2r2zbhmylkrfy54hggq8cisbdrhhfn96vii"
}
}
}

4
pkgs/applications/networking/circumflex/default.nix
View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "circumflex";
version = "3.1.1";
version = "3.1.3";
src = fetchFromGitHub {
owner = "bensadeh";
repo = "circumflex";
rev = version;
hash = "sha256-GIA49Syk22T0efxqmR3OgQpxpcEZnCicq8sj9CXdIhQ=";
hash = "sha256-KY3Jf0Y6ZAQciwImv7Oz0nQ5eEwm7XwOlAx3ijqDF0k=";
};
vendorHash = "sha256-ms7TvCXQdkrlWp1pGj3ja+ACodt7z6sP3E373xHxA34=";

4
pkgs/applications/networking/cluster/bosh-cli/default.nix
View File

@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "bosh-cli";
version = "7.2.3";
version = "7.2.4";
src = fetchFromGitHub {
owner = "cloudfoundry";
repo = pname;
rev = "v${version}";
sha256 = "sha256-sN6+hPH+VziXs94RkPdPlg6TKo/as4xC8Gd8MxAKluk=";
sha256 = "sha256-LVDWgyIBVp7UVnEuQ42eVfxDZB3BZn5InnPX7WN6MrA=";
};
vendorHash = null;

4
pkgs/applications/networking/cluster/pachyderm/default.nix
View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "pachyderm";
version = "2.6.3";
version = "2.6.4";
src = fetchFromGitHub {
owner = "pachyderm";
repo = "pachyderm";
rev = "v${version}";
hash = "sha256-e/pdNS3GOTKknh4Qbfc9Uf5uK2Zjsev8RkSg4QIxM8Y=";
hash = "sha256-V8N7KaNlpDTOmUdfx3otC7ady57lkXHFcZ1LO8VMnFU=";
};
vendorHash = "sha256-3EG9d4ERaWuHaKFt0KFCOKIgTdrL7HZTO+GSi2RROKY=";

6
pkgs/applications/networking/cluster/temporal/default.nix
View File

@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "temporal";
version = "1.20.3";
version = "1.21.0";
src = fetchFromGitHub {
owner = "temporalio";
repo = "temporal";
rev = "v${version}";
hash = "sha256-ej6k9zQNpQ4x1LxZCI5vst9P1bSLEtbVkz1HUIX46cA=";
hash = "sha256-PhJLO+0JoSGS/aN6ZZoCwSypm8hihwAjsav+l4NSNZo=";
};
vendorHash = "sha256-Fo/xePou96KdFlUNIqhDZX4TJoYXqlMyuLDvmR/XreY=";
vendorHash = "sha256-rgUdoFR7Qcp1h7v63DAWwx6NWSwWrJ6C6/b2tx2kCCw=";
excludedPackages = [ "./build" ];

22
pkgs/applications/networking/cluster/terraform-providers/providers.json
View File

@@ -91,14 +91,14 @@
"vendorHash": "sha256-qm8rFZZtltC9IV47QzmoQa0kpKp4vn3eHj5kKMIEb+4="
},
"avi": {
"hash": "sha256-mBLdIL4mUI4zA3c9gB4DL1QY0xHW15Q1rO/v1gVYKYU=",
"hash": "sha256-xis3uVCK+dck6R5ru8suNQov9qTLwLIdeQCAR9Jwqcs=",
"homepage": "https://registry.terraform.io/providers/vmware/avi",
"owner": "vmware",
"proxyVendor": true,
"repo": "terraform-provider-avi",
"rev": "v22.1.3",
"rev": "v22.1.4",
"spdx": "MPL-2.0",
"vendorHash": "sha256-0k1BYRQWp4iU9DRwPbluOg3S5VzL981PpFrgiQaYWNw="
"vendorHash": "sha256-vORXHX6VKP/JHP/InB2b9Rqej2JIIDOzS3r05wO2I+c="
},
"aviatrix": {
"hash": "sha256-99y+m2U/aCYrJSTB/eQIakPR3KQzh2OqBizl3htsvL4=",
@@ -427,11 +427,11 @@
"vendorHash": "sha256-uWTY8cFztXFrQQ7GW6/R+x9M6vHmsb934ldq+oeW5vk="
},
"github": {
"hash": "sha256-xJ2mmlZZAd/a6eQ3yfu3OhZU1eq5qODgvMwjpZNfSUQ=",
"hash": "sha256-OckLIGRr3PwA5+GbWcIif++hxWPYD9sDSU5nksZH16c=",
"homepage": "https://registry.terraform.io/providers/integrations/github",
"owner": "integrations",
"repo": "terraform-provider-github",
"rev": "v5.28.1",
"rev": "v5.29.0",
"spdx": "MIT",
"vendorHash": null
},
@@ -655,11 +655,11 @@
"vendorHash": null
},
"launchdarkly": {
"hash": "sha256-zi4GzbQmvvfxQ5vL4FbVkqUcwm7Y4ET8GFeIc/LipTY=",
"hash": "sha256-lRkaRy4K43byP0r+wE3gne8pWmPB5il5oK4JMiPMZO4=",
"homepage": "https://registry.terraform.io/providers/launchdarkly/launchdarkly",
"owner": "launchdarkly",
"repo": "terraform-provider-launchdarkly",
"rev": "v2.12.0",
"rev": "v2.12.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Fb2k493XTePXgpCY9ZoMWaCZqq3fx3A2dBRsOp1MDBc="
},
@@ -935,11 +935,11 @@
"vendorHash": "sha256-j+3qtGlueKZgf0LuNps4Wc9G3EmpSgl8ZNSLqslyizI="
},
"rancher2": {
"hash": "sha256-tkr1zqHeIMrselvnlv+n7kTM89T7zYW82UeQPucG50I=",
"hash": "sha256-hzcJOWbOh/HKYl9mKpo59/Mw2tjnfs36fQzSyFdKfFw=",
"homepage": "https://registry.terraform.io/providers/rancher/rancher2",
"owner": "rancher",
"repo": "terraform-provider-rancher2",
"rev": "v3.0.1",
"rev": "v3.0.2",
"spdx": "MPL-2.0",
"vendorHash": "sha256-RSHI994zW7rzA/SJ/Ioilg7mQB/VbDInSeZ9IaEYVIc="
},
@@ -1052,11 +1052,11 @@
"vendorHash": "sha256-NO1r/EWLgH1Gogru+qPeZ4sW7FuDENxzNnpLSKstnE8="
},
"spotinst": {
"hash": "sha256-tKcZj6YY3J2fPDQtDrPltOoEid+128KK+axG/nUMK8Q=",
"hash": "sha256-6hiyVMN9LoMLYs5Nuj1tcvQtfQABRqvB1KJmAu7hn48=",
"homepage": "https://registry.terraform.io/providers/spotinst/spotinst",
"owner": "spotinst",
"repo": "terraform-provider-spotinst",
"rev": "v1.123.0",
"rev": "v1.124.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-zjQLAT3GQbOn7Riltoy8QHnlGp5GwwmjdwMudOMaJho="
},

4
pkgs/applications/networking/instant-messengers/signalbackup-tools/default.nix
View File

@@ -2,13 +2,13 @@
(if stdenv.isDarwin then darwin.apple_sdk_11_0.llvmPackages_14.stdenv else stdenv).mkDerivation rec {
pname = "signalbackup-tools";
version = "20230626";
version = "20230628";
src = fetchFromGitHub {
owner = "bepaald";
repo = pname;
rev = version;
hash = "sha256-5FdiWmD7Z/Dk39om2NneckINQ2stw7EobmpcuzSC+5c=";
hash = "sha256-tSmnqKLrhlr89Sz6r81/JlFMxbFoUoNs3pBQPXbi5ZI=";
};
postPatch = ''

12
pkgs/applications/networking/instant-messengers/zoom-us/default.nix
View File

@@ -48,23 +48,23 @@ let
# and often with different versions. We write them on three lines
# like this (rather than using {}) so that the updater script can
# find where to edit them.
versions.aarch64-darwin = "5.14.10.19202";
versions.x86_64-darwin = "5.14.10.19202";
versions.x86_64-linux = "5.15.0.4063";
versions.aarch64-darwin = "5.15.2.19786";
versions.x86_64-darwin = "5.15.2.19786";
versions.x86_64-linux = "5.15.2.4260";
srcs = {
aarch64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
name = "zoomusInstallerFull.pkg";
hash = "sha256-MK6xUkS+nX7SjIieduMhhFNqEUVdc89aPiCvHI2pjDQ=";
hash = "sha256-vERhyaNVxam6ypi9nU2t6RfBZgtzD6YECkSrxkxl/4E=";
};
x86_64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
hash = "sha256-JJ6nZ8WnTF8X8R0gIlFtsTbpdHhv65J5kWts+H3QDoM=";
hash = "sha256-Yx5seUks6s+NEBIxgltUQiNU3tjWpmNKMJwgAj9izh4=";
};
x86_64-linux = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
hash = "sha256-DhP6LZt/G3K9YDs7iXABsJMuhpzITP4aJ0PWXrFAL3I=";
hash = "sha256-R6M180Gcqu4yZC+CtWnixSkjPe8CvgoTPWSz7B6ZAlE=";
};
};

4
pkgs/applications/networking/kubo-migrator/all-migrations.nix
View File

@@ -36,8 +36,9 @@ let
};
# Concatenation of the latest repo version and the version of that migration
version = "13.1.0.0";
version = "14.1.0.0";
fs-repo-13-to-14 = fs-repo-common "fs-repo-13-to-14" "1.0.0";
fs-repo-12-to-13 = fs-repo-common "fs-repo-12-to-13" "1.0.0";
fs-repo-11-to-12 = fs-repo-common "fs-repo-11-to-12" "1.0.2";
fs-repo-10-to-11 = fs-repo-common "fs-repo-10-to-11" "1.0.1";
@@ -53,6 +54,7 @@ let
fs-repo-0-to-1 = fs-repo-common "fs-repo-0-to-1" "1.0.1";
all-migrations = [
fs-repo-13-to-14
fs-repo-12-to-13
fs-repo-11-to-12
fs-repo-10-to-11

6
pkgs/applications/networking/kubo-migrator/unwrapped.nix
View File

@@ -11,12 +11,12 @@ buildGoModule rec {
owner = "ipfs";
repo = "fs-repo-migrations";
# Use the latest git tag here, since v2.0.2 does not
# contain the latest migration fs-repo-11-to-12/v1.0.2
# contain the latest migration fs-repo-13-to-14/v1.0.0
# The fs-repo-migrations code itself is the same between
# the two versions but the migration code, which is built
# into separate binaries, is not.
rev = "fs-repo-12-to-13/v1.0.0";
hash = "sha256-QQone7E2Be+jVfnrwqQ1Ny4jo6mSDHhaY3ErkNdn2f8=";
rev = "fs-repo-13-to-14/v1.0.0";
hash = "sha256-y0IYSKKZlFbPrTUC6XqYKhS3a79rieNGBL58teWMlC4=";
};
sourceRoot = "source/fs-repo-migrations";

5
pkgs/applications/office/paperless-ngx/default.nix
View File

@@ -17,13 +17,13 @@
}:
let
version = "1.16.3";
version = "1.16.5";
src = fetchFromGitHub {
owner = "paperless-ngx";
repo = "paperless-ngx";
rev = "refs/tags/v${version}";
hash = "sha256-DudTg7d92/9WwaPtr2PrvojcGxZ8z3Z2oYA0LcrkxZI=";
hash = "sha256-suwXFqq3QSdY0KzSpr6NKPwm6xtMBR8aP5VV3XTynqI=";
};
# Use specific package versions required by paperless-ngx
@@ -130,6 +130,7 @@ python.pkgs.buildPythonApplication rec {
h11
hiredis
httptools
httpx
humanfriendly
humanize
hyperlink

4
pkgs/applications/science/math/R/default.nix
View File

@@ -15,13 +15,13 @@ assert (!blas.isILP64) && (!lapack.isILP64);
stdenv.mkDerivation (finalAttrs: {
pname = "R";
version = "4.3.0";
version = "4.3.1";
src = let
inherit (finalAttrs) pname version;
in fetchurl {
url = "https://cran.r-project.org/src/base/R-${lib.versions.major version}/${pname}-${version}.tar.gz";
sha256 = "sha256-RdzEi2zyfTYQIPd/3ho5IJ6Ze4FAKzZjyhwBAFampgk=";
sha256 = "sha256-jdC/JPECPG9hjDsxc4PSkbSklPQNc7mDrCL/6pnkupk=";
};
dontUseImakeConfigure = true;

15
pkgs/applications/version-management/gex/default.nix
View File

@@ -2,25 +2,32 @@
, stdenv
, rustPlatform
, fetchFromGitHub
, pkg-config
, openssl
# waiting on gex to update to libgit2-sys >= 0.15
, libgit2_1_5
}:
rustPlatform.buildRustPackage rec {
pname = "gex";
version = "0.3.3";
version = "0.3.8";
src = fetchFromGitHub {
owner = "Piturnah";
repo = pname;
rev = "v${version}";
hash = "sha256-oUcQKpZqqb8wZDpdFfpxLpwdfQlokJE5bsoPwxh+JMM=";
hash = "sha256-pjyS0H25wdcexpzZ2vVzGTwDPzyvA9PDgzz81yLGTOY=";
};
cargoHash = "sha256-ZFrIlNysjlXI8n78N2Hkff6gAplipxSQXUWG8HJq8fs=";
nativeBuildInputs = [ pkg-config ];
buildInputs = [ openssl libgit2_1_5 ];
cargoHash = "sha256-+FwXm3QN9bt//dWqzkBzsGigyl1SSY4/P29QtV75V6M=";
meta = with lib; {
description = "Git Explorer: cross-platform git workflow improvement tool inspired by Magit";
homepage = "https://github.com/Piturnah/gex";
license = with licenses; [ asl20 /* or */ mit ];
maintainers = with maintainers; [ Br1ght0ne ];
maintainers = with maintainers; [ azd325 Br1ght0ne ];
};
}

12
pkgs/applications/version-management/gitlab/data.json
View File

@@ -1,14 +1,14 @@
{
"version": "16.1.0",
"repo_hash": "sha256-sRel6okv2NYV4As3+AudqVvJ1/eLQGJGFvs+BA14wis=",
"version": "16.1.1",
"repo_hash": "sha256-y0a2jEWFVLtekZvhBZFOSyeDj8DI2Jxf208r5rhRUm4=",
"yarn_hash": "1cqyf06810ls94nkys0l4p86ni902q32aqjp66m7j1x6ldh248al",
"owner": "gitlab-org",
"repo": "gitlab",
"rev": "v16.1.0-ee",
"rev": "v16.1.1-ee",
"passthru": {
"GITALY_SERVER_VERSION": "16.1.0",
"GITLAB_PAGES_VERSION": "16.1.0",
"GITALY_SERVER_VERSION": "16.1.1",
"GITLAB_PAGES_VERSION": "16.1.1",
"GITLAB_SHELL_VERSION": "14.23.0",
"GITLAB_WORKHORSE_VERSION": "16.1.0"
"GITLAB_WORKHORSE_VERSION": "16.1.1"
}
}

4
pkgs/applications/version-management/gitlab/gitaly/default.nix
View File

@@ -13,7 +13,7 @@
}:
let
version = "16.1.0";
version = "16.1.1";
package_version = "v${lib.versions.major version}";
gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
@@ -24,7 +24,7 @@ let
owner = "gitlab-org";
repo = "gitaly";
rev = "v${version}";
sha256 = "sha256-+Fnj9fgQQtyGMWOL5NkNON/N9p6POjAtpF2O06iKh90=";
sha256 = "sha256-bbAu9OIo1FT2KX186ajV5OUcvFpKUGaYPxY2S2RvXo8=";
};
vendorSha256 = "sha256-6oOFQGPwiMRQrESXsQsGzvWz9bCb0VTYIyyG/C2b3nA=";

38
pkgs/applications/version-management/gitlab/gitlab-container-registry/Disable-inmemory-storage-driver-test.patch Normal file
View File

@@ -0,0 +1,38 @@
From bc359e8f51a17ba759121339e87e90eed16e98fe Mon Sep 17 00:00:00 2001
From: Yaya <mak@nyantec.com>
Date: Tue, 20 Jun 2023 10:01:23 +0000
Subject: [PATCH] Disable inmemory storage driver test
---
.../storage/driver/inmemory/driver_test.go | 19 -------------------
1 file changed, 19 deletions(-)
delete mode 100644 registry/storage/driver/inmemory/driver_test.go
diff --git a/registry/storage/driver/inmemory/driver_test.go b/registry/storage/driver/inmemory/driver_test.go
deleted file mode 100644
index dbc1916f..00000000
--- a/registry/storage/driver/inmemory/driver_test.go
+++ /dev/null
@@ -1,19 +0,0 @@
-package inmemory
-
-import (
- "testing"
-
- storagedriver "github.com/docker/distribution/registry/storage/driver"
- "github.com/docker/distribution/registry/storage/driver/testsuites"
- "gopkg.in/check.v1"
-)
-
-// Hook up gocheck into the "go test" runner.
-func Test(t *testing.T) { check.TestingT(t) }
-
-func init() {
- inmemoryDriverConstructor := func() (storagedriver.StorageDriver, error) {
- return New(), nil
- }
- testsuites.RegisterSuite(inmemoryDriverConstructor, testsuites.NeverSkip)
-}
--
2.40.1

10
pkgs/applications/version-management/gitlab/gitlab-container-registry/default.nix
View File

@@ -2,17 +2,21 @@
buildGoModule rec {
pname = "gitlab-container-registry";
version = "3.76.0";
version = "3.77.0";
rev = "v${version}-gitlab";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "container-registry";
inherit rev;
sha256 = "sha256-A9c7c/CXRs5mYSvDOdHkYOYkl+Qm6M330TBUeTnegBs=";
sha256 = "sha256-tHNxPwm1h1wyXuzUUadz5YcRkPdc0QeayMIRt292uf8=";
};
vendorHash = "sha256-9rO2GmoFZrNA3Udaktn8Ek9uM8EEoc0I3uv4UEq1c1k=";
vendorHash = "sha256-/ITZBh0vRYHb6fDUZQNRwW2pmQulJlDZ8EbObUBtsz4=";
patches = [
./Disable-inmemory-storage-driver-test.patch
];
postPatch = ''
substituteInPlace health/checks/checks_test.go \

4
pkgs/applications/version-management/gitlab/gitlab-pages/default.nix
View File

@@ -2,13 +2,13 @@
buildGoModule rec {
pname = "gitlab-pages";
version = "16.1.0";
version = "16.1.1";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "gitlab-pages";
rev = "v${version}";
sha256 = "sha256-vAprB+pDwpr2Wq4aM0wnHlNzUvc1ajasdORwT0LDTTY=";
sha256 = "sha256-xXA1KIn0uEuW3r4KnZ1A5Ci/pCbuUdZTYraVzYfUdoA=";
};
vendorHash = "sha256-SN4r9hcTTQUr3miv2Cm7iBryyh7yG1xx9lCvq3vQwc0=";

2
pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
View File

@@ -5,7 +5,7 @@ in
buildGoModule rec {
pname = "gitlab-workhorse";
version = "16.1.0";
version = "16.1.1";
src = fetchFromGitLab {
owner = data.owner;

6
pkgs/applications/version-management/gitoxide/default.nix
View File

@@ -13,16 +13,16 @@
rustPlatform.buildRustPackage rec {
pname = "gitoxide";
version = "0.26.0";
version = "0.27.0";
src = fetchFromGitHub {
owner = "Byron";
repo = "gitoxide";
rev = "v${version}";
sha256 = "sha256-RAcKnS7vLuzXBxasHBxjmrdxyVvexou0SmiVu6ysZOQ=";
sha256 = "sha256-L5x27rJ9Y3K886OlTvCXV2LY+6L/f6vokCbgrWPCiHY=";
};
cargoHash = "sha256-w2WfBQoccpE71jOrjeuNF6HPTfY6lxpzg/AUEIngSJo=";
cargoHash = "sha256-YEHHu9PJ5aJvWUaTXCNKEaV/Rd8lP6Wub/CFJCBykHU=";
nativeBuildInputs = [ cmake pkg-config ];
buildInputs = [ curl ] ++ (if stdenv.isDarwin

4
pkgs/applications/video/media-downloader/default.nix
View File

@@ -12,13 +12,13 @@
stdenv.mkDerivation rec {
pname = "media-downloader";
version = "3.1.0";
version = "3.2.0";
src = fetchFromGitHub {
owner = "mhogomchungu";
repo = pname;
rev = "${version}";
hash = "sha256-/oKvjmLFchR2B/mcLIUVIHBK78u2OQGf2aiwVR/ZoQc=";
hash = "sha256-B+KegiU3bXZXyXDQDBYipdd/+cXrPkFFH56DBojZQbg=";
};
nativeBuildInputs = [

4
pkgs/applications/virtualization/distrobox/default.nix
View File

@@ -2,13 +2,13 @@
stdenvNoCC.mkDerivation rec {
pname = "distrobox";
version = "1.5.0.1";
version = "1.5.0.2";
src = fetchFromGitHub {
owner = "89luca89";
repo = pname;
rev = version;
sha256 = "sha256-e8uOvIPeAB0fVDhBl2YnaVGpmDdgPkdqVhAHKFXrMyY=";
sha256 = "sha256-ss8049D6n1V/gDzEMjywDnoke5s2we9j3mO8yta72UA=";
};
dontConfigure = true;

4
pkgs/build-support/testers/default.nix
View File

@@ -97,7 +97,9 @@
# See doc/builders/testers.chapter.md or
# https://nixos.org/manual/nixpkgs/unstable/#tester-runNixOSTest
runNixOSTest =
let nixos = import ../../../nixos/lib {};
let nixos = import ../../../nixos/lib {
inherit lib;
};
in testModule:
nixos.runTest {
_file = "pkgs.runNixOSTest implementation";

4
pkgs/data/icons/tela-circle-icon-theme/default.nix
View File

@@ -19,13 +19,13 @@ lib.checkListOfEnum "${pname}: color variants" [ "standard" "black" "blue" "brow
stdenvNoCC.mkDerivation rec {
inherit pname;
version = "2023-04-16";
version = "2023-06-25";
src = fetchFromGitHub {
owner = "vinceliuice";
repo = pname;
rev = version;
sha256 = "OHI/kT4HMlWUTxIeGXjtuIYBzQKM3XTGXuE9cviNDTM=";
sha256 = "nob0Isx785YRP4QIj2CK+v99CUiRwtkge1dNXCCwaDs=";
};
nativeBuildInputs = [

6
pkgs/data/themes/base16-schemes/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "base16-schemes";
version = "unstable-2022-12-16";
version = "unstable-2023-05-02";
src = fetchFromGitHub {
owner = "tinted-theming";
repo = "base16-schemes";
rev = "cf6bc892a24af19e11383adedc6ce7901f133ea7";
sha256 = "sha256-U9pfie3qABp5sTr3M9ga/jX8C807FeiXlmEZnC4ZM58=";
rev = "9a4002f78dd1094c123169da243680b2fda3fe69";
sha256 = "sha256-AngNF++RZQB0l4M8pRgcv66pAcIPY+cCwmUOd+RBJKA=";
};
installPhase = ''

20
pkgs/desktops/deepin/tools/dde-device-formatter/default.nix
View File

@@ -1,7 +1,6 @@
{ stdenv
, lib
, fetchFromGitHub
, fetchpatch
, dtkwidget
, deepin-gettext-tools
, qt5integration
@@ -16,25 +15,20 @@
stdenv.mkDerivation rec {
pname = "dde-device-formatter";
version = "unstable-2022-09-05";
version = "0.0.1.15";
src = fetchFromGitHub {
owner = "linuxdeepin";
repo = pname;
rev = "9b8489cb2bb7c85bd62557d16a5eabc94100512e";
sha256 = "sha256-Mi48dSDCoKhr8CGt9z64/9d7+r9QSrPPICv+R5VDuaU=";
rev = version;
hash = "sha256-M0XKvo/Qph09GIlqXTdYyPWilWyQhvFAF3c9Yf1Z9m0=";
};
patches = [
(fetchpatch {
name = "chore-do-not-use-hardcode-path.patch";
url = "https://github.com/linuxdeepin/dde-device-formatter/commit/b836a498b8e783e0dff3820302957f15ee8416eb.patch";
sha256 = "sha256-i/VqJ6EmCyhE6weHKUB66bW6b51gLyssIAzb5li4aJM=";
})
];
postPatch = ''
substituteInPlace dde-device-formatter.pro --replace "/usr" "$out"
substituteInPlace translate_desktop2ts.sh translate_ts2desktop.sh \
--replace "/usr/bin/deepin-desktop-ts-convert" "deepin-desktop-ts-convert"
substituteInPlace dde-device-formatter.pro dde-device-formatter.desktop \
--replace "/usr" "$out"
patchShebangs *.sh
'';

15
pkgs/desktops/pantheon/apps/appcenter/default.nix
View File

@@ -15,7 +15,6 @@
, libxml2
, meson
, ninja
, packagekit
, pkg-config
, python3
, vala
@@ -25,21 +24,15 @@
stdenv.mkDerivation rec {
pname = "appcenter";
version = "7.2.1";
version = "7.3.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-jtNPRsq33bIn3jy3F63UNrwrhaTBYbRYLDxyxgAXjIc=";
sha256 = "sha256-Lj3j812XaCIN+TFSDAvIgtl49n5jG4fVlAFvrWqngpM=";
};
patches = [
# Having a working nix packagekit backend will supersede this.
# https://github.com/NixOS/nixpkgs/issues/177946
./disable-packagekit-backend.patch
];
nativeBuildInputs = [
dbus # for pkg-config
meson
@@ -61,11 +54,13 @@ stdenv.mkDerivation rec {
libhandy
libsoup
libxml2
packagekit
polkit
];
mesonFlags = [
# We don't have a working nix packagekit backend yet.
"-Dpackagekit_backend=false"
"-Dubuntu_drivers_backend=false"
"-Dpayments=false"
"-Dcurated=false"
];

167
pkgs/desktops/pantheon/apps/appcenter/disable-packagekit-backend.patch
View File

@@ -1,167 +0,0 @@
diff --git a/src/Application.vala b/src/Application.vala
index a1c4e0d4..35555946 100644
--- a/src/Application.vala
+++ b/src/Application.vala
@@ -180,9 +180,6 @@ public class AppCenter.App : Gtk.Application {
}
public override void activate () {
- if (fake_update_packages != null) {
- AppCenterCore.PackageKitBackend.get_default ().fake_packages = fake_update_packages;
- }
var client = AppCenterCore.Client.get_default ();
@@ -200,12 +197,6 @@ public class AppCenter.App : Gtk.Application {
if (local_path != null) {
var file = File.new_for_commandline_arg (local_path);
-
- try {
- local_package = AppCenterCore.PackageKitBackend.get_default ().add_local_component_file (file);
- } catch (Error e) {
- warning ("Failed to load local AppStream XML file: %s", e.message);
- }
}
if (active_window == null) {
diff --git a/src/Core/BackendAggregator.vala b/src/Core/BackendAggregator.vala
index 1747cd3b..20077394 100644
--- a/src/Core/BackendAggregator.vala
+++ b/src/Core/BackendAggregator.vala
@@ -26,8 +26,6 @@ public class AppCenterCore.BackendAggregator : Backend, Object {
construct {
backends = new Gee.ArrayList<unowned Backend> ();
- backends.add (PackageKitBackend.get_default ());
- backends.add (UbuntuDriversBackend.get_default ());
backends.add (FlatpakBackend.get_default ());
unowned Gtk.Application app = (Gtk.Application) GLib.Application.get_default ();
diff --git a/src/Core/Package.vala b/src/Core/Package.vala
index 40fa8262..e6b90dd9 100644
--- a/src/Core/Package.vala
+++ b/src/Core/Package.vala
@@ -327,23 +327,13 @@ public class AppCenterCore.Package : Object {
public string origin_description {
owned get {
unowned string origin = component.get_origin ();
- if (backend is PackageKitBackend) {
- if (origin == APPCENTER_PACKAGE_ORIGIN) {
- return _("AppCenter");
- } else if (origin == ELEMENTARY_STABLE_PACKAGE_ORIGIN) {
- return _("elementary Updates");
- } else if (origin.has_prefix ("ubuntu-")) {
- return _("Ubuntu (non-curated)");
- }
- } else if (backend is FlatpakBackend) {
+ if (backend is FlatpakBackend) {
var fp_package = this as FlatpakPackage;
if (fp_package == null) {
return origin;
}
return fp_package.remote_title;
- } else if (backend is UbuntuDriversBackend) {
- return _("Ubuntu Drivers");
}
return _("Unknown Origin (non-curated)");
@@ -435,9 +425,7 @@ public class AppCenterCore.Package : Object {
// The version on a PackageKit package comes from the package not AppStream, so only reset the version
// on other backends
- if (!(backend is PackageKitBackend)) {
- _latest_version = null;
- }
+ _latest_version = null;
this.component = component;
}
diff --git a/src/Core/UpdateManager.vala b/src/Core/UpdateManager.vala
index 4d844abc..457137eb 100644
--- a/src/Core/UpdateManager.vala
+++ b/src/Core/UpdateManager.vala
@@ -71,35 +71,9 @@ public class AppCenterCore.UpdateManager : Object {
installed_package.update_state ();
}
- Pk.Results pk_updates;
- unowned PackageKitBackend client = PackageKitBackend.get_default ();
- try {
- pk_updates = yield client.get_updates (cancellable);
- } catch (Error e) {
- warning ("Unable to get updates from PackageKit backend: %s", e.message);
- return 0;
- }
-
uint os_count = 0;
string os_desc = "";
- var package_array = pk_updates.get_package_array ();
- debug ("PackageKit backend reports %d updates", package_array.length);
-
- package_array.foreach ((pk_package) => {
- var pkg_name = pk_package.get_name ();
- debug ("Added %s to OS updates", pkg_name);
- os_count++;
- unowned string pkg_summary = pk_package.get_summary ();
- unowned string pkg_version = pk_package.get_version ();
- os_desc += Markup.printf_escaped (
- " • %s\n\t%s\n\t%s\n",
- pkg_name,
- pkg_summary,
- _("Version: %s").printf (pkg_version)
- );
- });
-
os_updates.component.set_pkgnames ({});
os_updates.change_information.clear_update_info ();
@@ -207,30 +181,13 @@ public class AppCenterCore.UpdateManager : Object {
count += 1;
}
- pk_updates.get_details_array ().foreach ((pk_detail) => {
- var pk_package = new Pk.Package ();
- try {
- pk_package.set_id (pk_detail.get_package_id ());
- var pkg_name = pk_package.get_name ();
-
- var pkgnames = os_updates.component.pkgnames;
- pkgnames += pkg_name;
- os_updates.component.pkgnames = pkgnames;
-
- os_updates.change_information.updatable_packages.@set (client, pk_package.get_id ());
- os_updates.change_information.size += pk_detail.size;
- } catch (Error e) {
- critical (e.message);
- }
- });
-
os_updates.update_state ();
runtime_updates.update_state ();
return count;
}
public void update_restart_state () {
- var should_restart = restart_file.query_exists () || PackageKitBackend.get_default ().is_restart_required ();
+ var should_restart = restart_file.query_exists ();
if (should_restart) {
if (!restart_required) {
diff --git a/src/meson.build b/src/meson.build
index e0ef5342..14319492 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -12,10 +12,8 @@ appcenter_files = files(
'Core/FlatpakBackend.vala',
'Core/Job.vala',
'Core/Package.vala',
- 'Core/PackageKitBackend.vala',
'Core/ScreenshotCache.vala',
'Core/Task.vala',
- 'Core/UbuntuDriversBackend.vala',
'Core/UpdateManager.vala',
'Dialogs/InstallFailDialog.vala',
'Dialogs/StripeDialog.vala',

4
pkgs/desktops/pantheon/apps/switchboard-plugs/display/default.nix
View File

@@ -15,13 +15,13 @@
stdenv.mkDerivation rec {
pname = "switchboard-plug-display";
version = "2.3.3";
version = "7.0.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-d25++3msaS9dg2Rsl7mrAezDn8Lawd3/X0XPH5Zy6Rc=";
sha256 = "sha256-NgTpV/hbPttAsDY8Y9AsqdpjRlZqTy2rTu3v1jQZjBo=";
};
nativeBuildInputs = [

14
pkgs/desktops/pantheon/desktop/wingpanel-indicators/bluetooth/default.nix
View File

@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, pkg-config
, meson
@@ -18,15 +19,24 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-bluetooth";
version = "2.1.8";
version = "7.0.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "12rasf8wy3cqnfjlm9s2qnx4drzx0w0yviagkng3kspdzm3vzsqy";
sha256 = "sha256-t8Sn8NQW7WueinPkJdn8hd0oCJ3uFeRJliggSFHoaZU=";
};
patches = [
# Prevent a race that skips automatic resource loading
# https://github.com/elementary/wingpanel-indicator-bluetooth/issues/203
(fetchpatch {
url = "https://github.com/elementary/wingpanel-indicator-bluetooth/commit/4f9237c0cb1152a696ccdd2a2fc83fc706f54d62.patch";
sha256 = "sha256-fUnqw0EAWvtpoo2wI++2B5kXNqQPxnsjPbZ7O30lXBI=";
})
];
nativeBuildInputs = [
glib # for glib-compile-schemas
libxml2

4
pkgs/desktops/pantheon/desktop/wingpanel-indicators/notifications/default.nix
View File

@@ -16,13 +16,13 @@
stdenv.mkDerivation rec {
pname = "wingpanel-indicator-notifications";
version = "6.0.7";
version = "7.0.0";
src = fetchFromGitHub {
owner = "elementary";
repo = pname;
rev = version;
sha256 = "sha256-MIuyVGI4jSLGQMQUmj/2PIvcRHSJyPO5Pnd1f8JIuXc=";
sha256 = "sha256-HEkuNJgG0WEOKO6upwQgXg4huA7dNyz73U1nyOjQiTs=";
};
nativeBuildInputs = [

11
pkgs/desktops/pantheon/services/elementary-notifications/default.nix
View File

@@ -1,6 +1,7 @@
{ lib
, stdenv
, fetchFromGitHub
, fetchpatch
, nix-update-script
, meson
, ninja
@@ -27,6 +28,16 @@ stdenv.mkDerivation rec {
sha256 = "sha256-B1wo1N4heG872klFJOBKOEds0+6aqtvkTGefi97bdU8=";
};
patches = [
# Backports https://github.com/elementary/notifications/pull/184
# Needed for https://github.com/elementary/wingpanel-indicator-notifications/pull/252
# Should be part of next bump
(fetchpatch {
url = "https://github.com/elementary/notifications/commit/bd159979dbe3dbe6f3f1da7acd8e0721cc20ef80.patch";
sha256 = "sha256-cOfeXwoMVgvbA29axyN7HtYKTgCtGxAPrB2PA/x8RKY=";
})
];
nativeBuildInputs = [
glib # for glib-compile-schemas
meson

13
pkgs/development/compilers/gcc/10/default.nix
View File

@@ -27,6 +27,7 @@
, cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places
, buildPackages
, libxcrypt
, callPackage
}:
# Make sure we get GNU sed.
@@ -143,7 +144,7 @@ let majorVersion = "10";
in
stdenv.mkDerivation ({
lib.pipe (stdenv.mkDerivation ({
pname = "${crossNameAddon}${name}";
inherit version;
@@ -291,10 +292,8 @@ stdenv.mkDerivation ({
}
// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
makeFlags = [ "all-gcc" "all-target-libgcc" ];
installTargets = "install-gcc install-target-libgcc";
}
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
)
))
[
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
]

7
pkgs/development/compilers/gcc/11/default.nix
View File

@@ -304,14 +304,9 @@ lib.pipe (stdenv.mkDerivation ({
};
}
// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
makeFlags = [ "all-gcc" "all-target-libgcc" ];
installTargets = "install-gcc install-target-libgcc";
}
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
))
[
(callPackage ../common/libgcc.nix { inherit langC langCC langJit; })
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
(callPackage ../common/checksum.nix { inherit langC langCC; })
]

7
pkgs/development/compilers/gcc/12/default.nix
View File

@@ -350,15 +350,10 @@ lib.pipe (stdenv.mkDerivation ({
};
}
// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
makeFlags = [ "all-gcc" "all-target-libgcc" ];
installTargets = "install-gcc install-target-libgcc";
}
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
))
[
(callPackage ../common/libgcc.nix { inherit langC langCC langJit; })
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
(callPackage ../common/checksum.nix { inherit langC langCC; })
]

7
pkgs/development/compilers/gcc/13/default.nix
View File

@@ -344,15 +344,10 @@ lib.pipe (stdenv.mkDerivation ({
};
}
// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
makeFlags = [ "all-gcc" "all-target-libgcc" ];
installTargets = "install-gcc install-target-libgcc";
}
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
))
[
(callPackage ../common/libgcc.nix { inherit langC langCC langJit; })
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
(callPackage ../common/checksum.nix { inherit langC langCC; })
]

13
pkgs/development/compilers/gcc/4.8/default.nix
View File

@@ -29,6 +29,7 @@
, crossStageStatic ? false
, gnused ? null
, buildPackages
, callPackage
}:
assert langJava -> zip != null && unzip != null
@@ -192,7 +193,7 @@ in
# We need all these X libraries when building AWT with GTK.
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
stdenv.mkDerivation ({
lib.pipe (stdenv.mkDerivation ({
pname = "${crossNameAddon}${name}";
inherit version;
@@ -319,10 +320,8 @@ stdenv.mkDerivation ({
};
}
// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
makeFlags = [ "all-gcc" "all-target-libgcc" ];
installTargets = "install-gcc install-target-libgcc";
}
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
)
))
[
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
]

13
pkgs/development/compilers/gcc/4.9/default.nix
View File

@@ -29,6 +29,7 @@
, crossStageStatic ? false
, gnused ? null
, buildPackages
, callPackage
}:
assert langJava -> zip != null && unzip != null
@@ -209,7 +210,7 @@ in
# We need all these X libraries when building AWT with GTK.
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
stdenv.mkDerivation ({
lib.pipe (stdenv.mkDerivation ({
pname = "${crossNameAddon}${name}";
inherit version;
@@ -340,11 +341,6 @@ stdenv.mkDerivation ({
};
}
// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
makeFlags = [ "all-gcc" "all-target-libgcc" ];
installTargets = "install-gcc install-target-libgcc";
}
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
// optionalAttrs (langJava) {
@@ -352,4 +348,7 @@ stdenv.mkDerivation ({
target="$(echo "$out/libexec/gcc"/*/*/ecj*)"
patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target"
'';}
)
))
[
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
]

13
pkgs/development/compilers/gcc/6/default.nix
View File

@@ -33,6 +33,7 @@
, gnused ? null
, cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places
, buildPackages
, callPackage
}:
assert langJava -> zip != null && unzip != null
@@ -198,7 +199,7 @@ in
# We need all these X libraries when building AWT with GTK.
assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
stdenv.mkDerivation ({
lib.pipe (stdenv.mkDerivation ({
pname = "${crossNameAddon}${name}";
inherit version;
@@ -358,11 +359,6 @@ stdenv.mkDerivation ({
};
}
// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
makeFlags = [ "all-gcc" "all-target-libgcc" ];
installTargets = "install-gcc install-target-libgcc";
}
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
// optionalAttrs (langJava && !stdenv.hostPlatform.isDarwin) {
@@ -370,4 +366,7 @@ stdenv.mkDerivation ({
target="$(echo "$out/libexec/gcc"/*/*/ecj*)"
patchelf --set-rpath "$(patchelf --print-rpath "$target"):$out/lib" "$target"
'';}
)
))
[
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
]

13
pkgs/development/compilers/gcc/7/default.nix
View File

@@ -23,6 +23,7 @@
, gnused ? null
, cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places
, buildPackages
, callPackage
}:
# Make sure we get GNU sed.
@@ -148,7 +149,7 @@ let majorVersion = "7";
in
stdenv.mkDerivation ({
lib.pipe (stdenv.mkDerivation ({
pname = "${crossNameAddon}${name}";
inherit version;
@@ -298,10 +299,8 @@ stdenv.mkDerivation ({
};
}
// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
makeFlags = [ "all-gcc" "all-target-libgcc" ];
installTargets = "install-gcc install-target-libgcc";
}
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
)
))
[
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
]

13
pkgs/development/compilers/gcc/8/default.nix
View File

@@ -23,6 +23,7 @@
, gnused ? null
, cloog ? null # unused; just for compat with gcc4, as we override the parameter on some places
, buildPackages
, callPackage
}:
# Make sure we get GNU sed.
@@ -129,7 +130,7 @@ let majorVersion = "8";
in
stdenv.mkDerivation ({
lib.pipe (stdenv.mkDerivation ({
pname = "${crossNameAddon}${name}";
inherit version;
@@ -273,10 +274,8 @@ stdenv.mkDerivation ({
};
}
// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
makeFlags = [ "all-gcc" "all-target-libgcc" ];
installTargets = "install-gcc install-target-libgcc";
}
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
)
))
[
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
]

10
pkgs/development/compilers/gcc/9/default.nix
View File

@@ -26,6 +26,7 @@
, gnused ? null
, cloog # unused; just for compat with gcc4, as we override the parameter on some places
, buildPackages
, callPackage
}:
# Note: this package is used for bootstrapping fetchurl, and thus
@@ -143,7 +144,7 @@ let majorVersion = "9";
in
stdenv.mkDerivation ({
lib.pipe (stdenv.mkDerivation ({
pname = "${crossNameAddon}${name}";
inherit version;
@@ -287,10 +288,9 @@ stdenv.mkDerivation ({
};
}
// optionalAttrs (targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt" && crossStageStatic) {
makeFlags = [ "all-gcc" "all-target-libgcc" ];
installTargets = "install-gcc install-target-libgcc";
}
// optionalAttrs (enableMultilib) { dontMoveLib64 = true; }
)
) [
(callPackage ../common/libgcc.nix { inherit version langC langCC langJit targetPlatform hostPlatform crossStageStatic; })
]

34
pkgs/development/compilers/gcc/common/libgcc.nix
View File

@@ -1,16 +1,43 @@
{ lib
, stdenv
, version
, langC
, langCC
, langJit
, targetPlatform
, hostPlatform
, crossStageStatic
}:
let
drv: lib.pipe drv
([
(pkg: pkg.overrideAttrs (previousAttrs:
lib.optionalAttrs (
targetPlatform != hostPlatform &&
targetPlatform.libc == "msvcrt" &&
crossStageStatic
) {
makeFlags = [ "all-gcc" "all-target-libgcc" ];
installTargets = "install-gcc install-target-libgcc";
}))
] ++
# nixpkgs did not add the "libgcc" output until gcc11. In theory
# the following condition can be changed to `true`, but that has not
# been tested.
lib.optional (lib.versionAtLeast version "11.0")
(let
enableLibGccOutput =
(with stdenv; targetPlatform == hostPlatform) &&
!langJit &&
!stdenv.hostPlatform.isDarwin &&
!stdenv.hostPlatform.isStatic;
!stdenv.hostPlatform.isStatic
;
in
(pkg: pkg.overrideAttrs (previousAttrs: lib.optionalAttrs ((!langC) || langJit || enableLibGccOutput) {
outputs = previousAttrs.outputs ++ lib.optionals enableLibGccOutput [ "libgcc" ];
@@ -97,4 +124,5 @@ in
+ ''
patchelf --set-rpath "" $libgcc/lib/libgcc_s.so.1
'');
}))
}))))

8
pkgs/development/compilers/sbcl/2.x.nix
View File

@@ -22,13 +22,13 @@ let
# The loosely held nixpkgs convention for SBCL is to keep the last two
# versions.
# https://github.com/NixOS/nixpkgs/pull/200994#issuecomment-1315042841
"2.3.4" = {
sha256 = "sha256-8RtHZMbqvbJ+WpxGshcgTRG82lNOc7+XBz1Xgx0gnE4=";
};
"2.3.5" = {
sha256 = "sha256-ickHIM+dBdvNkNaQ44GiUUwPGAcVng1yIiIMWowtUYY=";
};
"2.3.6" = {
sha256 = "sha256-tEFMpNmnR06NiE19YyN+LynvRZ39WoSEJKnD+lUdGbk=";
};
};
in with versionMap.${version};

4
pkgs/development/interpreters/rakudo/default.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "rakudo";
version = "2023.04";
version = "2023.06";
src = fetchFromGitHub {
owner = "rakudo";
repo = "rakudo";
rev = version;
hash = "sha256-m5rXriBKfp/i9AIcBGCYGfXIGBRsxgVmBbLJPXXc5AY=";
hash = "sha256-t+zZEokjcDXp8uuHaOHp1R9LuS0Q3CSDOWhbSFXlNaU=";
fetchSubmodules = true;
};

4
pkgs/development/interpreters/rakudo/moarvm.nix
View File

@@ -8,13 +8,13 @@
stdenv.mkDerivation rec {
pname = "moarvm";
version = "2023.04";
version = "2023.06";
src = fetchFromGitHub {
owner = "moarvm";
repo = "moarvm";
rev = version;
hash = "sha256-QYA4nSsrouYFaw1eju/6gNWwMcE/VeL0sNJmsTvtU3I=";
hash = "sha256-dMh1KwKh89ZUqIUPHOH9DPgxLWq37kW3hTTwsFe1imM=";
fetchSubmodules = true;
};

4
pkgs/development/interpreters/rakudo/nqp.nix
View File

@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "nqp";
version = "2023.04";
version = "2023.06";
src = fetchFromGitHub {
owner = "raku";
repo = "nqp";
rev = version;
hash = "sha256-6V9d01aacDc+770XPSbQd4m1bg7Bbe47TTNOUxc2Fpw=";
hash = "sha256-VfSVNEBRW6Iz3qUeICFXu3pp92NGgAkOrThXF8a/82A=";
fetchSubmodules = true;
};

4
pkgs/development/libraries/entt/default.nix
View File

@@ -1,13 +1,13 @@
{ lib, stdenv, fetchFromGitHub, cmake }:
stdenv.mkDerivation rec {
pname = "entt";
version = "3.11.1";
version = "3.12.2";
src = fetchFromGitHub {
owner = "skypjack";
repo = "entt";
rev = "v${version}";
sha256 = "sha256-/ZvMyhvnlu/5z4UHhPe8WMXmSA45Kjbr6bRqyVJH310=";
sha256 = "sha256-gzoea3IbmpkIZYrfTZA6YgcnDU5EKdXF5Y7Yz2Uaj4A=";
};
nativeBuildInputs = [ cmake ];

11
pkgs/development/libraries/libgpod/default.nix
View File

@@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchurl
, fetchpatch
, perlPackages
, intltool
, autoreconfHook
@@ -24,11 +25,19 @@ stdenv.mkDerivation rec {
src = fetchurl {
url = "mirror://sourceforge/gtkpod/libgpod-${version}.tar.bz2";
sha256 = "0pcmgv1ra0ymv73mlj4qxzgyir026z9jpl5s5bkg35afs1cpk2k3";
hash = "sha256-Y4p5WdBOlfHmKrrQK9M3AuTo3++YSFrH2dUDlcN+lV0=";
};
outputs = [ "out" "dev" ];
patches = [
(fetchpatch {
name = "libplist-2.3.0-compatibility.patch";
url = "https://sourceforge.net/p/gtkpod/patches/48/attachment/libplist-2.3.0-compatibility.patch";
hash = "sha256-aVkuYE1N/jdEhVhiXEVhApvOC+8csIMMpP20rAJwEVQ=";
})
];
postPatch = ''
# support libplist 2.2
substituteInPlace configure.ac --replace 'libplist >= 1.0' 'libplist-2.0 >= 2.2'

12
pkgs/development/libraries/libimobiledevice-glue/default.nix
View File

@@ -8,15 +8,15 @@
stdenv.mkDerivation rec {
pname = "libimobiledevice-glue";
version = "0.pre+date=2022-05-22";
version = "1.0.0";
outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
rev = "d2ff7969dcd0a12e4f18f63dab03e6cd03054fcb";
hash = "sha256-BAdpJK6/iUKCNYLaCJQo0VK63AdIafO8wGbNhnvEc/o=";
rev = version;
hash = "sha256-9TjIYz6w61JaJgOJtWteIDk9bO3NnXp/2ZJwdirFcYM=";
};
nativeBuildInputs = [
@@ -28,9 +28,13 @@ stdenv.mkDerivation rec {
libplist
];
preAutoreconf = ''
export RELEASE_VERSION=${version}
'';
meta = with lib; {
homepage = "https://github.com/libimobiledevice/libimobiledevice-glue";
description = "Library with common code used by the libraries and tools around the libimobiledevice project.";
description = "Library with common code used by the libraries and tools around the libimobiledevice project";
license = licenses.lgpl21Plus;
platforms = platforms.unix;
maintainers = with maintainers; [ infinisil ];

20
pkgs/development/libraries/libimobiledevice/default.nix
View File

@@ -3,7 +3,7 @@
, fetchFromGitHub
, autoreconfHook
, pkg-config
, gnutls
, openssl
, libgcrypt
, libplist
, libtasn1
@@ -15,28 +15,24 @@
stdenv.mkDerivation rec {
pname = "libimobiledevice";
version = "1.3.0+date=2022-05-22";
version = "1.3.0+date=2023-04-30";
outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
rev = "12394bc7be588be83c352d7441102072a89dd193";
hash = "sha256-2K4gZrFnE4hlGlthcKB4n210bTK3+6NY4TYVIoghXJM=";
rev = "860ffb707af3af94467d2ece4ad258dda957c6cd";
hash = "sha256-mIsB+EaGJlGMOpz3OLrs0nAmhOY1BwMs83saFBaejwc=";
};
postPatch = ''
echo '${version}' > .tarball-version
'';
nativeBuildInputs = [
autoreconfHook
pkg-config
];
propagatedBuildInputs = [
gnutls
openssl
libgcrypt
libplist
libtasn1
@@ -47,7 +43,11 @@ stdenv.mkDerivation rec {
CoreFoundation
];
configureFlags = [ "--with-gnutls" "--without-cython" ];
preAutoreconf = ''
export RELEASE_VERSION=${version}
'';
configureFlags = [ "--without-cython" ];
meta = with lib; {
homepage = "https://github.com/libimobiledevice/libimobiledevice";

10
pkgs/development/libraries/libirecovery/default.nix
View File

@@ -10,15 +10,15 @@
stdenv.mkDerivation rec {
pname = "libirecovery";
version = "1.0.0+date=2022-04-04";
version = "1.1.0";
outputs = [ "out" "dev" ];
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
rev = "82d235703044c5af9da8ad8f77351fd2046dac47";
hash = "sha256-OESN9qme+TlSt+ZMbR4F3z/3RN0I12R7fcSyURBqUVk=";
rev = version;
hash = "sha256-84xwSOLwPU2Py6X2r6FYESxdc1EuuD6xHEXTUUEdvTE=";
};
nativeBuildInputs = [
@@ -32,6 +32,10 @@ stdenv.mkDerivation rec {
libimobiledevice-glue
];
preAutoreconf = ''
export RELEASE_VERSION=${version}
'';
# Packager note: Not clear whether this needs a NixOS configuration,
# as only the `idevicerestore` binary was tested so far (which worked
# without further configuration).

21
pkgs/development/libraries/libplist/default.nix
View File

@@ -10,21 +10,17 @@
stdenv.mkDerivation rec {
pname = "libplist";
version = "2.2.0+date=2022-04-05";
version = "2.3.0";
outputs = [ "bin" "dev" "out" ] ++ lib.optional enablePython "py";
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
rev = "db93bae96d64140230ad050061632531644c46ad";
hash = "sha256-8e/PFDhsyrOgmI3vLT1YhcROmbJgArDAJSe8Z2bZafo=";
rev = version;
hash = "sha256-fZfDSWVRg73dN+WF6LbgRSj8vtyeKeyjC8pWXFxUmBg=";
};
postPatch = ''
echo '${version}' > .tarball-version
'';
nativeBuildInputs = [
autoreconfHook
pkg-config
@@ -35,10 +31,18 @@ stdenv.mkDerivation rec {
python3.pkgs.cython
];
configureFlags = lib.optionals (!enablePython) [
preAutoreconf = ''
export RELEASE_VERSION=${version}
'';
configureFlags = [
"--enable-debug"
] ++ lib.optionals (!enablePython) [
"--without-cython"
];
doCheck = true;
postFixup = lib.optionalString enablePython ''
moveToOutput "lib/${python3.libPrefix}" "$py"
'';
@@ -49,5 +53,6 @@ stdenv.mkDerivation rec {
license = licenses.lgpl21Plus;
maintainers = with maintainers; [ infinisil ];
platforms = platforms.unix;
mainProgram = "plistutil";
};
}

14
pkgs/development/libraries/libusbmuxd/default.nix
View File

@@ -9,19 +9,15 @@
stdenv.mkDerivation rec {
pname = "libusbmuxd";
version = "2.0.2+date=2022-05-04";
version = "2.0.2+date=2023-04-30";
src = fetchFromGitHub {
owner = "libimobiledevice";
repo = pname;
rev = "36ffb7ab6e2a7e33bd1b56398a88895b7b8c615a";
hash = "sha256-41N5cSLAiPJ9FjdnCQnMvPu9/qhI3Je/M1VmKY+yII4=";
rev = "f47c36f5bd2a653a3bd7fb1cf1d2c50b0e6193fb";
hash = "sha256-ojFnFD0lcdJLP27oFukwzkG5THx1QE+tRBsaMj4ZCc4=";
};
postPatch = ''
echo '${version}' > .tarball-version
'';
nativeBuildInputs = [
autoreconfHook
pkg-config
@@ -32,6 +28,10 @@ stdenv.mkDerivation rec {
libimobiledevice-glue
];
preAutoreconf = ''
export RELEASE_VERSION=${version}
'';
meta = with lib; {
description = "A client library to multiplex connections from and to iOS devices";
homepage = "https://github.com/libimobiledevice/libusbmuxd";

4
pkgs/development/libraries/minizip-ng/default.nix
View File

@@ -14,13 +14,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "minizip-ng";
version = "3.0.10";
version = "4.0.0";
src = fetchFromGitHub {
owner = "zlib-ng";
repo = finalAttrs.pname;
rev = finalAttrs.version;
sha256 = "sha256-ynYAWF570S6MpD1WXbUC3cu+chL3+AhsMHr15l+LYVg=";
sha256 = "sha256-YgBOsznV1JtnpLUJeqZ06zvdB3tNbOlFhhLd1pMJhEM=";
};
nativeBuildInputs = [ cmake pkg-config ];

4
pkgs/development/libraries/oneDNN/default.nix
View File

@@ -5,13 +5,13 @@
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
stdenv.mkDerivation rec {
pname = "oneDNN";
version = "3.1.1";
version = "3.2";
src = fetchFromGitHub {
owner = "oneapi-src";
repo = "oneDNN";
rev = "v${version}";
sha256 = "sha256-02S9eG9eAUS7S59YtyaAany07A2V/Cu7Vto2IruDCtc=";
sha256 = "sha256-V+0NyQMa4pY9Rhw6bLuqTom0ps/+wm4mGfn1rTi+0YM=";
};
outputs = [ "out" "dev" "doc" ];

23
pkgs/development/libraries/sregex/default.nix Normal file
View File

@@ -0,0 +1,23 @@
{ lib, stdenv, fetchFromGitHub }:
stdenv.mkDerivation rec {
pname = "sregex";
version = "0.0.1";
src = fetchFromGitHub {
owner = "openresty";
repo = pname;
rev = "v${version}";
hash = "sha256-HZ9O/3BQHHrTVLLlU0o1fLHxyRSesBhreT3IdGHnNsg=";
};
makeFlags = [ "PREFIX=$(out)" "CC:=$(CC)" ];
meta = with lib; {
homepage = "https://github.com/openresty/sregex";
description = "A non-backtracking NFA/DFA-based Perl-compatible regex engine matching on large data streams";
license = licenses.bsd3;
maintainers = with maintainers; [ earthengine ];
platforms = platforms.all;
};
}

17
pkgs/development/libraries/zlib-ng/default.nix
View File

@@ -1,22 +1,29 @@
{ lib, stdenv, fetchFromGitHub
, cmake, pkg-config
{ lib, stdenv, fetchFromGitHub, fetchpatch
, cmake, pkg-config, gtest
, withZlibCompat ? false
}:
stdenv.mkDerivation rec {
pname = "zlib-ng";
version = "2.0.7";
version = "2.1.2";
src = fetchFromGitHub {
owner = "zlib-ng";
repo = "zlib-ng";
rev = version;
sha256 = "sha256-Q+u71XXfHafmTL8tmk4XcgpbSdBIunveL9Q78LqiZF0=";
sha256 = "sha256-6IEH9IQsBiNwfAZAemmP0/p6CTOzxEKyekciuH6pLhw=";
};
patches = [
(fetchpatch {
url = "https://patch-diff.githubusercontent.com/raw/zlib-ng/zlib-ng/pull/1519.patch";
hash = "sha256-itobS8kJ2Hj3RfjslVkvEVdQ4t5eeIrsA9muRZt03pE=";
})
];
outputs = [ "out" "dev" "bin" ];
nativeBuildInputs = [ cmake pkg-config ];
nativeBuildInputs = [ cmake pkg-config gtest ];
cmakeFlags = [
"-DCMAKE_INSTALL_PREFIX=/"

12
pkgs/development/mobile/ios-webkit-debug-proxy/default.nix
View File

@@ -20,14 +20,19 @@ stdenv.mkDerivation rec {
owner = "google";
repo = pname;
rev = "v${version}";
sha256 = "sha256-cZ/p/aWET/BXKDrD+qgR+rfTISd+4jPNQFuV8klSLUo=";
hash = "sha256-cZ/p/aWET/BXKDrD+qgR+rfTISd+4jPNQFuV8klSLUo=";
};
patches = [
# OpenSSL 3.0 compatibility
(fetchpatch {
url = "https://github.com/google/ios-webkit-debug-proxy/commit/5ba30a2a67f39d25025cadf37c0eafb2e2d2d0a8.patch";
sha256 = "sha256-2b9BjG9wkqO+ZfoBYYJvD2Db5Kr0F/MxKMTRsI0ea3s=";
hash = "sha256-2b9BjG9wkqO+ZfoBYYJvD2Db5Kr0F/MxKMTRsI0ea3s=";
})
(fetchpatch {
name = "libplist-2.3.0-compatibility.patch";
url = "https://github.com/google/ios-webkit-debug-proxy/commit/94e4625ea648ece730d33d13224881ab06ad0fce.patch";
hash = "sha256-2deFAKIcNPDd1loOSe8pWZWs9idIE5Q2+pLkoVQrTLg=";
})
# Examples compilation breaks with --disable-static, see https://github.com/google/ios-webkit-debug-proxy/issues/399
./0001-Don-t-compile-examples.patch
@@ -41,10 +46,11 @@ stdenv.mkDerivation rec {
preConfigure = ''
NOCONFIGURE=1 ./autogen.sh
'';
enableParallelBuilding = true;
meta = with lib; {
description = "A DevTools proxy (Chrome Remote Debugging Protocol) for iOS devices (Safari Remote Web Inspector).";
description = "A DevTools proxy (Chrome Remote Debugging Protocol) for iOS devices (Safari Remote Web Inspector)";
longDescription = ''
The ios_webkit_debug_proxy (aka iwdp) proxies requests from usbmuxd
daemon over a websocket connection, allowing developers to send commands

63
pkgs/development/ocaml-modules/ocamlformat/generic.nix Normal file
View File

@@ -0,0 +1,63 @@
{ lib, fetchurl, ocaml-ng, version }:
# The ocamlformat package have been split into two in version 0.25.1:
# one for the library and one for the executable.
# Both have the same sources and very similar dependencies.
with ocaml-ng.ocamlPackages;
rec {
tarballName = "ocamlformat-${version}.tbz";
src = fetchurl {
url =
"https://github.com/ocaml-ppx/ocamlformat/releases/download/${version}/${tarballName}";
sha256 = {
"0.19.0" = "0ihgwl7d489g938m1jvgx8azdgq9f5np5mzqwwya797hx2m4dz32";
"0.20.0" = "sha256-JtmNCgwjbCyUE4bWqdH5Nc2YSit+rekwS43DcviIfgk=";
"0.20.1" = "sha256-fTpRZFQW+ngoc0T6A69reEUAZ6GmHkeQvxspd5zRAjU=";
"0.21.0" = "sha256-KhgX9rxYH/DM6fCqloe4l7AnJuKrdXSe6Y1XY3BXMy0=";
"0.22.4" = "sha256-61TeK4GsfMLmjYGn3ICzkagbc3/Po++Wnqkb2tbJwGA=";
"0.23.0" = "sha256-m9Pjz7DaGy917M1GjyfqG5Lm5ne7YSlJF2SVcDHe3+0=";
"0.24.0" = "sha256-Zil0wceeXmq2xy0OVLxa/Ujl4Dtsmc4COyv6Jo7rVaM=";
"0.24.1" = "sha256-AjQl6YGPgOpQU3sjcaSnZsFJqZV9BYB+iKAE0tX0Qc4=";
"0.25.1" = "sha256-3I8qMwyjkws2yssmI7s2Dti99uSorNKT29niJBpv0z0=";
}."${version}";
};
odoc-parser_v = odoc-parser.override {
version = if lib.versionAtLeast version "0.24.0" then
"2.0.0"
else if lib.versionAtLeast version "0.20.1" then
"1.0.1"
else
"0.9.0";
};
cmdliner_v =
if lib.versionAtLeast version "0.21.0" then cmdliner_1_1 else cmdliner_1_0;
library_deps = [
base
cmdliner_v
dune-build-info
fix
fpath
menhirLib
menhirSdk
ocp-indent
stdio
uuseg
uutf
] ++ lib.optionals (lib.versionAtLeast version "0.20.0") [
either
ocaml-version
] ++ lib.optionals (lib.versionAtLeast version "0.22.4") [ csexp ]
++ (if lib.versionOlder version "0.25.1" then
[ odoc-parser_v ]
else [
camlp-streams
result
astring
]);
}

26
pkgs/development/ocaml-modules/ocamlformat/ocamlformat-lib.nix Normal file
View File

@@ -0,0 +1,26 @@
{ lib, callPackage, ocaml-ng, version ? "0.25.1" }:
with ocaml-ng.ocamlPackages;
let inherit (callPackage ./generic.nix { inherit version; }) src library_deps;
in assert (lib.versionAtLeast version "0.25.1");
buildDunePackage {
pname = "ocamlformat-lib";
inherit src version;
minimalOCamlVersion = "4.08";
duneVersion = "3";
nativeBuildInputs = [ menhir ];
propagatedBuildInputs = library_deps;
meta = {
homepage = "https://github.com/ocaml-ppx/ocamlformat";
description = "Auto-formatter for OCaml code (library)";
maintainers = with lib.maintainers; [ Zimmi48 marsam Julow ];
license = lib.licenses.mit;
};
}

2
pkgs/development/ocaml-modules/ocamlformat-rpc-lib/default.nix → pkgs/development/ocaml-modules/ocamlformat/ocamlformat-rpc-lib.nix
View File

@@ -30,6 +30,6 @@ buildDunePackage rec {
homepage = "https://github.com/ocaml-ppx/ocamlformat";
description = "Auto-formatter for OCaml code (RPC mode)";
license = licenses.mit;
maintainers = with maintainers; [ Zimmi48 marsam ];
maintainers = with maintainers; [ Zimmi48 marsam Julow ];
};
}

4
pkgs/development/php-packages/psysh/default.nix
View File

@@ -2,14 +2,14 @@
let
pname = "psysh";
version = "0.11.17";
version = "0.11.18";
in
mkDerivation {
inherit pname version;
src = fetchurl {
url = "https://github.com/bobthecow/psysh/releases/download/v${version}/psysh-v${version}.tar.gz";
sha256 = "sha256-GQhX4vL059ztDb4eqcY1r3jdQS8gQkaQ7/+NMR4jH2M=";
sha256 = "sha256-roonJBpMXOAsa/IyPn3kR1VSHH/kUJFuUU6myVI7Y+A=";
};
dontUnpack = true;

Some files were not shown because too many files have changed in this diff Show More