b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse source 
* master: (77 commits)
  containerd: 1.7.2 -> 1.7.3
  python310Packages.transformers: 4.30.2 -> 4.31.0
  plasma-sdk: unbreak build, again
  stellarium: add patch for indi 2.0 compatibility
  indi-full: 1.9.8 -> 2.0.2, reenable Atik, Pentax and SX drivers
  indilib: 1.9.8 -> 2.0.2
  plasma: 5.27.6 -> 5.27.7
  alsa-scarlett-gui: light refactoring
  alsa-scarlett-gui: Change icons path back to relative in desktop entry file
  alsa-scarlet-gui: light refactoring Done some light refactoring for better consitence in the code.
  alsa-scarlett-gui: fix for deskop integration
  alsa-scarlett-gui: fixed desktop entry
  release-notes: note breaking woodpecker update
  woodpecker-*: 0.15.11 -> 1.0.0
  pnpm-lock-export: use fork with v6 support
  suricata: 6.0.13 -> 7.0.0
  rubyfmt: add support for macos arm64/x86
  rubyfmt: init at 0.8.1
  dayon: init at 11.0.7
  nixos/atuin: harden systemd unit
  ...
This commit is contained in:
Doron Behar 2023-08-01 16:52:24 +03:00
parent 9bef3687ff 1015d9a9f8
commit cc63e791bf
79 changed files with 7623 additions and 2099 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
doc/hooks/index.md
View file

@ -29,5 +29,6 @@ tetex-tex-live.section.md
unzip.section.md unzip.section.md
validatePkgConfig.section.md validatePkgConfig.section.md
waf.section.md waf.section.md
zig.section.md
xcbuild.section.md xcbuild.section.md
``` ```

59
doc/hooks/zig.section.md Normal file
View file

@ -0,0 +1,59 @@
# zigHook {#zighook}
[Zig](https://ziglang.org/) is a general-purpose programming language and toolchain for maintaining robust, optimal and reusable software.
In Nixpkgs, `zigHook` overrides the default build, check and install phases.
## Example code snippet {#example-code-snippet}
```nix
{ lib
, stdenv
, zigHook
}:
stdenv.mkDerivation {
# . . .
nativeBuildInputs = [
zigHook
];
zigBuildFlags = [ "-Dman-pages=true" ];
dontUseZigCheck = true;
# . . .
}
```
## Variables controlling zigHook {#variables-controlling-zighook}
### `dontUseZigBuild` {#dontUseZigBuild}
Disables using `zigBuildPhase`.
### `zigBuildFlags` {#zigBuildFlags}
Controls the flags passed to the build phase.
### `dontUseZigCheck` {#dontUseZigCheck}
Disables using `zigCheckPhase`.
### `zigCheckFlags` {#zigCheckFlags}
Controls the flags passed to the check phase.
### `dontUseZigInstall` {#dontUseZigInstall}
Disables using `zigInstallPhase`.
### `zigInstallFlags` {#zigInstallFlags}
Controls the flags passed to the install phase.
### Variables honored by zigHook {#variablesHonoredByZigHook}
- `prefixKey`
- `dontAddPrefix`

5
maintainers/maintainer-list.nix
View file

@ -8710,6 +8710,11 @@
githubId = 762421; githubId = 762421;
name = "Pierre Thierry"; name = "Pierre Thierry";
}; };
keto = {
github = "TheRealKeto";
githubId = 24854941;
name = "Keto";
};
ketzacoatl = { ketzacoatl = {
email = "ketzacoatl@protonmail.com"; email = "ketzacoatl@protonmail.com";
github = "ketzacoatl"; github = "ketzacoatl";

4
nixos/doc/manual/release-notes/rl-2311.section.md
View file

@ -102,6 +102,8 @@
- The binary of the package `cloud-sql-proxy` has changed from `cloud_sql_proxy` to `cloud-sql-proxy`. - The binary of the package `cloud-sql-proxy` has changed from `cloud_sql_proxy` to `cloud-sql-proxy`.
- The `woodpecker-*` CI packages have been updated to 1.0.0. This release is wildly incompatible with the 0.15.X versions that were previously packaged. Please read [upstream's documentation](https://woodpecker-ci.org/docs/next/migrations#100) to learn how to update your CI configurations.
- The Caddy module gained a new option named `services.caddy.enableReload` which is enabled by default. It allows reloading the service instead of restarting it, if only a config file has changed. This option must be disabled if you have turned off the [Caddy admin API](https://caddyserver.com/docs/caddyfile/options#admin). If you keep this option enabled, you should consider setting [`grace_period`](https://caddyserver.com/docs/caddyfile/options#grace-period) to a non-infinite value to prevent Caddy from delaying the reload indefinitely. - The Caddy module gained a new option named `services.caddy.enableReload` which is enabled by default. It allows reloading the service instead of restarting it, if only a config file has changed. This option must be disabled if you have turned off the [Caddy admin API](https://caddyserver.com/docs/caddyfile/options#admin). If you keep this option enabled, you should consider setting [`grace_period`](https://caddyserver.com/docs/caddyfile/options#grace-period) to a non-infinite value to prevent Caddy from delaying the reload indefinitely.
- mdraid support is now optional. This reduces initramfs size and prevents the potentially undesired automatic detection and activation of software RAID pools. It is disabled by default in new configurations (determined by `stateVersion`), but the appropriate settings will be generated by `nixos-generate-config` when installing to a software RAID device, so the standard installation procedure should be unaffected. If you have custom configs relying on mdraid, ensure that you use `stateVersion` correctly or set `boot.swraid.enable` manually. - mdraid support is now optional. This reduces initramfs size and prevents the potentially undesired automatic detection and activation of software RAID pools. It is disabled by default in new configurations (determined by `stateVersion`), but the appropriate settings will be generated by `nixos-generate-config` when installing to a software RAID device, so the standard installation procedure should be unaffected. If you have custom configs relying on mdraid, ensure that you use `stateVersion` correctly or set `boot.swraid.enable` manually.
@ -152,6 +154,8 @@ The module update takes care of the new config syntax and the data itself (user
- `boot.initrd.network.udhcp.enable` allows control over dhcp during stage 1 regardless of what `networking.useDHCP` is set to. - `boot.initrd.network.udhcp.enable` allows control over dhcp during stage 1 regardless of what `networking.useDHCP` is set to.
- Suricata was upgraded from 6.0 to 7.0 and no longer considers HTTP/2 support as experimental, see [upstream release notes](https://forum.suricata.io/t/suricata-7-0-0-released/3715) for more details.
## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals} ## Nixpkgs internals {#sec-release-23.11-nixpkgs-internals}
- The `qemu-vm.nix` module by default now identifies block devices via - The `qemu-vm.nix` module by default now identifies block devices via

67
nixos/modules/services/misc/atuin.nix
View file

@ -1,14 +1,12 @@
{ config, pkgs, lib, ... }: { config, pkgs, lib, ... }:
with lib;
let let
inherit (lib) mkOption types mdDoc mkIf;
cfg = config.services.atuin; cfg = config.services.atuin;
in in
{ {
options = { options = {
services.atuin = { services.atuin = {
enable = mkEnableOption (mdDoc "Enable server for shell history sync with atuin"); enable = lib.mkEnableOption (mdDoc "Enable server for shell history sync with atuin");
openRegistration = mkOption { openRegistration = mkOption {
type = types.bool; type = types.bool;
@ -50,16 +48,28 @@ in
createLocally = mkOption { createLocally = mkOption {
type = types.bool; type = types.bool;
default = true; default = true;
description = lib.mdDoc "Create the database and database user locally."; description = mdDoc "Create the database and database user locally.";
};
uri = mkOption {
type = types.str;
default = "postgresql:///atuin?host=/run/postgresql";
example = "postgresql://atuin@localhost:5432/atuin";
description = mdDoc "URI to the database";
}; };
}; };
}; };
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
assertions = [
{
assertion = cfg.database.createLocally -> config.services.postgresql.enable;
message = "Postgresql must be enabled to create a local database";
}
];
# enable postgres to host atuin db services.postgresql = mkIf cfg.database.createLocally {
services.postgresql = {
enable = true; enable = true;
ensureUsers = [{ ensureUsers = [{
name = "atuin"; name = "atuin";
@ -73,7 +83,7 @@ in
systemd.services.atuin = { systemd.services.atuin = {
description = "atuin server"; description = "atuin server";
requires = lib.optionals cfg.database.createLocally [ "postgresql.service" ]; requires = lib.optionals cfg.database.createLocally [ "postgresql.service" ];
after = [ "network.target" ] ++ lib.optionals cfg.database.createLocally [ "postgresql.service" ] ; after = [ "network.target" ] ++ lib.optionals cfg.database.createLocally [ "postgresql.service" ];
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
serviceConfig = { serviceConfig = {
@ -81,20 +91,55 @@ in
RuntimeDirectory = "atuin"; RuntimeDirectory = "atuin";
RuntimeDirectoryMode = "0700"; RuntimeDirectoryMode = "0700";
DynamicUser = true; DynamicUser = true;
# Hardening
CapabilityBoundingSet = "";
LockPersonality = true;
NoNewPrivileges = true;
MemoryDenyWriteExecute = true;
PrivateDevices = true;
PrivateMounts = true;
PrivateTmp = true;
PrivateUsers = true;
ProcSubset = "pid";
ProtectClock = true;
ProtectControlGroups = true;
ProtectHome = true;
ProtectHostname = true;
ProtectKernelLogs = true;
ProtectKernelModules = true;
ProtectKernelTunables = true;
ProtectProc = "invisible";
ProtectSystem = "full";
RemoveIPC = true;
RestrictAddressFamilies = [
"AF_INET"
"AF_INET6"
# Required for connecting to database sockets,
"AF_UNIX"
];
RestrictNamespaces = true;
RestrictRealtime = true;
RestrictSUIDSGID = true;
SystemCallArchitectures = "native";
SystemCallFilter = [
"@system-service"
"~@privileged"
];
UMask = "0077";
}; };
environment = { environment = {
ATUIN_HOST = cfg.host; ATUIN_HOST = cfg.host;
ATUIN_PORT = toString cfg.port; ATUIN_PORT = toString cfg.port;
ATUIN_MAX_HISTORY_LENGTH = toString cfg.maxHistoryLength; ATUIN_MAX_HISTORY_LENGTH = toString cfg.maxHistoryLength;
ATUIN_OPEN_REGISTRATION = boolToString cfg.openRegistration; ATUIN_OPEN_REGISTRATION = lib.boolToString cfg.openRegistration;
ATUIN_DB_URI = mkIf cfg.database.createLocally "postgresql:///atuin"; ATUIN_DB_URI = cfg.database.uri;
ATUIN_PATH = cfg.path; ATUIN_PATH = cfg.path;
ATUIN_CONFIG_DIR = "/run/atuin"; # required to start, but not used as configuration is via environment variables ATUIN_CONFIG_DIR = "/run/atuin"; # required to start, but not used as configuration is via environment variables
}; };
}; };
networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ]; networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.port ];
}; };
} }

2
nixos/tests/atuin.nix
View file

@ -14,6 +14,8 @@ in
server = server =
{ ... }: { ... }:
{ {
services.postgresql.enable = true;
services.atuin = { services.atuin = {
enable = true; enable = true;
port = testPort; port = testPort;

10
nixos/tests/binary-cache.nix
View file

@ -1,16 +1,14 @@
import ./make-test-python.nix ({ lib, ... }: import ./make-test-python.nix ({ lib, pkgs, ... }:
with lib;
{ {
name = "binary-cache"; name = "binary-cache";
meta.maintainers = with maintainers; [ thomasjm ]; meta.maintainers = with lib.maintainers; [ thomasjm ];
nodes.machine = nodes.machine =
{ pkgs, ... }: { { pkgs, ... }: {
imports = [ ../modules/installer/cd-dvd/channel.nix ]; imports = [ ../modules/installer/cd-dvd/channel.nix ];
environment.systemPackages = with pkgs; [python3]; environment.systemPackages = [ pkgs.python3 ];
system.extraDependencies = with pkgs; [hello.inputDerivation]; system.extraDependencies = [ pkgs.hello.inputDerivation ];
nix.extraOptions = '' nix.extraOptions = ''
experimental-features = nix-command experimental-features = nix-command
''; '';

6
nixos/tests/buildkite-agents.nix
View file

@ -1,10 +1,8 @@
import ./make-test-python.nix ({ pkgs, ... }: import ./make-test-python.nix ({ lib, pkgs, ... }:
{ {
name = "buildkite-agent"; name = "buildkite-agent";
meta = with pkgs.lib.maintainers; { meta.maintainers = with lib.maintainers; [ flokli ];
maintainers = [ flokli ];
};
nodes.machine = { pkgs, ... }: { nodes.machine = { pkgs, ... }: {
services.buildkite-agents = { services.buildkite-agents = {

4
nixos/tests/deepin.nix
View file

@ -1,9 +1,7 @@
import ./make-test-python.nix ({ pkgs, lib, ... }: { import ./make-test-python.nix ({ pkgs, lib, ... }: {
name = "deepin"; name = "deepin";
meta = with lib; { meta.maintainers = lib.teams.deepin.members;
maintainers = teams.deepin.members;
};
nodes.machine = { ... }: { nodes.machine = { ... }: {
imports = [ imports = [

18
nixos/tests/initrd-network-ssh/default.nix
View file

@ -1,12 +1,10 @@
import ../make-test-python.nix ({ lib, ... }: import ../make-test-python.nix ({ lib, pkgs, ... }:
{ {
name = "initrd-network-ssh"; name = "initrd-network-ssh";
meta = with lib.maintainers; { meta.maintainers = with lib.maintainers; [ willibutz emily ];
maintainers = [ willibutz emily ];
};
nodes = with lib; { nodes = {
server = server =
{ config, ... }: { config, ... }:
{ {
@ -17,7 +15,7 @@ import ../make-test-python.nix ({ lib, ... }:
enable = true; enable = true;
ssh = { ssh = {
enable = true; enable = true;
authorizedKeys = [ (readFile ./id_ed25519.pub) ]; authorizedKeys = [ (lib.readFile ./id_ed25519.pub) ];
port = 22; port = 22;
hostKeys = [ ./ssh_host_ed25519_key ]; hostKeys = [ ./ssh_host_ed25519_key ];
}; };
@ -37,12 +35,12 @@ import ../make-test-python.nix ({ lib, ... }:
{ {
environment.etc = { environment.etc = {
knownHosts = { knownHosts = {
text = concatStrings [ text = lib.concatStrings [
"server," "server,"
"${toString (head (splitString " " ( "${toString (lib.head (lib.splitString " " (
toString (elemAt (splitString "\n" config.networking.extraHosts) 2) toString (lib.elemAt (lib.splitString "\n" config.networking.extraHosts) 2)
)))} " )))} "
"${readFile ./ssh_host_ed25519_key.pub}" "${lib.readFile ./ssh_host_ed25519_key.pub}"
]; ];
}; };
sshKey = { sshKey = {

6
nixos/tests/osquery.nix
View file

@ -1,7 +1,5 @@
import ./make-test-python.nix ({ lib, pkgs, ... }: import ./make-test-python.nix ({ lib, pkgs, ... }:
with lib;
let let
config_refresh = "10"; config_refresh = "10";
nullvalue = "NULL"; nullvalue = "NULL";
@ -9,9 +7,7 @@ let
in in
{ {
name = "osquery"; name = "osquery";
meta = with maintainers; { meta.maintainers = with lib.maintainers; [ znewman01 lewo ];
maintainers = [ znewman01 lewo ];
};
nodes.machine = { config, pkgs, ... }: { nodes.machine = { config, pkgs, ... }: {
services.osquery = { services.osquery = {

10
nixos/tests/sftpgo.nix
View file

@ -12,8 +12,6 @@
# would be a nice to have for the future. # would be a nice to have for the future.
{ pkgs, lib, ... }: { pkgs, lib, ... }:
with lib;
let let
inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey; inherit (import ./ssh-keys.nix pkgs) snakeOilPrivateKey snakeOilPublicKey;
@ -54,7 +52,7 @@ let
# inside the dataprovider they will be automatically created. # inside the dataprovider they will be automatically created.
# You have to create the folder on the filesystem yourself # You have to create the folder on the filesystem yourself
virtual_folders = virtual_folders =
optional (isMemberOf config sharedFolderName user) { lib.optional (lib.isMemberOf config sharedFolderName user) {
name = sharedFolderName; name = sharedFolderName;
mapped_path = "${config.services.sftpgo.dataDir}/${sharedFolderName}"; mapped_path = "${config.services.sftpgo.dataDir}/${sharedFolderName}";
virtual_path = "/${sharedFolderName}"; virtual_path = "/${sharedFolderName}";
@ -62,10 +60,10 @@ let
# Defines the ACL on the virtual filesystem # Defines the ACL on the virtual filesystem
permissions = permissions =
recursiveUpdate { lib.recursiveUpdate {
"/" = [ "list" ]; # read-only top level directory "/" = [ "list" ]; # read-only top level directory
"/private" = [ "*" ]; # private subdirectory, not shared with others "/private" = [ "*" ]; # private subdirectory, not shared with others
} (optionalAttrs (isMemberOf config "shared" user) { } (lib.optionalAttrs (lib.isMemberOf config "shared" user) {
"/shared" = [ "*" ]; "/shared" = [ "*" ];
}); });
@ -91,7 +89,7 @@ let
# of users and folders to import to SFTPGo. # of users and folders to import to SFTPGo.
loadDataJson = config: pkgs.writeText "users-and-folders.json" (builtins.toJSON { loadDataJson = config: pkgs.writeText "users-and-folders.json" (builtins.toJSON {
users = users =
mapAttrsToList (name: user: generateUserAttrSet config user) (normalUsers config); lib.mapAttrsToList (name: user: lib.generateUserAttrSet config user) (normalUsers config);
folders = [ folders = [
{ {

17
nixos/tests/systemd-initrd-networkd-ssh.nix
View file

@ -2,15 +2,16 @@ import ./make-test-python.nix ({ lib, ... }: {
name = "systemd-initrd-network-ssh"; name = "systemd-initrd-network-ssh";
meta.maintainers = [ lib.maintainers.elvishjerricco ]; meta.maintainers = [ lib.maintainers.elvishjerricco ];
nodes = with lib; { nodes = {
server = { config, pkgs, ... }: { server = { config, pkgs, ... }: {
environment.systemPackages = [pkgs.cryptsetup]; environment.systemPackages = [ pkgs.cryptsetup ];
boot.loader.systemd-boot.enable = true; boot.loader.systemd-boot.enable = true;
boot.loader.timeout = 0; boot.loader.timeout = 0;
virtualisation = { virtualisation = {
emptyDiskImages = [ 4096 ]; emptyDiskImages = [ 4096 ];
useBootLoader = true; useBootLoader = true;
# Booting off the encrypted disk requires an available init script from the Nix store # Booting off the encrypted disk requires an available init script from
# the Nix store
mountHostNixStore = true; mountHostNixStore = true;
useEFIBoot = true; useEFIBoot = true;
}; };
@ -26,7 +27,7 @@ import ./make-test-python.nix ({ lib, ... }: {
enable = true; enable = true;
ssh = { ssh = {
enable = true; enable = true;
authorizedKeys = [ (readFile ./initrd-network-ssh/id_ed25519.pub) ]; authorizedKeys = [ (lib.readFile ./initrd-network-ssh/id_ed25519.pub) ];
port = 22; port = 22;
# Terrible hack so it works with useBootLoader # Terrible hack so it works with useBootLoader
hostKeys = [ { outPath = "${./initrd-network-ssh/ssh_host_ed25519_key}"; } ]; hostKeys = [ { outPath = "${./initrd-network-ssh/ssh_host_ed25519_key}"; } ];
@ -38,13 +39,13 @@ import ./make-test-python.nix ({ lib, ... }: {
client = { config, ... }: { client = { config, ... }: {
environment.etc = { environment.etc = {
knownHosts = { knownHosts = {
text = concatStrings [ text = lib.concatStrings [
"server," "server,"
"${ "${
toString (head (splitString " " (toString toString (lib.head (lib.splitString " " (toString
(elemAt (splitString "\n" config.networking.extraHosts) 2)))) (lib.elemAt (lib.splitString "\n" config.networking.extraHosts) 2))))
} " } "
"${readFile ./initrd-network-ssh/ssh_host_ed25519_key.pub}" "${lib.readFile ./initrd-network-ssh/ssh_host_ed25519_key.pub}"
]; ];
}; };
sshKey = { sshKey = {

4
pkgs/applications/audio/alsa-scarlett-gui/default.nix
View file

@ -24,6 +24,10 @@ stdenv.mkDerivation rec {
sourceRoot = "source/src"; sourceRoot = "source/src";
nativeBuildInputs = [ pkg-config wrapGAppsHook4 ]; nativeBuildInputs = [ pkg-config wrapGAppsHook4 ];
buildInputs = [ gtk4 alsa-lib ]; buildInputs = [ gtk4 alsa-lib ];
postInstall = ''
substituteInPlace $out/share/applications/vu.b4.${pname}.desktop \
--replace "Exec=/bin/alsa-scarlett-gui" "Exec=$out/bin/${pname}"
'';
# causes redefinition of _FORTIFY_SOURCE # causes redefinition of _FORTIFY_SOURCE
hardeningDisable = [ "fortify3" ]; hardeningDisable = [ "fortify3" ];

7
pkgs/applications/misc/organicmaps/default.nix
View file

@ -21,13 +21,13 @@
mkDerivation rec { mkDerivation rec {
pname = "organicmaps"; pname = "organicmaps";
version = "2023.05.08-7"; version = "2023.06.04-13";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "organicmaps"; owner = "organicmaps";
repo = "organicmaps"; repo = "organicmaps";
rev = "${version}-android"; rev = "${version}-android";
sha256 = "sha256-V7qTi5NiZf+1voZSHfuAyfMeTeiYfs/CoOQ2zweKmaU="; hash = "sha256-HoEOKN99ClR1sa8YFZcS9XomtXnTRdAXS0iQEdDrhvc=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -37,6 +37,9 @@ mkDerivation rec {
# crude fix for https://github.com/organicmaps/organicmaps/issues/1862 # crude fix for https://github.com/organicmaps/organicmaps/issues/1862
echo "echo ${lib.replaceStrings ["." "-"] ["" ""] version}" > tools/unix/version.sh echo "echo ${lib.replaceStrings ["." "-"] ["" ""] version}" > tools/unix/version.sh
# TODO use system boost instead, see https://github.com/organicmaps/organicmaps/issues/5345
patchShebangs 3party/boost/tools/build/src/engine/build.sh
''; '';
nativeBuildInputs = [ nativeBuildInputs = [

810
pkgs/applications/networking/browsers/firefox-bin/release_sources.nix
View file

File diff suppressed because it is too large Load diff

12
pkgs/applications/networking/browsers/firefox/packages.nix
View file

@ -3,10 +3,10 @@
{ {
firefox = buildMozillaMach rec { firefox = buildMozillaMach rec {
pname = "firefox"; pname = "firefox";
version = "115.0.3"; version = "116.0";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "d42d522e4c2160824c74d94c90b9d61ff7fd0515cddc9e4d544003ddf975fe975aa517493dc28bad31c67915a22477b2fbb42266dc3bda87a2555b7f57a6f5a2"; sha512 = "4370c65a99bf8796524aca11ea8e99fa4f875176a5805ad49f35ae149080eb54be42e7eae84627e87e17b88b262649e48f3b30b317170ac7c208960200d1005d";
}; };
meta = { meta = {
@ -87,11 +87,11 @@
firefox-esr-102 = buildMozillaMach rec { firefox-esr-102 = buildMozillaMach rec {
pname = "firefox-esr-102"; pname = "firefox-esr-102";
version = "102.13.0esr"; version = "102.14.0esr";
applicationName = "Mozilla Firefox ESR"; applicationName = "Mozilla Firefox ESR";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "745f4a77e4c898313f11118274d27513f4baa16bb42d5b71d9bd0dbe8957dbf39a5f7ae8442cd711aca9b597bc909c04b44cb8d9094c57aa34e285e64f834fde"; sha512 = "6cabd474d0f3a768a0f12fa5c9984ed193906b503202010fd1da0e2affa091fcc5c165e6b9c4152d286410d46b72b2ddbf52d323bf5ea542f29e5267a94dfdcd";
}; };
meta = { meta = {
@ -115,11 +115,11 @@
firefox-esr-115 = buildMozillaMach rec { firefox-esr-115 = buildMozillaMach rec {
pname = "firefox-esr-115"; pname = "firefox-esr-115";
version = "115.0.3esr"; version = "115.1.0esr";
applicationName = "Mozilla Firefox ESR"; applicationName = "Mozilla Firefox ESR";
src = fetchurl { src = fetchurl {
url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz"; url = "mirror://mozilla/firefox/releases/${version}/source/firefox-${version}.source.tar.xz";
sha512 = "416ee56bd4a602c543391faaa8de31808f267ef2167f7d913195de45d3628de08d0582dbaa8905c847e1431bccd9d1d5d73ad9e7e5ea75be39e4d908a8b40376"; sha512 = "b2abb706fef2f1aa9451e7ac7c2affa0cc92cf2b0c6629f106a94c62017476380c7b6f406861fa468f60ea898d8402f534ad74844eb3932741fbd981cec66592";
}; };
meta = { meta = {

112
pkgs/applications/networking/browsers/netsurf/browser.nix
View file

@ -1,58 +1,95 @@
{ lib, stdenv, fetchurl, makeWrapper, wrapGAppsHook { lib
, stdenv
, fetchurl
, SDL
, check
, curl
, expat
, gtk2
, gtk3
, libXcursor
, libXrandr
, libidn
, libjpeg
, libpng
, libwebp
, libxml2
, makeWrapper
, openssl
, perlPackages
, pkg-config
, wrapGAppsHook
, xxd
# Buildtime dependencies. # Netsurf-specific dependencies
, check, pkg-config, xxd , buildsystem
, libcss
# Runtime dependencies. , libdom
, curl, expat, libXcursor, libXrandr, libidn, libjpeg, libpng, libwebp, libxml2 , libhubbub
, openssl, perl, perlPackages , libnsbmp
, libnsfb
# uilib-specific dependencies , libnsgif
, gtk2 # GTK 2 , libnslog
, gtk3 # GTK 3 , libnspsl
, SDL # Framebuffer , libnsutils
, libparserutils
, libsvgtiny
, libutf8proc
, libwapcaplet
, nsgenbind
# Configuration # Configuration
, uilib , uilib
# Netsurf-specific dependencies
, libcss, libdom, libhubbub, libnsbmp, libnsfb, libnsgif
, libnslog, libnspsl, libnsutils, libparserutils, libsvgtiny, libutf8proc
, libwapcaplet, nsgenbind
}: }:
let stdenv.mkDerivation (finalAttrs: {
inherit (lib) optional optionals;
in
stdenv.mkDerivation rec {
pname = "netsurf"; pname = "netsurf";
version = "3.10"; version = "3.10";
src = fetchurl { src = fetchurl {
url = "http://download.netsurf-browser.org/netsurf/releases/source/${pname}-${version}-src.tar.gz"; url = "http://download.netsurf-browser.org/netsurf/releases/source/netsurf-${finalAttrs.version}-src.tar.gz";
sha256 = "sha256-NkhEKeGTYUaFwv8kb1W9Cm3d8xoBi+5F4NH3wohRmV4="; hash = "sha256-NkhEKeGTYUaFwv8kb1W9Cm3d8xoBi+5F4NH3wohRmV4=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
makeWrapper makeWrapper
perl
perlPackages.HTMLParser perlPackages.HTMLParser
perlPackages.perl
pkg-config pkg-config
xxd xxd
] ]
++ optional (uilib == "gtk2" || uilib == "gtk3") wrapGAppsHook ++ lib.optional (uilib == "gtk2" || uilib == "gtk3") wrapGAppsHook;
;
buildInputs = [ buildInputs = [
check curl libXcursor libXrandr libidn libjpeg libpng libwebp libxml2 openssl check
# Netsurf-specific libraries curl
nsgenbind libnsfb libwapcaplet libparserutils libnslog libcss libXcursor
libhubbub libdom libnsbmp libnsgif libsvgtiny libnsutils libnspsl libXrandr
libidn
libjpeg
libpng
libwebp
libxml2
openssl
libcss
libdom
libhubbub
libnsbmp
libnsfb
libnsgif
libnslog
libnspsl
libnsutils
libparserutils
libsvgtiny
libutf8proc libutf8proc
libwapcaplet
nsgenbind
] ]
++ optionals (uilib == "framebuffer") [ expat SDL ] ++ lib.optionals (uilib == "framebuffer") [ expat SDL ]
++ optional (uilib == "gtk2") gtk2 ++ lib.optional (uilib == "gtk2") gtk2
++ optional (uilib == "gtk3") gtk3 ++ lib.optional (uilib == "gtk3") gtk3
; ;
# Since at least 2018 AD, GCC and other compilers run in `-fno-common` mode as # Since at least 2018 AD, GCC and other compilers run in `-fno-common` mode as
@ -78,7 +115,7 @@ stdenv.mkDerivation rec {
"TARGET=${uilib}" "TARGET=${uilib}"
]; ];
meta = with lib; { meta = {
homepage = "https://www.netsurf-browser.org/"; homepage = "https://www.netsurf-browser.org/";
description = "A free, open source, small web browser"; description = "A free, open source, small web browser";
longDescription = '' longDescription = ''
@ -87,8 +124,7 @@ stdenv.mkDerivation rec {
layout and rendering engine entirely written from scratch. It is small and layout and rendering engine entirely written from scratch. It is small and
capable of handling many of the web standards in use today. capable of handling many of the web standards in use today.
''; '';
license = licenses.gpl2Only; license = lib.licenses.gpl2Only;
maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; inherit (buildsystem.meta) maintainers platforms;
platforms = platforms.linux;
}; };
} })

24
pkgs/applications/networking/browsers/netsurf/buildsystem.nix
View file

@ -1,24 +1,26 @@
{ lib, stdenv, fetchurl }: { lib
, stdenv
, fetchurl
}:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "netsurf-${libname}"; pname = "netsurf-buildsystem";
libname = "buildsystem";
version = "1.9"; version = "1.9";
src = fetchurl { src = fetchurl {
url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}.tar.gz"; url = "http://download.netsurf-browser.org/libs/releases/buildsystem-${finalAttrs.version}.tar.gz";
sha256 = "sha256-k4QeMUpoggmiC4dF8GU5PzqQ8Bvmj0Xpa8jS9KKqmio="; hash = "sha256-k4QeMUpoggmiC4dF8GU5PzqQ8Bvmj0Xpa8jS9KKqmio=";
}; };
makeFlags = [ makeFlags = [
"PREFIX=$(out)" "PREFIX=$(out)"
]; ];
meta = with lib; { meta = {
homepage = "https://www.netsurf-browser.org/"; homepage = "https://www.netsurf-browser.org/";
description = "NetSurf browser shared build system"; description = "NetSurf browser shared build system";
license = licenses.mit; license = lib.licenses.mit;
maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; maintainers = with lib.maintainers; [ vrthra AndersonTorres ];
platforms = platforms.unix; platforms = lib.platforms.unix;
}; };
} })

25
pkgs/applications/networking/browsers/netsurf/default.nix
View file

@ -1,20 +1,23 @@
{ lib, pkgs }: { lib, pkgs }:
lib.makeScope pkgs.newScope (self: with self; { lib.makeScope pkgs.newScope (self:
let
inherit (self) callPackage;
in {
# ui can be: gtk2, gtk3, sixel, framebuffer. Note that console display (sixel) # ui can be: gtk2, gtk3, sixel, framebuffer. Note that console display (sixel)
# requires a terminal that supports `sixel` capabilities, such as mlterm # requires a terminal that supports `sixel` capabilities, such as mlterm
# or xterm -ti 340 # or xterm -ti 340
ui = "gtk3"; ui = "gtk3";
uilib = uilib = {
if ui == "gtk2" || "framebuffer" = "framebuffer";
ui == "gtk3" || "gtk2" = "gtk2";
ui == "framebuffer" then ui "gtk3" = "gtk3";
else if ui == "sixel" then "framebuffer" "sixel" = "framebuffer";
else null; # Never will happen }.${self.ui} or null; # Null will never happen
SDL = SDL = {
if ui == "sixel" then pkgs.SDL_sixel "sixel" = pkgs.SDL_sixel;
else if ui == "framebuffer" then pkgs.SDL "framebuffer" = pkgs.SDL;
else null; }.${self.ui} or null;
browser = callPackage ./browser.nix { }; browser = callPackage ./browser.nix { };

35
pkgs/applications/networking/browsers/netsurf/libcss.nix
View file

@ -1,35 +1,43 @@
{ lib, stdenv, fetchurl, pkg-config, perl { lib
, stdenv
, fetchurl
, perl
, pkg-config
, buildsystem , buildsystem
, libparserutils , libparserutils
, libwapcaplet , libwapcaplet
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "netsurf-${libname}"; pname = "netsurf-libcss";
libname = "libcss";
version = "0.9.1"; version = "0.9.1";
src = fetchurl { src = fetchurl {
url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; url = "http://download.netsurf-browser.org/libs/releases/libcss-${finalAttrs.version}-src.tar.gz";
sha256 = "sha256-0tzhbpM5Lo1qcglCDUfC1Wo4EXAaDoGnJPxUHGPTxtw="; hash = "sha256-0tzhbpM5Lo1qcglCDUfC1Wo4EXAaDoGnJPxUHGPTxtw=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
perl perl
buildsystem
libparserutils libparserutils
libwapcaplet libwapcaplet
buildsystem ]; ];
makeFlags = [ makeFlags = [
"PREFIX=$(out)" "PREFIX=$(out)"
"NSSHARED=${buildsystem}/share/netsurf-buildsystem" "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
]; ];
env.NIX_CFLAGS_COMPILE = toString [ "-Wno-error=implicit-fallthrough" "-Wno-error=maybe-uninitialized" ]; env.NIX_CFLAGS_COMPILE = toString [
"-Wno-error=implicit-fallthrough"
"-Wno-error=maybe-uninitialized"
];
meta = with lib; { meta = {
homepage = "https://www.netsurf-browser.org/projects/${libname}/"; homepage = "https://www.netsurf-browser.org/projects/libcss/";
description = "Cascading Style Sheets library for netsurf browser"; description = "Cascading Style Sheets library for netsurf browser";
longDescription = '' longDescription = ''
LibCSS is a CSS parser and selection engine. It aims to parse the forward LibCSS is a CSS parser and selection engine. It aims to parse the forward
@ -37,8 +45,7 @@ stdenv.mkDerivation rec {
and is available for use by other software, under a more permissive and is available for use by other software, under a more permissive
license. license.
''; '';
license = licenses.mit; license = lib.licenses.mit;
maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; inherit (buildsystem.meta) maintainers platforms;
platforms = platforms.linux;
}; };
} })

30
pkgs/applications/networking/browsers/netsurf/libdom.nix
View file

@ -1,43 +1,47 @@
{ lib, stdenv, fetchurl, pkg-config, expat { lib
, stdenv
, fetchurl
, expat
, pkg-config
, buildsystem , buildsystem
, libparserutils , libparserutils
, libwapcaplet , libwapcaplet
, libhubbub , libhubbub
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "netsurf-${libname}"; pname = "netsurf-libdom";
libname = "libdom";
version = "0.4.1"; version = "0.4.1";
src = fetchurl { src = fetchurl {
url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; url = "http://download.netsurf-browser.org/libs/releases/libdom-${finalAttrs.version}-src.tar.gz";
sha256 = "sha256-mO4HJHHlXiCMmHjlFcQQrUYso2+HtK/L7K0CPzos70o="; hash = "sha256-mO4HJHHlXiCMmHjlFcQQrUYso2+HtK/L7K0CPzos70o=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
expat expat
buildsystem
libhubbub libhubbub
libparserutils libparserutils
libwapcaplet libwapcaplet
buildsystem ]; ];
makeFlags = [ makeFlags = [
"PREFIX=$(out)" "PREFIX=$(out)"
"NSSHARED=${buildsystem}/share/netsurf-buildsystem" "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
]; ];
meta = with lib; { meta = {
homepage = "https://www.netsurf-browser.org/projects/${libname}/"; homepage = "https://www.netsurf-browser.org/projects/libdom/";
description = "Document Object Model library for netsurf browser"; description = "Document Object Model library for netsurf browser";
longDescription = '' longDescription = ''
LibDOM is an implementation of the W3C DOM, written in C. It is currently LibDOM is an implementation of the W3C DOM, written in C. It is currently
in development for use with NetSurf and is intended to be suitable for use in development for use with NetSurf and is intended to be suitable for use
in other projects under a more permissive license. in other projects under a more permissive license.
''; '';
license = licenses.mit; license = lib.licenses.mit;
maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; inherit (buildsystem.meta) maintainers platforms;
platforms = platforms.linux;
}; };
} })

28
pkgs/applications/networking/browsers/netsurf/libhubbub.nix
View file

@ -1,30 +1,35 @@
{ lib, stdenv, fetchurl, pkg-config, perl { lib
, stdenv
, fetchurl
, perl
, pkg-config
, buildsystem , buildsystem
, libparserutils , libparserutils
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "netsurf-${libname}"; pname = "netsurf-libhubbub";
libname = "libhubbub";
version = "0.3.7"; version = "0.3.7";
src = fetchurl { src = fetchurl {
url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; url = "http://download.netsurf-browser.org/libs/releases/libhubbub-${finalAttrs.version}-src.tar.gz";
sha256 = "sha256-nnriU+bJBp51frmtTkhG84tNtSwMoBUURqn6Spd3NbY="; hash = "sha256-nnriU+bJBp51frmtTkhG84tNtSwMoBUURqn6Spd3NbY=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildInputs = [
perl perl
buildsystem
libparserutils libparserutils
buildsystem ]; ];
makeFlags = [ makeFlags = [
"PREFIX=$(out)" "PREFIX=$(out)"
"NSSHARED=${buildsystem}/share/netsurf-buildsystem" "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
]; ];
meta = with lib; { meta = {
homepage = "https://www.netsurf-browser.org/projects/hubbub/"; homepage = "https://www.netsurf-browser.org/projects/hubbub/";
description = "HTML5 parser library for netsurf browser"; description = "HTML5 parser library for netsurf browser";
longDescription = '' longDescription = ''
@ -37,8 +42,7 @@ stdenv.mkDerivation rec {
parse all markup, both valid and invalid. As a result, Hubbub parses web parse all markup, both valid and invalid. As a result, Hubbub parses web
content well. content well.
''; '';
license = licenses.mit; license = lib.licenses.mit;
maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; inherit (buildsystem.meta) maintainers platforms;
platforms = platforms.linux;
}; };
} })

24
pkgs/applications/networking/browsers/netsurf/libnsbmp.nix
View file

@ -1,18 +1,21 @@
{ lib, stdenv, fetchurl, pkg-config { lib
, stdenv
, fetchurl
, pkg-config
, buildsystem , buildsystem
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "netsurf-${libname}"; pname = "netsurf-libnsbmp";
libname = "libnsbmp";
version = "0.1.6"; version = "0.1.6";
src = fetchurl { src = fetchurl {
url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; url = "http://download.netsurf-browser.org/libs/releases/libnsbmp-${finalAttrs.version}-src.tar.gz";
sha256 = "sha256-ecSTZfhg7UUb/EEJ7d7I3j6bfOWjvgaVlr0qoZJ5Mk8="; hash = "sha256-ecSTZfhg7UUb/EEJ7d7I3j6bfOWjvgaVlr0qoZJ5Mk8=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildsystem ]; buildInputs = [ buildsystem ];
makeFlags = [ makeFlags = [
@ -20,11 +23,10 @@ stdenv.mkDerivation rec {
"NSSHARED=${buildsystem}/share/netsurf-buildsystem" "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
]; ];
meta = with lib; { meta = {
homepage = "https://www.netsurf-browser.org/"; homepage = "https://www.netsurf-browser.org/";
description = "BMP Decoder for netsurf browser"; description = "BMP Decoder for netsurf browser";
license = licenses.mit; license = lib.licenses.mit;
maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; inherit (buildsystem.meta) maintainers platforms;
platforms = platforms.linux;
}; };
} })

29
pkgs/applications/networking/browsers/netsurf/libnsfb.nix
View file

@ -1,19 +1,23 @@
{ lib, stdenv, fetchurl, pkg-config { lib
, uilib, SDL , stdenv
, fetchurl
, SDL
, pkg-config
, buildsystem , buildsystem
, uilib
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "netsurf-${libname}"; pname = "netsurf-libnsfb";
libname = "libnsfb";
version = "0.2.2"; version = "0.2.2";
src = fetchurl { src = fetchurl {
url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; url = "http://download.netsurf-browser.org/libs/releases/libnsfb-${finalAttrs.version}-src.tar.gz";
sha256 = "sha256-vkRso+tU35A/LamDEdEH11dM0R9awHE+YZFW1NGeo5o="; hash = "sha256-vkRso+tU35A/LamDEdEH11dM0R9awHE+YZFW1NGeo5o=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ SDL buildsystem ]; buildInputs = [ SDL buildsystem ];
makeFlags = [ makeFlags = [
@ -22,11 +26,10 @@ stdenv.mkDerivation rec {
"TARGET=${uilib}" "TARGET=${uilib}"
]; ];
meta = with lib; { meta = {
homepage = "https://www.netsurf-browser.org/projects/${libname}/"; homepage = "https://www.netsurf-browser.org/projects/libnsfb/";
description = "Netsurf framebuffer abstraction library"; description = "Netsurf framebuffer abstraction library";
license = licenses.mit; license = lib.licenses.mit;
maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; inherit (buildsystem.meta) maintainers platforms;
platforms = platforms.linux;
}; };
} })

27
pkgs/applications/networking/browsers/netsurf/libnsgif.nix
View file

@ -1,20 +1,24 @@
{ lib, stdenv, fetchurl, pkg-config, buildPackages { lib
, stdenv
, fetchurl
, pkg-config
, buildPackages
, buildsystem , buildsystem
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "netsurf-${libname}"; pname = "netsurf-libnsgif";
libname = "libnsgif";
version = "0.2.1"; version = "0.2.1";
src = fetchurl { src = fetchurl {
url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; url = "http://download.netsurf-browser.org/libs/releases/libnsgif-${finalAttrs.version}-src.tar.gz";
sha256 = "sha256-nq6lNM1wtTxar0UxeulXcBaFprSojb407Sb0+q6Hmks="; hash = "sha256-nq6lNM1wtTxar0UxeulXcBaFprSojb407Sb0+q6Hmks=";
}; };
depsBuildBuild = [ buildPackages.stdenv.cc ]; depsBuildBuild = [ buildPackages.stdenv.cc ];
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildsystem ]; buildInputs = [ buildsystem ];
makeFlags = [ makeFlags = [
@ -23,11 +27,10 @@ stdenv.mkDerivation rec {
"BUILD_CC=$(CC_FOR_BUILD)" "BUILD_CC=$(CC_FOR_BUILD)"
]; ];
meta = with lib; { meta = {
homepage = "https://www.netsurf-browser.org/projects/${libname}/"; homepage = "https://www.netsurf-browser.org/projects/libnsgif/";
description = "GIF Decoder for netsurf browser"; description = "GIF Decoder for netsurf browser";
license = licenses.mit; license = lib.licenses.mit;
maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; inherit (buildsystem.meta) maintainers platforms;
platforms = platforms.unix;
}; };
} })

32
pkgs/applications/networking/browsers/netsurf/libnslog.nix
View file

@ -1,18 +1,27 @@
{ lib, stdenv, fetchurl, pkg-config, bison, flex { lib
, stdenv
, fetchurl
, bison
, flex
, pkg-config
, buildsystem , buildsystem
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "netsurf-${libname}"; pname = "netsurf-libnslog";
libname = "libnslog";
version = "0.1.3"; version = "0.1.3";
src = fetchurl { src = fetchurl {
url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; url = "http://download.netsurf-browser.org/libs/releases/libnslog-${finalAttrs.version}-src.tar.gz";
sha256 = "sha256-/JjcqdfvpnCWRwpdlsAjFG4lv97AjA23RmHHtNsEU9A="; hash = "sha256-/JjcqdfvpnCWRwpdlsAjFG4lv97AjA23RmHHtNsEU9A=";
}; };
nativeBuildInputs = [ pkg-config bison flex ]; nativeBuildInputs = [
bison
flex
pkg-config
];
buildInputs = [ buildsystem ]; buildInputs = [ buildsystem ];
makeFlags = [ makeFlags = [
@ -20,11 +29,10 @@ stdenv.mkDerivation rec {
"NSSHARED=${buildsystem}/share/netsurf-buildsystem" "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
]; ];
meta = with lib; { meta = {
homepage = "https://www.netsurf-browser.org/"; homepage = "https://www.netsurf-browser.org/";
description = "NetSurf Parametric Logging Library"; description = "NetSurf Parametric Logging Library";
license = licenses.isc; license = lib.licenses.isc;
maintainers = [ maintainers.samueldr maintainers.AndersonTorres ]; inherit (buildsystem.meta) maintainers platforms;
platforms = platforms.linux;
}; };
} })

24
pkgs/applications/networking/browsers/netsurf/libnspsl.nix
View file

@ -1,18 +1,21 @@
{ lib, stdenv, fetchurl, pkg-config { lib
, stdenv
, fetchurl
, pkg-config
, buildsystem , buildsystem
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "netsurf-${libname}"; pname = "netsurf-libnspsl";
libname = "libnspsl";
version = "0.1.6"; version = "0.1.6";
src = fetchurl { src = fetchurl {
url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; url = "http://download.netsurf-browser.org/libs/releases/libnspsl-${finalAttrs.version}-src.tar.gz";
sha256 = "sha256-08WCBct40xC/gcpVNHotCYcZzsrHBGvDZ5g7E4tFAgs="; hash = "sha256-08WCBct40xC/gcpVNHotCYcZzsrHBGvDZ5g7E4tFAgs=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildsystem ]; buildInputs = [ buildsystem ];
makeFlags = [ makeFlags = [
@ -20,11 +23,10 @@ stdenv.mkDerivation rec {
"NSSHARED=${buildsystem}/share/netsurf-buildsystem" "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
]; ];
meta = with lib; { meta = {
homepage = "https://www.netsurf-browser.org/"; homepage = "https://www.netsurf-browser.org/";
description = "NetSurf Public Suffix List - Handling library"; description = "NetSurf Public Suffix List - Handling library";
license = licenses.mit; license = lib.licenses.mit;
maintainers = [ maintainers.samueldr maintainers.AndersonTorres ]; inherit (buildsystem.meta) maintainers platforms;
platforms = platforms.linux;
}; };
} })

24
pkgs/applications/networking/browsers/netsurf/libnsutils.nix
View file

@ -1,18 +1,21 @@
{ lib, stdenv, fetchurl, pkg-config { lib
, stdenv
, fetchurl
, pkg-config
, buildsystem , buildsystem
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "netsurf-${libname}"; pname = "netsurf-libnsutils";
libname = "libnsutils";
version = "0.1.0"; version = "0.1.0";
src = fetchurl { src = fetchurl {
url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; url = "http://download.netsurf-browser.org/libs/releases/libnsutils-${finalAttrs.version}-src.tar.gz";
sha256 = "sha256-eQxlFjRKvoL2KJ1lY5LpzOvkdbIMx+Hi2EMBE4X3rvA="; hash = "sha256-eQxlFjRKvoL2KJ1lY5LpzOvkdbIMx+Hi2EMBE4X3rvA=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];
buildInputs = [ buildsystem ]; buildInputs = [ buildsystem ];
makeFlags = [ makeFlags = [
@ -20,11 +23,10 @@ stdenv.mkDerivation rec {
"NSSHARED=${buildsystem}/share/netsurf-buildsystem" "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
]; ];
meta = with lib; { meta = {
homepage = "https://www.netsurf-browser.org/"; homepage = "https://www.netsurf-browser.org/";
description = "Generalised utility library for netsurf browser"; description = "Generalised utility library for netsurf browser";
license = licenses.mit; license = lib.licenses.mit;
maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; inherit (buildsystem.meta) maintainers platforms;
platforms = platforms.linux;
}; };
} })

30
pkgs/applications/networking/browsers/netsurf/libparserutils.nix
View file

@ -1,29 +1,33 @@
{ lib, stdenv, fetchurl, perl { lib
, stdenv
, fetchurl
, perl
, buildsystem , buildsystem
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "netsurf-${libname}"; pname = "netsurf-libparserutils";
libname = "libparserutils";
version = "0.2.4"; version = "0.2.4";
src = fetchurl { src = fetchurl {
url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; url = "http://download.netsurf-browser.org/libs/releases/libparserutils-${finalAttrs.version}-src.tar.gz";
sha256 = "sha256-MiuuYbMMzt4+MFv26uJBSSBkl3W8X/HRtogBKjxJR9g="; hash = "sha256-MiuuYbMMzt4+MFv26uJBSSBkl3W8X/HRtogBKjxJR9g=";
}; };
buildInputs = [ perl buildsystem ]; buildInputs = [
perl
buildsystem
];
makeFlags = [ makeFlags = [
"PREFIX=$(out)" "PREFIX=$(out)"
"NSSHARED=${buildsystem}/share/netsurf-buildsystem" "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
]; ];
meta = with lib; { meta = {
homepage = "https://www.netsurf-browser.org/projects/${libname}/"; homepage = "https://www.netsurf-browser.org/projects/libparserutils/";
description = "Parser building library for netsurf browser"; description = "Parser building library for netsurf browser";
license = licenses.mit; license = lib.licenses.mit;
maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; inherit (buildsystem.meta) maintainers platforms;
platforms = platforms.linux;
}; };
} })

35
pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix
View file

@ -1,4 +1,8 @@
{ lib, stdenv, fetchurl, pkg-config, gperf { lib
, stdenv
, fetchurl
, gperf
, pkg-config
, buildsystem , buildsystem
, libdom , libdom
, libhubbub , libhubbub
@ -6,34 +10,37 @@
, libwapcaplet , libwapcaplet
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "netsurf-${libname}"; pname = "netsurf-libsvgtiny";
libname = "libsvgtiny";
version = "0.1.7"; version = "0.1.7";
src = fetchurl { src = fetchurl {
url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; url = "http://download.netsurf-browser.org/libs/releases/libsvgtiny-${finalAttrs.version}-src.tar.gz";
sha256 = "sha256-LA3PlS8c2ILD6VQB75RZ8W27U8XT5FEjObL563add4E="; hash = "sha256-LA3PlS8c2ILD6VQB75RZ8W27U8XT5FEjObL563add4E=";
}; };
nativeBuildInputs = [ pkg-config gperf ]; nativeBuildInputs = [
gperf
pkg-config
];
buildInputs = [ buildInputs = [
buildsystem
libdom libdom
libhubbub libhubbub
libparserutils libparserutils
libwapcaplet libwapcaplet
buildsystem ]; ];
makeFlags = [ makeFlags = [
"PREFIX=$(out)" "PREFIX=$(out)"
"NSSHARED=${buildsystem}/share/netsurf-buildsystem" "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
]; ];
meta = with lib; { meta = {
homepage = "https://www.netsurf-browser.org/projects/${libname}/"; homepage = "https://www.netsurf-browser.org/projects/libsvgtiny/";
description = "NetSurf SVG decoder"; description = "NetSurf SVG decoder";
license = licenses.mit; license = lib.licenses.mit;
maintainers = [ maintainers.samueldr maintainers.AndersonTorres ]; inherit (buildsystem.meta) maintainers platforms;
platforms = platforms.linux;
}; };
} })

16
pkgs/applications/networking/browsers/netsurf/libutf8proc.nix
View file

@ -5,13 +5,12 @@
, buildsystem , buildsystem
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "netsurf-${libname}"; pname = "netsurf-libutf8proc";
libname = "libutf8proc";
version = "2.4.0-1"; version = "2.4.0-1";
src = fetchurl { src = fetchurl {
url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; url = "http://download.netsurf-browser.org/libs/releases/libutf8proc-${finalAttrs.version}-src.tar.gz";
hash = "sha256-AasdaYnBx3VQkNskw/ZOSflcVgrknCa+xRQrrGgCxHI="; hash = "sha256-AasdaYnBx3VQkNskw/ZOSflcVgrknCa+xRQrrGgCxHI=";
}; };
@ -24,11 +23,10 @@ stdenv.mkDerivation rec {
"NSSHARED=${buildsystem}/share/netsurf-buildsystem" "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
]; ];
meta = with lib; { meta = {
homepage = "https://www.netsurf-browser.org/"; homepage = "https://www.netsurf-browser.org/";
description = "UTF8 Processing library for netsurf browser"; description = "UTF8 Processing library for netsurf browser";
license = licenses.mit; license = lib.licenses.mit;
maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; inherit (buildsystem.meta) maintainers platforms;
platforms = platforms.linux;
}; };
} })

24
pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix
View file

@ -1,15 +1,16 @@
{ lib, stdenv, fetchurl { lib
, stdenv
, fetchurl
, buildsystem , buildsystem
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "netsurf-${libname}"; pname = "netsurf-libwapcaplet";
libname = "libwapcaplet";
version = "0.4.3"; version = "0.4.3";
src = fetchurl { src = fetchurl {
url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; url = "http://download.netsurf-browser.org/libs/releases/libwapcaplet-${finalAttrs.version}-src.tar.gz";
sha256 = "sha256-myqh3W1mRfjpkrNpf9vYfwwOHaVyH6VO0ptITRMWDFw="; hash = "sha256-myqh3W1mRfjpkrNpf9vYfwwOHaVyH6VO0ptITRMWDFw=";
}; };
buildInputs = [ buildsystem ]; buildInputs = [ buildsystem ];
@ -21,11 +22,10 @@ stdenv.mkDerivation rec {
env.NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type"; env.NIX_CFLAGS_COMPILE = "-Wno-error=cast-function-type";
meta = with lib; { meta = {
homepage = "https://www.netsurf-browser.org/projects/${libname}/"; homepage = "https://www.netsurf-browser.org/projects/libwapcaplet/";
description = "String internment library for netsurf browser"; description = "String internment library for netsurf browser";
license = licenses.mit; license = lib.licenses.mit;
maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; inherit (buildsystem.meta) maintainers platforms;
platforms = platforms.linux;
}; };
} })

32
pkgs/applications/networking/browsers/netsurf/nsgenbind.nix
View file

@ -1,30 +1,36 @@
{ lib, stdenv, fetchurl { lib
, flex, bison , stdenv
, fetchurl
, bison
, flex
, buildsystem , buildsystem
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "netsurf-${libname}"; pname = "netsurf-nsgenbind";
libname = "nsgenbind";
version = "0.8"; version = "0.8";
src = fetchurl { src = fetchurl {
url = "http://download.netsurf-browser.org/libs/releases/${libname}-${version}-src.tar.gz"; url = "http://download.netsurf-browser.org/libs/releases/nsgenbind-${finalAttrs.version}-src.tar.gz";
sha256 = "sha256-TY1TrQAK2nEncjZeanPrj8XOl1hK+chlrFsmohh/HLM="; hash = "sha256-TY1TrQAK2nEncjZeanPrj8XOl1hK+chlrFsmohh/HLM=";
}; };
buildInputs = [ flex bison buildsystem ]; nativeBuildInputs = [
bison
flex
];
buildInputs = [ buildsystem ];
makeFlags = [ makeFlags = [
"PREFIX=$(out)" "PREFIX=$(out)"
"NSSHARED=${buildsystem}/share/netsurf-buildsystem" "NSSHARED=${buildsystem}/share/netsurf-buildsystem"
]; ];
meta = with lib; { meta = {
homepage = "https://www.netsurf-browser.org/"; homepage = "https://www.netsurf-browser.org/";
description = "Generator for JavaScript bindings for netsurf browser"; description = "Generator for JavaScript bindings for netsurf browser";
license = licenses.mit; license = lib.licenses.mit;
maintainers = [ maintainers.vrthra maintainers.AndersonTorres ]; inherit (buildsystem.meta) maintainers platforms;
platforms = platforms.linux;
}; };
} })

5
pkgs/applications/networking/browsers/offpunk/default.nix
View file

@ -14,6 +14,7 @@
let let
pythonDependencies = with python3Packages; [ pythonDependencies = with python3Packages; [
beautifulsoup4 beautifulsoup4
chardet
cryptography cryptography
feedparser feedparser
pillow pillow
@ -30,7 +31,7 @@ let
in in
python3Packages.buildPythonPackage rec { python3Packages.buildPythonPackage rec {
pname = "offpunk"; pname = "offpunk";
version = "1.9.2"; version = "1.10";
format = "flit"; format = "flit";
disabled = python3Packages.pythonOlder "3.7"; disabled = python3Packages.pythonOlder "3.7";
@ -39,7 +40,7 @@ python3Packages.buildPythonPackage rec {
owner = "~lioploum"; owner = "~lioploum";
repo = "offpunk"; repo = "offpunk";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-CYsuoj5/BaaboDRtcOrGzJoZDCfOLs7ROVWLVjOAnRU="; hash = "sha256-+jGKPPnKZHn+l6VAwuae6kICwR7ymkYJjsM2OHQAEmU=";
}; };
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

11
pkgs/applications/networking/ids/suricata/default.nix
View file

@ -22,8 +22,7 @@
, luajit , luajit
, lz4 , lz4
, nspr , nspr
, nss , pcre2
, pcre
, python , python
, zlib , zlib
, redisSupport ? true, redis, hiredis , redisSupport ? true, redis, hiredis
@ -34,11 +33,11 @@
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "suricata"; pname = "suricata";
version = "6.0.13"; version = "7.0.0";
src = fetchurl { src = fetchurl {
url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz"; url = "https://www.openinfosecfoundation.org/download/${pname}-${version}.tar.gz";
hash = "sha256-4J8vgA0ODNL5fyHFBZUMzD27nOXP6AjflWe22EmjEFU="; hash = "sha256-e80TExGDZkUUZdw/g4Wj9qrdCE/+RN0lfdqBBYY7t2k=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -67,8 +66,7 @@ stdenv.mkDerivation rec {
luajit luajit
lz4 lz4
nspr nspr
nss pcre2
pcre
python python
zlib zlib
] ]
@ -101,7 +99,6 @@ stdenv.mkDerivation rec {
"--enable-nflog" "--enable-nflog"
"--enable-nfqueue" "--enable-nfqueue"
"--enable-pie" "--enable-pie"
"--disable-prelude"
"--enable-python" "--enable-python"
"--enable-unix-socket" "--enable-unix-socket"
"--localstatedir=/var" "--localstatedir=/var"

67
pkgs/applications/networking/remote/dayon/default.nix Normal file
View file

@ -0,0 +1,67 @@
{ lib
, stdenv
, fetchFromGitHub
, ant
, jdk
, jre
, makeWrapper
, copyDesktopItems
}:
stdenv.mkDerivation rec {
pname = "dayon";
version = "11.0.7";
src = fetchFromGitHub {
owner = "RetGal";
repo = "dayon";
rev = "v${version}";
hash = "sha256-3TbJVM5po4aUAOsY7JJs/b5tUzH3WGnca/H83IeMQ2s=";
};
# https://github.com/RetGal/Dayon/pull/66
postPatch = ''
substituteInPlace resources/deb/dayon_assisted.desktop resources/deb/dayon_assistant.desktop \
--replace "Exec=/usr/bin/" "Exec="
'';
nativeBuildInputs = [
ant
jdk
makeWrapper
copyDesktopItems
];
buildPhase = ''
runHook preBuild
ant
runHook postBuild
'';
desktopItems = [
"resources/deb/dayon_assisted.desktop"
"resources/deb/dayon_assistant.desktop"
];
installPhase = ''
runHook preInstall
install -Dm644 build/dayon.jar $out/share/dayon/dayon.jar
mkdir -p $out/bin
makeWrapper ${jre}/bin/java $out/bin/dayon \
--add-flags "-jar $out/share/dayon/dayon.jar"
makeWrapper ${jre}/bin/java $out/bin/dayon_assisted \
--add-flags "-cp $out/share/dayon/dayon.jar mpo.dayon.assisted.AssistedRunner"
makeWrapper ${jre}/bin/java $out/bin/dayon_assistant \
--add-flags "-cp $out/share/dayon/dayon.jar mpo.dayon.assistant.AssistantRunner"
install -Dm644 resources/dayon.png $out/share/icons/hicolor/128x128/apps/dayon.png
runHook postInstall
'';
meta = with lib; {
homepage = "https://retgal.github.io/Dayon/index.html";
description = "An easy to use, cross-platform remote desktop assistance solution";
license = licenses.gpl3Plus; # https://github.com/RetGal/Dayon/issues/59
platforms = platforms.all;
maintainers = with maintainers; [ fgaz ];
};
}

9
pkgs/applications/science/astronomy/stellarium/default.nix
View file

@ -1,6 +1,7 @@
{ lib { lib
, stdenv , stdenv
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, cmake , cmake
, perl , perl
, wrapGAppsHook , wrapGAppsHook
@ -30,6 +31,14 @@ stdenv.mkDerivation rec {
hash = "sha256-8Iheb/9wjf0u10ZQRkLMLNN2s7P++Fqcr26iatiKcTo="; hash = "sha256-8Iheb/9wjf0u10ZQRkLMLNN2s7P++Fqcr26iatiKcTo=";
}; };
patches = [
# Compatibility with INDI 2.0 series from https://github.com/Stellarium/stellarium/pull/3269
(fetchpatch {
url = "https://github.com/Stellarium/stellarium/commit/31fd7bebf33fa710ce53ac8375238a24758312bc.patch";
hash = "sha256-eJEqqitZgtV6noeCi8pDBYMVTFIVWXZU1fiEvoilX8o=";
})
];
postPatch = lib.optionalString stdenv.isDarwin '' postPatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace CMakeLists.txt \ substituteInPlace CMakeLists.txt \
--replace 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \ --replace 'SET(CMAKE_INSTALL_PREFIX "''${PROJECT_BINARY_DIR}/Stellarium.app/Contents")' \

55
pkgs/applications/version-management/git-cinnabar/default.nix
View file

@ -1,29 +1,48 @@
{ stdenv, lib, fetchFromGitHub, cargo, pkg-config, rustPlatform { stdenv
, bzip2, curl, zlib, zstd, libiconv, CoreServices , lib
, fetchFromGitHub
, cargo
, pkg-config
, rustPlatform
, bzip2
, curl
, zlib
, zstd
, libiconv
, CoreServices
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "git-cinnabar"; pname = "git-cinnabar";
version = "0.6.1"; version = "0.6.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "glandium"; owner = "glandium";
repo = "git-cinnabar"; repo = "git-cinnabar";
rev = version; rev = finalAttrs.version;
sha256 = "VvfoMypiFT68YJuGpEyPCxGOjdbDoF6FXtzLWlw0uxY="; hash = "sha256-1Y4zd4rYNRatemDXRMkQQwBJdkfOGfDWk9QBvJOgi7s=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config rustPlatform.cargoSetupHook cargo cargo
pkg-config
rustPlatform.cargoSetupHook
]; ];
buildInputs = [ bzip2 curl zlib zstd ] buildInputs = [
++ lib.optionals stdenv.isDarwin [ libiconv CoreServices ]; bzip2
curl
zlib
zstd
] ++ lib.optionals stdenv.isDarwin [
libiconv
CoreServices
];
cargoDeps = rustPlatform.fetchCargoTarball { cargoDeps = rustPlatform.fetchCargoTarball {
inherit src; inherit (finalAttrs) src;
sha256 = "GApYgE7AezKmcGWNY+dF1Yp1TZmEeUdq3CsjvMvo/Rw="; hash = "sha256-p85AS2DukUzEbW9UGYmiF3hpnZvPrZ2sRaeA9dU8j/8=";
}; };
ZSTD_SYS_USE_PKG_CONFIG = true; ZSTD_SYS_USE_PKG_CONFIG = true;
@ -32,17 +51,19 @@ stdenv.mkDerivation rec {
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
mkdir -p $out/bin mkdir -p $out/bin
install -v target/release/git-cinnabar $out/bin install -v target/release/git-cinnabar $out/bin
ln -sv git-cinnabar $out/bin/git-remote-hg ln -sv git-cinnabar $out/bin/git-remote-hg
runHook postInstall runHook postInstall
''; '';
meta = with lib; { meta = {
homepage = "https://github.com/glandium/git-cinnabar";
description = "git remote helper to interact with mercurial repositories"; description = "git remote helper to interact with mercurial repositories";
license = licenses.gpl2Only; homepage = "https://github.com/glandium/git-cinnabar";
maintainers = with maintainers; [ qyliss ]; license = lib.licenses.gpl2Only;
platforms = platforms.all; maintainers = with lib.maintainers; [ qyliss ];
platforms = lib.platforms.all;
}; };
} })

4
pkgs/applications/virtualization/containerd/default.nix
View file

@ -11,13 +11,13 @@
buildGoModule rec { buildGoModule rec {
pname = "containerd"; pname = "containerd";
version = "1.7.2"; version = "1.7.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "containerd"; owner = "containerd";
repo = "containerd"; repo = "containerd";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-L4zaA+kMBz2tRMbitZUxb9/wdimSO2njx6ozvyKKlkk="; hash = "sha256-BUbZe37rBZTr6nWb4lY2HHuwtq7toDUkGaJOiOoVkWI=";
}; };
vendorHash = null; vendorHash = null;

13
pkgs/data/misc/dbip-country-lite/default.nix
View file

@ -1,16 +1,15 @@
{ lib { lib
, stdenvNoCC , stdenvNoCC
, fetchurl , fetchurl
, dbip-country-lite
}: }:
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation (finalAttrs: {
pname = "dbip-country-lite"; pname = "dbip-country-lite";
version = "2023-07"; version = "2023-08";
src = fetchurl { src = fetchurl {
url = "https://download.db-ip.com/free/dbip-country-lite-${version}.mmdb.gz"; url = "https://download.db-ip.com/free/dbip-country-lite-${finalAttrs.version}.mmdb.gz";
hash = "sha256-WVsyhopYbBlCWDq9UoPe1rcGU3pBYsXkqNWbaQXzRFA="; hash = "sha256-+IQSHgfVZ2codxkOKwi23CLjm+rYDZOQq5EWJs0OLiQ=";
}; };
dontUnpack = true; dontUnpack = true;
@ -24,7 +23,7 @@ stdenvNoCC.mkDerivation rec {
runHook postBuild runHook postBuild
''; '';
passthru.mmdb = "${dbip-country-lite}/share/dbip/dbip-country-lite.mmdb"; passthru.mmdb = "${finalAttrs.finalPackage}/share/dbip/dbip-country-lite.mmdb";
meta = with lib; { meta = with lib; {
description = "The free IP to Country Lite database by DB-IP"; description = "The free IP to Country Lite database by DB-IP";
@ -33,4 +32,4 @@ stdenvNoCC.mkDerivation rec {
maintainers = with maintainers; [ nickcao ]; maintainers = with maintainers; [ nickcao ];
platforms = platforms.all; platforms = platforms.all;
}; };
} })

4
pkgs/data/misc/v2ray-domain-list-community/default.nix
View file

@ -3,12 +3,12 @@
let let
generator = pkgsBuildBuild.buildGoModule rec { generator = pkgsBuildBuild.buildGoModule rec {
pname = "v2ray-domain-list-community"; pname = "v2ray-domain-list-community";
version = "20230725085751"; version = "20230730120627";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "v2fly"; owner = "v2fly";
repo = "domain-list-community"; repo = "domain-list-community";
rev = version; rev = version;
hash = "sha256-4D975ASoDoXjEi0kkwsUIIT6nwOE3ggBzNUVp0ojsbQ="; hash = "sha256-lnTP8KDYdIa7iq14h0TEVfAlJDtsURfSZaEdQ8L1TRM=";
}; };
vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8="; vendorHash = "sha256-dYaGR5ZBORANKAYuPAi9i+KQn2OAGDGTZxdyVjkcVi8=";
meta = with lib; { meta = with lib; {

2
pkgs/desktops/plasma-5/fetch.sh
View file

@ -1 +1 @@
WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.6/ -A '*.tar.xz' ) WGET_ARGS=( https://download.kde.org/stable/plasma/5.27.7/ -A '*.tar.xz' )

11
pkgs/desktops/plasma-5/plasma-sdk.nix
View file

@ -16,11 +16,22 @@
, ktexteditor , ktexteditor
, kwidgetsaddons , kwidgetsaddons
, kdoctools , kdoctools
, fetchpatch
}: }:
mkDerivation { mkDerivation {
pname = "plasma-sdk"; pname = "plasma-sdk";
patches = [
# remove duplicate doc entries, fix build
# FIXME: remove for next update
(fetchpatch {
url = "https://invent.kde.org/plasma/plasma-sdk/-/commit/e766c3c0483329f52ba0dd7536c4160131409f8e.patch";
revert = true;
hash = "sha256-NoQbRo+0gT4F4G6YbvTiQulqrsFtnD7z0/0I4teQvUM=";
})
];
nativeBuildInputs = [ extra-cmake-modules kdoctools ]; nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [ buildInputs = [
karchive karchive

472
pkgs/desktops/plasma-5/srcs.nix
View file

@ -4,475 +4,475 @@
{ {
aura-browser = { aura-browser = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/aura-browser-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/aura-browser-5.27.7.tar.xz";
sha256 = "1ppsxzy6hdnnsrrhlx5b7vq1f8v2d1rhfg5j5ypa77ixvi1yglh2"; sha256 = "0pzb3wgqqq9sddc9ycwxhikc450s78v9287djb6p96mvprix205r";
name = "aura-browser-5.27.6.tar.xz"; name = "aura-browser-5.27.7.tar.xz";
}; };
}; };
bluedevil = { bluedevil = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/bluedevil-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/bluedevil-5.27.7.tar.xz";
sha256 = "0x6zfcdw03kggd4mhkhva2b2v2w2ajzs7svslm1p1p8f41vzivvw"; sha256 = "0ddzcarn06rvhbmvm9x737ba9ycxcvg030892nh6izgfrjlaxhfb";
name = "bluedevil-5.27.6.tar.xz"; name = "bluedevil-5.27.7.tar.xz";
}; };
}; };
breeze = { breeze = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/breeze-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/breeze-5.27.7.tar.xz";
sha256 = "0v3cz9phdalvawfjrg3yirn2n4z6h872p12g7hcf8706bdz8v6jx"; sha256 = "1wfclkg4d3wraz19kwpm87vwp9327s5y8n1a42qgrdh980qwzzdz";
name = "breeze-5.27.6.tar.xz"; name = "breeze-5.27.7.tar.xz";
}; };
}; };
breeze-grub = { breeze-grub = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/breeze-grub-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/breeze-grub-5.27.7.tar.xz";
sha256 = "0lg2fba5v22z666wkbm5a6gzlq79jxski1cqnpp1z5laj7nrh8mv"; sha256 = "1c0096x75yhmr3irpbkz302gikqh2m1mz2s5j063db2ky72vlf9m";
name = "breeze-grub-5.27.6.tar.xz"; name = "breeze-grub-5.27.7.tar.xz";
}; };
}; };
breeze-gtk = { breeze-gtk = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/breeze-gtk-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/breeze-gtk-5.27.7.tar.xz";
sha256 = "1nkbhcsb359sqjampyc7cyl0hfnrx6gsrnqgaskdwk92p49snamc"; sha256 = "1s2qv51qa867b0bf29b7j90yzqmn3s2dwblczsb79h2i1gnr8ci9";
name = "breeze-gtk-5.27.6.tar.xz"; name = "breeze-gtk-5.27.7.tar.xz";
}; };
}; };
breeze-plymouth = { breeze-plymouth = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/breeze-plymouth-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/breeze-plymouth-5.27.7.tar.xz";
sha256 = "0gjg3ddc3g45dnj0lv5k52bf1v403qpgv2nhqrx9z3x43kidb3vc"; sha256 = "1vm33di6aaj95pf45g4r3hp79ag1i75mi1b5fpipjgi4aiiqvddz";
name = "breeze-plymouth-5.27.6.tar.xz"; name = "breeze-plymouth-5.27.7.tar.xz";
}; };
}; };
discover = { discover = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/discover-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/discover-5.27.7.tar.xz";
sha256 = "1ici6p7bvvfszcy79lrr5xa6q1kfskxyijfr2pq9lkdhn8sdfq8n"; sha256 = "0025g1whq8z1s5915jhq83xsiz4klzqpayfzqkar8c6gni5s3v59";
name = "discover-5.27.6.tar.xz"; name = "discover-5.27.7.tar.xz";
}; };
}; };
drkonqi = { drkonqi = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/drkonqi-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/drkonqi-5.27.7.tar.xz";
sha256 = "04yam1xjwxi6jbh4r2k0ci7vdjc5cwfg4nn36lb64f5gj2bicppr"; sha256 = "1li1j85yvg2nj392rl1jmdqx3mzmrdj0lf72j37xd8r2bi0ic9z8";
name = "drkonqi-5.27.6.tar.xz"; name = "drkonqi-5.27.7.tar.xz";
}; };
}; };
flatpak-kcm = { flatpak-kcm = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/flatpak-kcm-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/flatpak-kcm-5.27.7.tar.xz";
sha256 = "0ykzjaz45qxq7bl05chh3fg5b3qd0vdva5jf61dxnn7bksxr9vpw"; sha256 = "1crjxvfnx8jiaczwp7i96l75frcp866bv1rng8vizhi42pikbv52";
name = "flatpak-kcm-5.27.6.tar.xz"; name = "flatpak-kcm-5.27.7.tar.xz";
}; };
}; };
kactivitymanagerd = { kactivitymanagerd = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/kactivitymanagerd-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/kactivitymanagerd-5.27.7.tar.xz";
sha256 = "0bdhqn809jxgrq6j4jx1vf4q3xicqj3yi6557qpqxy34mlr0n606"; sha256 = "1d7vz8gwqa7nhfn62dsqircm0qbp9ryass82k2891mqj0qrlbwid";
name = "kactivitymanagerd-5.27.6.tar.xz"; name = "kactivitymanagerd-5.27.7.tar.xz";
}; };
}; };
kde-cli-tools = { kde-cli-tools = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/kde-cli-tools-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/kde-cli-tools-5.27.7.tar.xz";
sha256 = "1ahgpaa073lg6n7xnrkflqz9cj8sl7f77sla93415hc2pz1v3qmm"; sha256 = "1br1i8ba4n7d2yl618ph4glsaasn3rxy4kjp48f12l9l2pk29nxa";
name = "kde-cli-tools-5.27.6.tar.xz"; name = "kde-cli-tools-5.27.7.tar.xz";
}; };
}; };
kde-gtk-config = { kde-gtk-config = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/kde-gtk-config-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/kde-gtk-config-5.27.7.tar.xz";
sha256 = "087qj3c46f5wn7vh3nvf0pg40rspja3113phbzapf2sk09b3mwmk"; sha256 = "13qwj3gdfvs0l6k01n8hf25kzrsksi3qi0b1rzpshcj1ix31wamf";
name = "kde-gtk-config-5.27.6.tar.xz"; name = "kde-gtk-config-5.27.7.tar.xz";
}; };
}; };
kdecoration = { kdecoration = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/kdecoration-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/kdecoration-5.27.7.tar.xz";
sha256 = "1rllab85yzx9s3vfm2j31wxwi1s0js0a6jz7bcy8cv4sk91rpdlx"; sha256 = "153j3w00zwj6gx9ndq46vkfwx3ayig80j0jsqbkajk8zsncs89pg";
name = "kdecoration-5.27.6.tar.xz"; name = "kdecoration-5.27.7.tar.xz";
}; };
}; };
kdeplasma-addons = { kdeplasma-addons = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/kdeplasma-addons-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/kdeplasma-addons-5.27.7.tar.xz";
sha256 = "11zhpb4gcz4yy2v0j8mfzihi9rj35f83i8bi7iirix0vm100sfrl"; sha256 = "0l7g4lx6y10xfabfcgvh7zb7h08clj0g9yx8ajyg7rzwfa43visi";
name = "kdeplasma-addons-5.27.6.tar.xz"; name = "kdeplasma-addons-5.27.7.tar.xz";
}; };
}; };
kgamma5 = { kgamma5 = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/kgamma5-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/kgamma5-5.27.7.tar.xz";
sha256 = "14nn3wsk9w9x8m0mbdmdi86xh6x2946zhzhwdbsfgynjrkn13wb1"; sha256 = "0v5fynydjha9wx9j59ysw8vxx2h2gm55q27gnnhgyv0wxva8hpnl";
name = "kgamma5-5.27.6.tar.xz"; name = "kgamma5-5.27.7.tar.xz";
}; };
}; };
khotkeys = { khotkeys = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/khotkeys-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/khotkeys-5.27.7.tar.xz";
sha256 = "0zixhdnsm3956w2bff6fk1ksvk61ywjkylg690b90l041rhfriyv"; sha256 = "1ipg71jz356jrngw7kqbjs7jplpnr8q3yz694rkhqklsqlfh91bd";
name = "khotkeys-5.27.6.tar.xz"; name = "khotkeys-5.27.7.tar.xz";
}; };
}; };
kinfocenter = { kinfocenter = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/kinfocenter-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/kinfocenter-5.27.7.tar.xz";
sha256 = "06whh4wzc292xvzabv7q6x8wm0gkyd2nsy50vlvk7iy85jayk5nd"; sha256 = "15hm828ifrrzsbkvknqwf0l3qxr45pdi49z823cw421z45r8ivkj";
name = "kinfocenter-5.27.6.tar.xz"; name = "kinfocenter-5.27.7.tar.xz";
}; };
}; };
kmenuedit = { kmenuedit = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/kmenuedit-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/kmenuedit-5.27.7.tar.xz";
sha256 = "15j63b2vg5dmgqfin4irv3pz3ws6wvji0b5fdi82fml5hgx4y549"; sha256 = "0n60z44wbsjinrcrhs5cfnjs9szpsv2wzva2fiwwgh36j6zz5av7";
name = "kmenuedit-5.27.6.tar.xz"; name = "kmenuedit-5.27.7.tar.xz";
}; };
}; };
kpipewire = { kpipewire = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/kpipewire-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/kpipewire-5.27.7.tar.xz";
sha256 = "12rjwkk272r9r583vgxb64p5nylkcqsfyvbn0lpa6ap8q2zm7mky"; sha256 = "10j7sa8vv530c388z5rzafkdr4sx3agjqczlnkh7412whyw77lha";
name = "kpipewire-5.27.6.tar.xz"; name = "kpipewire-5.27.7.tar.xz";
}; };
}; };
kscreen = { kscreen = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/kscreen-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/kscreen-5.27.7.tar.xz";
sha256 = "0m7jidcs9xf5xzlnhx2s9qnzn6z80fxhssrxz8i2zqk7xhg6bl6y"; sha256 = "03qa2qrwdjgb6va7akhwpdvzky608sq2lnwj3b1f310mn3hmbmrq";
name = "kscreen-5.27.6.tar.xz"; name = "kscreen-5.27.7.tar.xz";
}; };
}; };
kscreenlocker = { kscreenlocker = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/kscreenlocker-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/kscreenlocker-5.27.7.tar.xz";
sha256 = "0pgmy4dw41kim7syk4xb2n4g4iz3jjikhwnh3bjianl9h87rc12x"; sha256 = "11y3ksd29p8hdn8chaf8vscnc7fbh8xkjdsbakrb056p1r8kn0f2";
name = "kscreenlocker-5.27.6.tar.xz"; name = "kscreenlocker-5.27.7.tar.xz";
}; };
}; };
ksshaskpass = { ksshaskpass = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/ksshaskpass-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/ksshaskpass-5.27.7.tar.xz";
sha256 = "1ig8qvjvrl27q1bg34c4lg34yx4pdvcjzxn4jxg6h9wbxdwssk45"; sha256 = "0vmydvj4c9c93y9wyyjs2hr9m0hygssk1asl4idbj7mcy6n7acg1";
name = "ksshaskpass-5.27.6.tar.xz"; name = "ksshaskpass-5.27.7.tar.xz";
}; };
}; };
ksystemstats = { ksystemstats = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/ksystemstats-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/ksystemstats-5.27.7.tar.xz";
sha256 = "0xi3z8pk1byc4wcds0an2ndnw8j5zgq3wr0gm517rc8vck30m0gi"; sha256 = "1fx5b566xx32q7gxi8qnnx6vny7ip5r65zi2znnx3azmwsc8jgvw";
name = "ksystemstats-5.27.6.tar.xz"; name = "ksystemstats-5.27.7.tar.xz";
}; };
}; };
kwallet-pam = { kwallet-pam = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/kwallet-pam-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/kwallet-pam-5.27.7.tar.xz";
sha256 = "0c38s7iqha94vz2d8dfch4qfb7zpc6k5z7wm33f5x190bw3g1bdp"; sha256 = "1ac0hqpzqivg40jq7pfr2s1zydl600a3nyzfv97wc20i9myzafrb";
name = "kwallet-pam-5.27.6.tar.xz"; name = "kwallet-pam-5.27.7.tar.xz";
}; };
}; };
kwayland-integration = { kwayland-integration = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/kwayland-integration-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/kwayland-integration-5.27.7.tar.xz";
sha256 = "10rc14ggbs86bq0sky4i3kdwarwk8mh2yx4g77if8vr7z96xpdqh"; sha256 = "1fvf64vx5m3h5v8h697ixkcifhva6a14wlz75kv6759ji9l9fy8y";
name = "kwayland-integration-5.27.6.tar.xz"; name = "kwayland-integration-5.27.7.tar.xz";
}; };
}; };
kwin = { kwin = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/kwin-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/kwin-5.27.7.tar.xz";
sha256 = "1v4r4h2zbandg43iyww5p66sgv2z90lrri1gijnwjlg9j5gbvmb2"; sha256 = "0bssp76lzqqlan5pfg6wjf4z9c6pl6p66ri8p82vqqw406x5bzyb";
name = "kwin-5.27.6.tar.xz"; name = "kwin-5.27.7.tar.xz";
}; };
}; };
kwrited = { kwrited = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/kwrited-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/kwrited-5.27.7.tar.xz";
sha256 = "153q38msna94wy8qbss02hzw7vabfghxs90bq9g9qjsr28428r86"; sha256 = "1a4g05ynblbz0j0lqclxf6628x6wcd3b52l0smic3rdvbis43v0n";
name = "kwrited-5.27.6.tar.xz"; name = "kwrited-5.27.7.tar.xz";
}; };
}; };
layer-shell-qt = { layer-shell-qt = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/layer-shell-qt-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/layer-shell-qt-5.27.7.tar.xz";
sha256 = "14w7kr5d5s9fg2qkybk5axg11cafc6rrxkivynj5v55zcp52jp76"; sha256 = "08glqqh7jmqrli4n7j04lz3w3c6192w8p7ki51ksmwivnxylxi17";
name = "layer-shell-qt-5.27.6.tar.xz"; name = "layer-shell-qt-5.27.7.tar.xz";
}; };
}; };
libkscreen = { libkscreen = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/libkscreen-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/libkscreen-5.27.7.tar.xz";
sha256 = "1ywyg1i9bg0nawndl4hzivd4yfsqk5snls8ak1vyr9xmm8zkgaf1"; sha256 = "1ary7qavz8vkzbvjx2mxv09h61hxa7i4f7rfgbykldbc83ripdc6";
name = "libkscreen-5.27.6.tar.xz"; name = "libkscreen-5.27.7.tar.xz";
}; };
}; };
libksysguard = { libksysguard = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/libksysguard-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/libksysguard-5.27.7.tar.xz";
sha256 = "1nqv0gxq011acvmqc2rpqrw4l928mcmg4rq2g45qzfmnmas2rjwy"; sha256 = "066bjar4105bfyry6ni7nnikz66bqzy5nvssz6vm4np3aa996ak8";
name = "libksysguard-5.27.6.tar.xz"; name = "libksysguard-5.27.7.tar.xz";
}; };
}; };
milou = { milou = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/milou-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/milou-5.27.7.tar.xz";
sha256 = "1il1sg7xi9p7snz9w3mygpydl6y02r5n24wa14yk23qhphwsgbpy"; sha256 = "0lq8m72nwink8x46m8qd5zdkadym1kc70ipnkb04b16mr7zhnsc1";
name = "milou-5.27.6.tar.xz"; name = "milou-5.27.7.tar.xz";
}; };
}; };
oxygen = { oxygen = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/oxygen-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/oxygen-5.27.7.tar.xz";
sha256 = "01h9vh8gk4ncgwa1p25ps5rm6m180081vh0ryw9x3z1qw893j1m9"; sha256 = "139rar9d36cvp6hl7857qkw9h0xbmk2i7x3mdgjpsabv5wpzq652";
name = "oxygen-5.27.6.tar.xz"; name = "oxygen-5.27.7.tar.xz";
}; };
}; };
oxygen-sounds = { oxygen-sounds = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/oxygen-sounds-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/oxygen-sounds-5.27.7.tar.xz";
sha256 = "0zijzkr6xqx3lqfccr9fkhmzmvqp5c8025nlh8sy94fi846g7smg"; sha256 = "132jaabfpj8k6xk6f1732a0qgjz1mzyyk74b1mm7q7pyhpypr2gq";
name = "oxygen-sounds-5.27.6.tar.xz"; name = "oxygen-sounds-5.27.7.tar.xz";
}; };
}; };
plank-player = { plank-player = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/plank-player-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/plank-player-5.27.7.tar.xz";
sha256 = "1mjn2qvzav3c2sxfnfv2h9bj7cd00vidl85zmljm17nflv9cvwa8"; sha256 = "0360affl3wl6aa6lmd7lc6lpzq2v8sqbr5ah2c5vmq0n0p4xxk4n";
name = "plank-player-5.27.6.tar.xz"; name = "plank-player-5.27.7.tar.xz";
}; };
}; };
plasma-bigscreen = { plasma-bigscreen = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/plasma-bigscreen-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/plasma-bigscreen-5.27.7.tar.xz";
sha256 = "097f5whppwla0y7zil7ykyp97glx2wdc05mwd7pk6y2l6d60fhl7"; sha256 = "0b2w0d5w1s2jm7al1nqdc1qh9fmrj8fw93wjbb2bsa9fabz2i81b";
name = "plasma-bigscreen-5.27.6.tar.xz"; name = "plasma-bigscreen-5.27.7.tar.xz";
}; };
}; };
plasma-browser-integration = { plasma-browser-integration = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/plasma-browser-integration-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/plasma-browser-integration-5.27.7.tar.xz";
sha256 = "12hrd6mvhmi649n4jc9pmv116f2cpzd3j90hxlhljixnw4g6vy3j"; sha256 = "0c30pdlhl452bjpdc7mwxl01hqabahyc0j1cc54liy0hla9vir9y";
name = "plasma-browser-integration-5.27.6.tar.xz"; name = "plasma-browser-integration-5.27.7.tar.xz";
}; };
}; };
plasma-desktop = { plasma-desktop = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/plasma-desktop-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/plasma-desktop-5.27.7.tar.xz";
sha256 = "10x68lqg6zxb8fajd277lm0qfrdg2jz7m58l3wna4nv9bni5wj72"; sha256 = "1njkjf3fhxfmwyviypxqzrn23klxiih82bazvd8y61cshqwai6i2";
name = "plasma-desktop-5.27.6.tar.xz"; name = "plasma-desktop-5.27.7.tar.xz";
}; };
}; };
plasma-disks = { plasma-disks = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/plasma-disks-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/plasma-disks-5.27.7.tar.xz";
sha256 = "09v4hwx2q8sz0b4qak8xaxnyqj6ccjlgk28fijvmnv61nxb49h1w"; sha256 = "0jwjv20ra1mhwl2cm7x2jz8pasmkc58fd57qxhzzf84l4sgbda9v";
name = "plasma-disks-5.27.6.tar.xz"; name = "plasma-disks-5.27.7.tar.xz";
}; };
}; };
plasma-firewall = { plasma-firewall = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/plasma-firewall-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/plasma-firewall-5.27.7.tar.xz";
sha256 = "1jbcyz92q63gh1ihkrvs4ffp1xjav9miy6n5adhqik9qxpgkqqn8"; sha256 = "1n5ljkydhcx6qapwrshslq835zaf02gssp2zvzi3vwfy4asc7ind";
name = "plasma-firewall-5.27.6.tar.xz"; name = "plasma-firewall-5.27.7.tar.xz";
}; };
}; };
plasma-integration = { plasma-integration = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/plasma-integration-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/plasma-integration-5.27.7.tar.xz";
sha256 = "1awd9l874gxxkbcfzb76xga1f6firaqpshrapg0492vq33r5vzd5"; sha256 = "1ahzckvc69wk2rx73sl40h0in1y7ny0vm0i7lbrrcggv1v36dwp3";
name = "plasma-integration-5.27.6.tar.xz"; name = "plasma-integration-5.27.7.tar.xz";
}; };
}; };
plasma-mobile = { plasma-mobile = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/plasma-mobile-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/plasma-mobile-5.27.7.tar.xz";
sha256 = "16djcga7ljq7zv979im8zd1l1fz7qfw9g2ya6kvdn9mf8li0l98j"; sha256 = "0f32xj9v32f89pdhwsmwm2xqfwcypq8r85jhj4zq887zxy1cgn0n";
name = "plasma-mobile-5.27.6.tar.xz"; name = "plasma-mobile-5.27.7.tar.xz";
}; };
}; };
plasma-nano = { plasma-nano = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/plasma-nano-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/plasma-nano-5.27.7.tar.xz";
sha256 = "02qig2zh6py0i5phcyjln0yawbd6sdx4cm13l2kgi3bl1826kklb"; sha256 = "14wc76bxnwd0z51gz4zb88p5h9n2711ifr1wpx9lrj9r7y1llank";
name = "plasma-nano-5.27.6.tar.xz"; name = "plasma-nano-5.27.7.tar.xz";
}; };
}; };
plasma-nm = { plasma-nm = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/plasma-nm-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/plasma-nm-5.27.7.tar.xz";
sha256 = "1jfrd3xi4hyivkwrif6s87f9jasrnsihd7c80sqhwd1k2kl9wr0a"; sha256 = "1w9zclih2mh8gqwahsmbbm0nrg1b6gcr5w2w02szlw30iq8k92j8";
name = "plasma-nm-5.27.6.tar.xz"; name = "plasma-nm-5.27.7.tar.xz";
}; };
}; };
plasma-pa = { plasma-pa = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/plasma-pa-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/plasma-pa-5.27.7.tar.xz";
sha256 = "0kvfhpsiv0nkilirjwsplx67m5zdqc5w6zmp9gkgyym46ax0hxjf"; sha256 = "1vg28v5n648y94m6amcwmr0n7dw4a2kfx16kny7jb9bkmxrgnwsc";
name = "plasma-pa-5.27.6.tar.xz"; name = "plasma-pa-5.27.7.tar.xz";
}; };
}; };
plasma-remotecontrollers = { plasma-remotecontrollers = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/plasma-remotecontrollers-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/plasma-remotecontrollers-5.27.7.tar.xz";
sha256 = "0ibngr1qy0vpdi6sx071225g354cdsag7j0gv3b6vrhq7s0z66b0"; sha256 = "0iswjkg93hf5vnvy5a4gpkc7p5d2d0b4nm74v2k9j23svipnzbah";
name = "plasma-remotecontrollers-5.27.6.tar.xz"; name = "plasma-remotecontrollers-5.27.7.tar.xz";
}; };
}; };
plasma-sdk = { plasma-sdk = {
version = "5.27.6.1"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/plasma-sdk-5.27.6.1.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/plasma-sdk-5.27.7.tar.xz";
sha256 = "1byfknk60j4hajy1ibh25dv96irkpl4b5hyrrdg39m6fdx30wjrf"; sha256 = "1jbd2y1hryif8a2s3x74xjgm9nrx5ln0bszn94igi4g9p8vsdq86";
name = "plasma-sdk-5.27.6.1.tar.xz"; name = "plasma-sdk-5.27.7.tar.xz";
}; };
}; };
plasma-systemmonitor = { plasma-systemmonitor = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/plasma-systemmonitor-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/plasma-systemmonitor-5.27.7.tar.xz";
sha256 = "07cwzcy7qd3b6rlyqjwhc2z567dn5j8gx701b57cs18z0rgv4vkr"; sha256 = "1qr8krc7d1hzxv0gx0ii0rxk9bm62rgh157mr8x785qqbd11nq8l";
name = "plasma-systemmonitor-5.27.6.tar.xz"; name = "plasma-systemmonitor-5.27.7.tar.xz";
}; };
}; };
plasma-thunderbolt = { plasma-thunderbolt = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/plasma-thunderbolt-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/plasma-thunderbolt-5.27.7.tar.xz";
sha256 = "1ikcbn9awh5zh9ivdm3ysi1dw208byj8d4ls5c9ckclvylkfx7v6"; sha256 = "0sgh5pafp9i0bhk7fhxc4fy20ldwidc1f5n4fcsya4aviy4cf2nn";
name = "plasma-thunderbolt-5.27.6.tar.xz"; name = "plasma-thunderbolt-5.27.7.tar.xz";
}; };
}; };
plasma-vault = { plasma-vault = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/plasma-vault-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/plasma-vault-5.27.7.tar.xz";
sha256 = "0wxa80m2ppjp8l8nchwcvrmx20j0rgm9ydn93x4w4d4rmi6mypr4"; sha256 = "1p5m5rlamb50cbd1qlx81m003sv8vdijkpy5airmy1pf6xmvl6hq";
name = "plasma-vault-5.27.6.tar.xz"; name = "plasma-vault-5.27.7.tar.xz";
}; };
}; };
plasma-welcome = { plasma-welcome = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/plasma-welcome-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/plasma-welcome-5.27.7.tar.xz";
sha256 = "0lvvxllhshawj7pjx3d9l53clcnr73x519khgf27fpblil1x0hm8"; sha256 = "0nz1hxz5nvgl3sbm6k3a76s0l3fy3j38i4plly2zhp5xqdk0ks1x";
name = "plasma-welcome-5.27.6.tar.xz"; name = "plasma-welcome-5.27.7.tar.xz";
}; };
}; };
plasma-workspace = { plasma-workspace = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/plasma-workspace-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/plasma-workspace-5.27.7.tar.xz";
sha256 = "10w8ix9c29gvykr9970aax7jcz2fi99cafr1kknvj2drgc7zgrhw"; sha256 = "0pyf5vc466mfgicxpp76igdz58lpa0n7x2cl2hhaq4zmrlfr8hh6";
name = "plasma-workspace-5.27.6.tar.xz"; name = "plasma-workspace-5.27.7.tar.xz";
}; };
}; };
plasma-workspace-wallpapers = { plasma-workspace-wallpapers = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/plasma-workspace-wallpapers-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/plasma-workspace-wallpapers-5.27.7.tar.xz";
sha256 = "018vvxhs0rlc25hd5kafhzk6anl1yabggby7b5vsqvip2rsma0qk"; sha256 = "181q0mmmp3dygzafgh4qq2pwi5w15vw6mwc21nkl98qf6z773ify";
name = "plasma-workspace-wallpapers-5.27.6.tar.xz"; name = "plasma-workspace-wallpapers-5.27.7.tar.xz";
}; };
}; };
plymouth-kcm = { plymouth-kcm = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/plymouth-kcm-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/plymouth-kcm-5.27.7.tar.xz";
sha256 = "03qkrdin7s4kx14f518f6amvgd5adavgirjy8mk1zj62mz4f1sy5"; sha256 = "1y7ahb0wir10isls65yp5p164kiw3jn8bf8zn9bkkjqp649av9sw";
name = "plymouth-kcm-5.27.6.tar.xz"; name = "plymouth-kcm-5.27.7.tar.xz";
}; };
}; };
polkit-kde-agent = { polkit-kde-agent = {
version = "1-5.27.6"; version = "1-5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/polkit-kde-agent-1-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/polkit-kde-agent-1-5.27.7.tar.xz";
sha256 = "0k7d9jz49fp4h7gxakqsmj16h5xdv8jw69068sz5mazzczi7lwyz"; sha256 = "0p6gnv59mnb5y6riiifyg98sk8zycchv8bkf7x1332qa7zqhcjcc";
name = "polkit-kde-agent-1-5.27.6.tar.xz"; name = "polkit-kde-agent-1-5.27.7.tar.xz";
}; };
}; };
powerdevil = { powerdevil = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/powerdevil-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/powerdevil-5.27.7.tar.xz";
sha256 = "1dbz479ikjy6fi3l701hvhkwhbll1gkibay3vzimb13kyamhy8vb"; sha256 = "151qhpf5j33jk3jhhxsr4zaf0z3f8xlnw8inmzf2a8lficiq9060";
name = "powerdevil-5.27.6.tar.xz"; name = "powerdevil-5.27.7.tar.xz";
}; };
}; };
qqc2-breeze-style = { qqc2-breeze-style = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/qqc2-breeze-style-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/qqc2-breeze-style-5.27.7.tar.xz";
sha256 = "02hxczlhyy2vwrsrw7hncmhcidany4xirlrw9caxsq4rylp7vszj"; sha256 = "0cjrjnj8iwjb9jxp28a30zxb56nhgslrbxzqy392b5sz2x5gbd04";
name = "qqc2-breeze-style-5.27.6.tar.xz"; name = "qqc2-breeze-style-5.27.7.tar.xz";
}; };
}; };
sddm-kcm = { sddm-kcm = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/sddm-kcm-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/sddm-kcm-5.27.7.tar.xz";
sha256 = "1qmmsvfs22byx5i48icgqh0cdh228yk40946yymacm39iwbsnw6w"; sha256 = "0hrw22ihrzph573lkwys6g5bnj72rwff1w1wjq0jzkcr3i8zai86";
name = "sddm-kcm-5.27.6.tar.xz"; name = "sddm-kcm-5.27.7.tar.xz";
}; };
}; };
systemsettings = { systemsettings = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/systemsettings-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/systemsettings-5.27.7.tar.xz";
sha256 = "17bqdsaih11wpcmv7qzk701l67431pf2nm8nnrix1s8k3qglfb5w"; sha256 = "0vkcmb4sch97sq5xd8rj8z42qdcxy5ys758q6dl69kbv9hadl7bw";
name = "systemsettings-5.27.6.tar.xz"; name = "systemsettings-5.27.7.tar.xz";
}; };
}; };
xdg-desktop-portal-kde = { xdg-desktop-portal-kde = {
version = "5.27.6"; version = "5.27.7";
src = fetchurl { src = fetchurl {
url = "${mirror}/stable/plasma/5.27.6/xdg-desktop-portal-kde-5.27.6.tar.xz"; url = "${mirror}/stable/plasma/5.27.7/xdg-desktop-portal-kde-5.27.7.tar.xz";
sha256 = "0wzp21l521d9z9mnfgiapzljqpg5qc5ghyzndpr8cz54c2bf9mdf"; sha256 = "1k88zr073qj96wfbj500mwn8fxj39pxscc6wqhsfjpa6ssxgknyc";
name = "xdg-desktop-portal-kde-5.27.6.tar.xz"; name = "xdg-desktop-portal-kde-5.27.7.tar.xz";
}; };
}; };
} }

4
pkgs/desktops/xfce/panel-plugins/xfce4-clipman-plugin/default.nix
View file

@ -3,8 +3,8 @@
mkXfceDerivation { mkXfceDerivation {
category = "panel-plugins"; category = "panel-plugins";
pname = "xfce4-clipman-plugin"; pname = "xfce4-clipman-plugin";
version = "1.6.3"; version = "1.6.4";
sha256 = "sha256-tnpQRYLV48NxKsWDjVSmypx6X1bVbx2U5Q8kQaP0AW8="; sha256 = "sha256-N/e97C6xWyF1GUg7gMN0Wcw35awypflMmA+Pdg6alEw=";
buildInputs = [ libXtst libxfce4ui xfce4-panel xfconf ]; buildInputs = [ libXtst libxfce4ui xfce4-panel xfconf ];

7
pkgs/development/compilers/circt/default.nix
View file

@ -13,12 +13,12 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "circt"; pname = "circt";
version = "1.45.0"; version = "1.48.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "llvm"; owner = "llvm";
repo = "circt"; repo = "circt";
rev = "firtool-${version}"; rev = "firtool-${version}";
sha256 = "sha256-yzXYiqRIwV3bkMfvmduow3QWJASXhOspM8CHZPN2/uE="; sha256 = "sha256-8mqh3PPfB50ZkiJ+1OjclWw19t6OLv1mNiVkBnDz5jQ=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -54,6 +54,9 @@ stdenv.mkDerivation rec {
preConfigure = '' preConfigure = ''
find ./test -name '*.mlir' -exec sed -i 's|/usr/bin/env|${coreutils}/bin/env|g' {} \; find ./test -name '*.mlir' -exec sed -i 's|/usr/bin/env|${coreutils}/bin/env|g' {} \;
# circt uses git to check its version, but when cloned on nix it can't access git.
# So this hard codes the version.
substituteInPlace cmake/modules/GenVersionFile.cmake --replace "unknown git version" "${src.rev}"
''; '';
installPhase = '' installPhase = ''

17
pkgs/development/compilers/zig/hook.nix Normal file
View file

@ -0,0 +1,17 @@
{ lib
, makeSetupHook
, zig
}:
makeSetupHook {
name = "zig-hook";
propagatedBuildInputs = [ zig ];
passthru = { inherit zig; };
meta = {
description = "A setup hook for using the Zig compiler in Nixpkgs";
inherit (zig.meta) maintainers platforms broken;
};
} ./setup-hook.sh

90
pkgs/development/compilers/zig/setup-hook.sh Normal file
View file

@ -0,0 +1,90 @@
# shellcheck shell=bash disable=SC2154,SC2086
# This readonly zigDefaultBuildFlagsArray below is meant to avoid CPU feature
# impurity in Nixpkgs. However, this flagset is "unstable": it is specifically
# meant to be controlled by the upstream development team - being up to that
# team exposing or not that flags to the outside (especially the package manager
# teams).
# Because of this hurdle, @andrewrk from Zig Software Foundation proposed some
# solutions for this issue. Hopefully they will be implemented in future
# releases of Zig. When this happens, this flagset should be revisited
# accordingly.
# Below are some useful links describing the discovery process of this 'bug' in
# Nixpkgs:
# https://github.com/NixOS/nixpkgs/issues/169461
# https://github.com/NixOS/nixpkgs/issues/185644
# https://github.com/NixOS/nixpkgs/pull/197046
# https://github.com/NixOS/nixpkgs/pull/241741#issuecomment-1624227485
# https://github.com/ziglang/zig/issues/14281#issuecomment-1624220653
readonly zigDefaultFlagsArray=("-Drelease-safe=true" "-Dcpu=baseline")
function zigSetGlobalCacheDir {
ZIG_GLOBAL_CACHE_DIR=$(mktemp -d)
export ZIG_GLOBAL_CACHE_DIR
}
function zigBuildPhase {
runHook preBuild
local flagsArray=(
"${zigDefaultFlagsArray[@]}"
$zigBuildFlags "${zigBuildFlagsArray[@]}"
)
echoCmd 'build flags' "${flagsArray[@]}"
zig build "${flagsArray[@]}"
runHook postBuild
}
function zigCheckPhase {
runHook preCheck
local flagsArray=(
"${zigDefaultFlagsArray[@]}"
$zigCheckFlags "${zigCheckFlagsArray[@]}"
)
echoCmd 'check flags' "${flagsArray[@]}"
zig build test "${flagsArray[@]}"
runHook postCheck
}
function zigInstallPhase {
runHook preInstall
local flagsArray=(
"${zigDefaultFlagsArray[@]}"
$zigBuildFlags "${zigBuildFlagsArray[@]}"
$zigInstallFlags "${zigInstallFlagsArray[@]}"
)
if [ -z "${dontAddPrefix-}" ]; then
# Zig does not recognize `--prefix=/dir/`, only `--prefix /dir/`
flagsArray+=("${prefixKey:---prefix}" "$prefix")
fi
echoCmd 'install flags' "${flagsArray[@]}"
zig build install "${flagsArray[@]}"
runHook postInstall
}
addEnvHooks "$targetOffset" zigSetGlobalCacheDir
if [ -z "${dontUseZigBuild-}" ] && [ -z "${buildPhase-}" ]; then
buildPhase=zigBuildPhase
fi
if [ -z "${dontUseZigCheck-}" ] && [ -z "${checkPhase-}" ]; then
checkPhase=zigCheckPhase
fi
if [ -z "${dontUseZigInstall-}" ] && [ -z "${installPhase-}" ]; then
installPhase=zigInstallPhase
fi

5
pkgs/development/libraries/botan/generic.nix
View file

@ -29,12 +29,13 @@ stdenv.mkDerivation rec {
patches = extraPatches; patches = extraPatches;
inherit postPatch; inherit postPatch;
buildInputs = [ python3 bzip2 zlib gmp boost ] nativeBuildInputs = [ python3 ];
buildInputs = [ bzip2 zlib gmp boost ]
++ lib.optionals stdenv.isDarwin [ CoreServices Security ]; ++ lib.optionals stdenv.isDarwin [ CoreServices Security ];
configurePhase = '' configurePhase = ''
runHook preConfigure runHook preConfigure
python configure.py --prefix=$out --with-bzip2 --with-zlib ${extraConfigureFlags}${lib.optionalString stdenv.cc.isClang " --cc=clang"} python configure.py --prefix=$out --with-bzip2 --with-zlib ${extraConfigureFlags}${lib.optionalString stdenv.cc.isClang " --cc=clang"} ${lib.optionalString stdenv.hostPlatform.isAarch64 " --cpu=aarch64"}
runHook postConfigure runHook postConfigure
''; '';

6
pkgs/development/libraries/ffmpeg/generic.nix
View file

@ -34,7 +34,7 @@
, withCaca ? withFullDeps # Textual display (ASCII art) , withCaca ? withFullDeps # Textual display (ASCII art)
, withCelt ? withFullDeps # CELT decoder , withCelt ? withFullDeps # CELT decoder
, withCrystalhd ? withFullDeps , withCrystalhd ? withFullDeps
, withCuda ? withFullDeps && (with stdenv; (!isDarwin && !hostPlatform.isAarch)) , withCuda ? withFullDeps && (with stdenv; (!isDarwin && !hostPlatform.isAarch && !hostPlatform.isRiscV))
, withCudaLLVM ? withFullDeps , withCudaLLVM ? withFullDeps
, withDav1d ? withHeadlessDeps # AV1 decoder (focused on speed and correctness) , withDav1d ? withHeadlessDeps # AV1 decoder (focused on speed and correctness)
, withDc1394 ? withFullDeps && !stdenv.isDarwin # IIDC-1394 grabbing (ieee 1394) , withDc1394 ? withFullDeps && !stdenv.isDarwin # IIDC-1394 grabbing (ieee 1394)
@ -58,8 +58,8 @@
, withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support , withModplug ? withFullDeps && !stdenv.isDarwin # ModPlug support
, withMp3lame ? withHeadlessDeps # LAME MP3 encoder , withMp3lame ? withHeadlessDeps # LAME MP3 encoder
, withMysofa ? withFullDeps # HRTF support via SOFAlizer , withMysofa ? withFullDeps # HRTF support via SOFAlizer
, withNvdec ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.isAarch32 , withNvdec ? withHeadlessDeps && (with stdenv; !isDarwin && hostPlatform == buildPlatform && !isAarch32 && !hostPlatform.isRiscV)
, withNvenc ? withHeadlessDeps && !stdenv.isDarwin && stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.isAarch32 , withNvenc ? withHeadlessDeps && (with stdenv; !isDarwin && hostPlatform == buildPlatform && !isAarch32 && !hostPlatform.isRiscV)
, withOgg ? withHeadlessDeps # Ogg container used by vorbis & theora , withOgg ? withHeadlessDeps # Ogg container used by vorbis & theora
, withOpenal ? withFullDeps # OpenAL 1.1 capture support , withOpenal ? withFullDeps # OpenAL 1.1 capture support
, withOpencl ? withFullDeps , withOpencl ? withFullDeps

17
pkgs/development/libraries/science/astronomy/indilib/default.nix
View file

@ -12,17 +12,18 @@
, libjpeg , libjpeg
, gsl , gsl
, fftw , fftw
, gtest
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "indilib"; pname = "indilib";
version = "1.9.8"; version = "2.0.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "indilib"; owner = "indilib";
repo = "indi"; repo = "indi";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-+KFuZgM/Bl6Oezq3WXjWCHefc1wvR3wOKXejmT0pw1U="; hash = "sha256-GoEvWzGT3Ckv9Syif6Z2kAlnvg/Kt5I8SpGFG9kFTJo=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
@ -45,14 +46,24 @@ stdenv.mkDerivation rec {
cmakeFlags = [ cmakeFlags = [
"-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_LIBDIR=lib"
"-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d" "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d"
] ++ lib.optional doCheck [
"-DINDI_BUILD_UNITTESTS=ON"
"-DINDI_BUILD_INTEGTESTS=ON"
]; ];
checkInputs = [ gtest ];
doCheck = true;
# Socket address collisions between tests
enableParallelChecking = false;
meta = with lib; { meta = with lib; {
homepage = "https://www.indilib.org/"; homepage = "https://www.indilib.org/";
description = "Implementation of the INDI protocol for POSIX operating systems"; description = "Implementation of the INDI protocol for POSIX operating systems";
changelog = "https://github.com/indilib/indi/releases/tag/v${version}"; changelog = "https://github.com/indilib/indi/releases/tag/v${version}";
license = licenses.lgpl2Plus; license = licenses.lgpl2Plus;
maintainers = with maintainers; [ hjones2199 ]; maintainers = with maintainers; [ hjones2199 sheepforce ];
platforms = platforms.unix; platforms = platforms.unix;
}; };
} }

18
pkgs/development/libraries/science/astronomy/indilib/indi-3rdparty.nix
View file

@ -17,6 +17,7 @@
, libdc1394 , libdc1394
, gpsd , gpsd
, ffmpeg , ffmpeg
, limesuite
, version , version
, src , src
, withFirmware ? false , withFirmware ? false
@ -33,22 +34,22 @@ stdenv.mkDerivation rec {
buildInputs = [ buildInputs = [
indilib libnova curl cfitsio libusb1 zlib boost gsl gpsd indilib libnova curl cfitsio libusb1 zlib boost gsl gpsd
libjpeg libgphoto2 libraw libftdi1 libdc1394 ffmpeg fftw libjpeg libgphoto2 libraw libftdi1 libdc1394 ffmpeg fftw
limesuite
] ++ lib.optionals withFirmware [ ] ++ lib.optionals withFirmware [
firmware firmware
]; ];
postPatch = '' postPatch = ''
for f in indi-qsi/CMakeLists.txt \ for f in $(find . -name "CMakeLists.txt"); do
indi-dsi/CMakeLists.txt \
indi-armadillo-platypus/CMakeLists.txt \
indi-orion-ssg3/CMakeLists.txt
do
substituteInPlace $f \ substituteInPlace $f \
--replace "/lib/udev/rules.d" "lib/udev/rules.d" \ --replace "/lib/udev/rules.d" "lib/udev/rules.d" \
--replace "/etc/udev/rules.d" "lib/udev/rules.d" \ --replace "/etc/udev/rules.d" "lib/udev/rules.d" \
--replace "/lib/firmware" "lib/firmware" --replace "/lib/firmware" "lib/firmware"
done done
substituteInPlace libpktriggercord/CMakeLists.txt \
--replace "set (PK_DATADIR /usr/share/pktriggercord)" "set (PK_DATADIR $out/share/pkgtriggercord)"
sed '1i#include <ctime>' -i indi-duino/libfirmata/src/firmata.cpp # gcc12 sed '1i#include <ctime>' -i indi-duino/libfirmata/src/firmata.cpp # gcc12
''; '';
@ -57,11 +58,8 @@ stdenv.mkDerivation rec {
"-DCMAKE_INSTALL_LIBDIR=lib" "-DCMAKE_INSTALL_LIBDIR=lib"
"-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d" "-DUDEVRULES_INSTALL_DIR=lib/udev/rules.d"
"-DRULES_INSTALL_DIR=lib/udev/rules.d" "-DRULES_INSTALL_DIR=lib/udev/rules.d"
# Pentax, Atik, and SX cmakelists are currently broken
"-DWITH_PENTAX=off"
"-DWITH_ATIK=off"
"-DWITH_SX=off"
] ++ lib.optionals (!withFirmware) [ ] ++ lib.optionals (!withFirmware) [
"-DWITH_ATIK=off"
"-DWITH_APOGEE=off" "-DWITH_APOGEE=off"
"-DWITH_DSI=off" "-DWITH_DSI=off"
"-DWITH_QHY=off" "-DWITH_QHY=off"
@ -75,7 +73,7 @@ stdenv.mkDerivation rec {
description = "Third party drivers for the INDI astronomical software suite"; description = "Third party drivers for the INDI astronomical software suite";
changelog = "https://github.com/indilib/indi-3rdparty/releases/tag/v${version}"; changelog = "https://github.com/indilib/indi-3rdparty/releases/tag/v${version}";
license = licenses.lgpl2Plus; license = licenses.lgpl2Plus;
maintainers = with maintainers; [ hjones2199 ]; maintainers = with maintainers; [ hjones2199 sheepforce ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

5
pkgs/development/libraries/science/astronomy/indilib/indi-firmware.nix
View file

@ -19,6 +19,7 @@
, ffmpeg , ffmpeg
, version , version
, src , src
, autoPatchelfHook
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
@ -26,7 +27,7 @@ stdenv.mkDerivation rec {
inherit version src; inherit version src;
nativeBuildInputs = [ cmake ]; nativeBuildInputs = [ cmake autoPatchelfHook ];
buildInputs = [ buildInputs = [
indilib libnova curl cfitsio libusb1 zlib boost gsl gpsd indilib libnova curl cfitsio libusb1 zlib boost gsl gpsd
@ -60,7 +61,7 @@ stdenv.mkDerivation rec {
description = "Third party firmware for the INDI astronomical software suite"; description = "Third party firmware for the INDI astronomical software suite";
changelog = "https://github.com/indilib/indi-3rdparty/releases/tag/v${version}"; changelog = "https://github.com/indilib/indi-3rdparty/releases/tag/v${version}";
license = licenses.lgpl2Plus; license = licenses.lgpl2Plus;
maintainers = with maintainers; [ hjones2199 ]; maintainers = with maintainers; [ hjones2199 sheepforce ];
platforms = platforms.linux; platforms = platforms.linux;
}; };
} }

19
pkgs/development/libraries/science/astronomy/indilib/indi-full.nix
View file

@ -1,30 +1,29 @@
{ stdenv, lib, callPackage, fetchFromGitHub, indilib }: { stdenv, lib, callPackage, fetchFromGitHub, indilib }:
let let
indi-version = "1.9.8"; inherit (indilib) version;
indi-3rdparty-src = fetchFromGitHub { indi-3rdparty-src = fetchFromGitHub {
owner = "indilib"; owner = "indilib";
repo = "indi-3rdparty"; repo = "indi-3rdparty";
rev = "v${indi-version}"; rev = "v${version}";
sha256 = "sha256-ZFbMyjMvAWcdsl+1TyX5/v5nY1DqvhZ2ckFBDe8gdQg="; hash = "sha256-xAGSFTOfO9P8JldzY59OnQULzf2Mlx3vWjoP+IDdEFE=";
}; };
indi-firmware = callPackage ./indi-firmware.nix { indi-firmware = callPackage ./indi-firmware.nix {
version = indi-version; inherit version;
src = indi-3rdparty-src; src = indi-3rdparty-src;
}; };
indi-3rdparty = callPackage ./indi-3rdparty.nix { indi-3rdparty = callPackage ./indi-3rdparty.nix {
version = indi-version; inherit version;
src = indi-3rdparty-src; src = indi-3rdparty-src;
withFirmware = stdenv.isx86_64; withFirmware = stdenv.isx86_64 || stdenv.isAarch64;
firmware = indi-firmware; firmware = indi-firmware;
}; };
in in
callPackage ./indi-with-drivers.nix { callPackage ./indi-with-drivers.nix {
pname = "indi-full"; pname = "indi-full";
version = indi-version; inherit version;
extraDrivers = [ extraDrivers = [
indi-3rdparty indi-3rdparty
] ++ lib.optionals stdenv.isx86_64 [ ] ++ lib.optional (stdenv.isx86_64 || stdenv.isAarch64) indi-firmware
indi-firmware ;
];
} }

35
pkgs/development/python-modules/accelerate/default.nix
View file

@ -2,6 +2,8 @@
, lib , lib
, buildPythonPackage , buildPythonPackage
, fetchFromGitHub , fetchFromGitHub
, fetchpatch
, pythonAtLeast
, pythonOlder , pythonOlder
, pytestCheckHook , pytestCheckHook
, setuptools , setuptools
@ -17,7 +19,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "accelerate"; pname = "accelerate";
version = "0.19.0"; version = "0.21.0";
format = "pyproject"; format = "pyproject";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -25,9 +27,18 @@ buildPythonPackage rec {
owner = "huggingface"; owner = "huggingface";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-gW4wCpkyxoWfxXu8UHZfgopSQhOoPhGgqEqFiHJ+Db4="; hash = "sha256-BwM3gyNhsRkxtxLNrycUGwBmXf8eq/7b56/ykMryt5w=";
}; };
patches = [
# fix import error when torch>=2.0.1 and torch.distributed is disabled
# https://github.com/huggingface/accelerate/pull/1800
(fetchpatch {
url = "https://github.com/huggingface/accelerate/commit/32701039d302d3875c50c35ab3e76c467755eae9.patch";
hash = "sha256-Hth7qyOfx1sC8UaRdbYTnyRXD/VRKf41GtLc0ee1t2I=";
})
];
nativeBuildInputs = [ setuptools ]; nativeBuildInputs = [ setuptools ];
propagatedBuildInputs = [ propagatedBuildInputs = [
@ -53,15 +64,25 @@ buildPythonPackage rec {
# try to download data: # try to download data:
"FeatureExamplesTests" "FeatureExamplesTests"
"test_infer_auto_device_map_on_t0pp" "test_infer_auto_device_map_on_t0pp"
# known failure with Torch>2.0; see https://github.com/huggingface/accelerate/pull/1339:
# (remove for next release)
"test_gradient_sync_cpu_multi"
] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [ ] ++ lib.optionals (stdenv.isLinux && stdenv.isAarch64) [
# usual aarch64-linux RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly # usual aarch64-linux RuntimeError: DataLoader worker (pid(s) <...>) exited unexpectedly
"CheckpointTest" "CheckpointTest"
] ++ lib.optionals (stdenv.isDarwin && stdenv.isx86_64) [
# RuntimeError: torch_shm_manager: execl failed: Permission denied
"CheckpointTest"
] ++ lib.optionals (pythonAtLeast "3.11") [
# python3.11 not yet supported for torch.compile
"test_dynamo_extract_model"
]; ];
# numerous instances of torch.multiprocessing.spawn.ProcessRaisedException:
doCheck = !stdenv.isDarwin; disabledTestPaths = lib.optionals (!(stdenv.isLinux && stdenv.isx86_64)) [
# numerous instances of torch.multiprocessing.spawn.ProcessRaisedException:
"tests/test_cpu.py"
"tests/test_grad_sync.py"
"tests/test_metrics.py"
"tests/test_scheduler.py"
];
pythonImportsCheck = [ pythonImportsCheck = [
"accelerate" "accelerate"
]; ];

4
pkgs/development/python-modules/async-lru/default.nix
View file

@ -9,7 +9,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "async-lru"; pname = "async-lru";
version = "2.0.3"; version = "2.0.4";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -19,7 +19,7 @@ buildPythonPackage rec {
owner = "aio-libs"; owner = "aio-libs";
repo = "async-lru"; repo = "async-lru";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-5NlcufnCqcB8k8nscFJGwlpEbDJG5KAEwWBat5dvI84="; hash = "sha256-S2sOkgtS+YdMtVP7UHD3+oR8Fem8roLhhgVVfh33PcM=";
}; };
propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [ propagatedBuildInputs = lib.optionals (pythonOlder "3.11") [

4
pkgs/development/python-modules/subarulink/default.nix
View file

@ -11,7 +11,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "subarulink"; pname = "subarulink";
version = "0.7.6-1"; version = "0.7.7";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.7"; disabled = pythonOlder "3.7";
@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "G-Two"; owner = "G-Two";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-/VaGiOnPyTHSwkxlQtwyIZohD3QK897kapmM3S8bHtM="; hash = "sha256-SrOFKXh/wG2+HKaLvyNP6/Le9R3Ri7+/xsUBAazo7js=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

11
pkgs/development/python-modules/transformers/default.nix
View file

@ -51,7 +51,7 @@
buildPythonPackage rec { buildPythonPackage rec {
pname = "transformers"; pname = "transformers";
version = "4.30.2"; version = "4.31.0";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.8"; disabled = pythonOlder "3.8";
@ -60,14 +60,13 @@ buildPythonPackage rec {
owner = "huggingface"; owner = "huggingface";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-S1jQsBObKGZY9tlbcNcgchwUs/eeaohYxOtbN1cPa2Q="; hash = "sha256-YbLI/CkRto8G4bV7ijUkB/0cc7LkfNBQxL1iNv8aWW4=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [
filelock filelock
huggingface-hub huggingface-hub
numpy numpy
protobuf
packaging packaging
pyyaml pyyaml
regex regex
@ -91,8 +90,11 @@ buildPythonPackage rec {
ja = [ ja = [
# fugashi # fugashi
# ipadic # ipadic
# unidic_lite # rhoknp
# sudachidict_core
# sudachipy
# unidic # unidic
# unidic_lite
]; ];
sklearn = [ sklearn = [
scikit-learn scikit-learn
@ -122,6 +124,7 @@ buildPythonPackage rec {
onnxconverter-common onnxconverter-common
tf2onnx tf2onnx
onnxruntime onnxruntime
onnxruntime-tools
]; ];
modelcreation = [ modelcreation = [
cookiecutter cookiecutter

5
pkgs/development/tools/continuous-integration/woodpecker/agent.nix
View file

@ -1,11 +1,10 @@
{ lib, buildGoModule, callPackage, fetchFromGitHub }: { buildGoModule, callPackage }:
let let
common = callPackage ./common.nix { }; common = callPackage ./common.nix { };
in in
buildGoModule { buildGoModule {
pname = "woodpecker-agent"; pname = "woodpecker-agent";
inherit (common) version src ldflags postBuild; inherit (common) version src ldflags postInstall vendorHash;
vendorSha256 = null;
subPackages = "cmd/agent"; subPackages = "cmd/agent";

5
pkgs/development/tools/continuous-integration/woodpecker/cli.nix
View file

@ -1,11 +1,10 @@
{ lib, buildGoModule, callPackage, fetchFromGitHub }: { buildGoModule, callPackage }:
let let
common = callPackage ./common.nix { }; common = callPackage ./common.nix { };
in in
buildGoModule { buildGoModule {
pname = "woodpecker-cli"; pname = "woodpecker-cli";
inherit (common) version src ldflags postBuild; inherit (common) version src ldflags postInstall vendorHash;
vendorSha256 = null;
subPackages = "cmd/cli"; subPackages = "cmd/cli";

13
pkgs/development/tools/continuous-integration/woodpecker/common.nix
View file

@ -1,11 +1,12 @@
{ lib, fetchFromGitHub }: { lib, fetchFromGitHub }:
let let
version = "0.15.11"; version = "1.0.0";
srcHash = "sha256-iDcEkaR1ZvH7Q68sxbwOiP1WKbkiDhCOtkuipbjXHKM="; srcHash = "sha256-1HSSHR3myn1x75kO/70w1p21a7dHwFiC7iAH/KRoYsE=";
yarnHash = "sha256-PY0BIBbjyi2DG+n5x/IPc0AwrFSwII4huMDU+FeZ/Sc="; vendorHash = "sha256-UFTK3EK8eYB3/iKxycCIkSHdLsKGnDkYCpoFJSajm5M=";
yarnHash = "sha256-QNeQwWU36A05zaARWmqEOhfyZRW68OgF4wTonQLYQfs=";
in in
{ {
inherit version yarnHash; inherit version yarnHash vendorHash;
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "woodpecker-ci"; owner = "woodpecker-ci";
@ -14,8 +15,8 @@ in
hash = srcHash; hash = srcHash;
}; };
postBuild = '' postInstall = ''
cd $GOPATH/bin cd $out/bin
for f in *; do for f in *; do
mv -- "$f" "woodpecker-$f" mv -- "$f" "woodpecker-$f"
done done

23
pkgs/development/tools/continuous-integration/woodpecker/frontend.nix
View file

@ -1,6 +1,19 @@
{ lib, callPackage, fetchFromGitHub, fetchYarnDeps, mkYarnPackage }: { lib, buildPackages, callPackage, fetchFromGitHub, fetchYarnDeps, mkYarnPackage }:
let let
common = callPackage ./common.nix { }; common = callPackage ./common.nix { };
esbuild_0_17_19 = buildPackages.esbuild.overrideAttrs (_: rec {
version = "0.17.19";
src = fetchFromGitHub {
owner = "evanw";
repo = "esbuild";
rev = "v${version}";
hash = "sha256-PLC7OJLSOiDq4OjvrdfCawZPfbfuZix4Waopzrj8qsU=";
};
vendorHash = "sha256-+BfxCyg0KkDQpHt/wycy/8CTG6YBA/VJvJFhhzUnSiQ=";
});
in in
mkYarnPackage { mkYarnPackage {
pname = "woodpecker-frontend"; pname = "woodpecker-frontend";
@ -9,15 +22,19 @@ mkYarnPackage {
src = "${common.src}/web"; src = "${common.src}/web";
packageJSON = ./woodpecker-package.json; packageJSON = ./woodpecker-package.json;
yarnLock = ./yarn.lock;
offlineCache = fetchYarnDeps { offlineCache = fetchYarnDeps {
yarnLock = "${common.src}/web/yarn.lock"; yarnLock = ./yarn.lock;
hash = common.yarnHash; hash = common.yarnHash;
}; };
ESBUILD_BINARY_PATH = lib.getExe esbuild_0_17_19;
buildPhase = '' buildPhase = ''
runHook preBuild runHook preBuild
yarn build yarn --offline build
runHook postBuild runHook postBuild
''; '';

5
pkgs/development/tools/continuous-integration/woodpecker/server.nix
View file

@ -1,11 +1,10 @@
{ lib, buildGoModule, callPackage, fetchFromGitHub, woodpecker-frontend }: { buildGoModule, callPackage, woodpecker-frontend }:
let let
common = callPackage ./common.nix { }; common = callPackage ./common.nix { };
in in
buildGoModule { buildGoModule {
pname = "woodpecker-server"; pname = "woodpecker-server";
inherit (common) version src ldflags postBuild; inherit (common) version src ldflags postInstall vendorHash;
vendorSha256 = null;
postPatch = '' postPatch = ''
cp -r ${woodpecker-frontend} web/dist cp -r ${woodpecker-frontend} web/dist

16
pkgs/development/tools/continuous-integration/woodpecker/update.sh
View file

@ -1,5 +1,5 @@
#!/usr/bin/env nix-shell #!/usr/bin/env nix-shell
#!nix-shell -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq #!nix-shell -i bash -p nix wget prefetch-yarn-deps nix-prefetch-github jq nix-prefetch pnpm-lock-export
# shellcheck shell=bash # shellcheck shell=bash
@ -30,20 +30,24 @@ version="${version#v}"
# Woodpecker repository # Woodpecker repository
src_hash=$(nix-prefetch-github woodpecker-ci woodpecker --rev "v${version}" | jq -r .hash) src_hash=$(nix-prefetch-github woodpecker-ci woodpecker --rev "v${version}" | jq -r .hash)
# Go modules
vendorHash=$(nix-prefetch '{ sha256 }: (callPackage (import ./cli.nix) { }).goModules.overrideAttrs (_: { modHash = sha256; })')
# Front-end dependencies # Front-end dependencies
woodpecker_src="https://raw.githubusercontent.com/woodpecker-ci/woodpecker/v$version" woodpecker_src="https://raw.githubusercontent.com/woodpecker-ci/woodpecker/v$version"
wget "${TOKEN_ARGS[@]}" "$woodpecker_src/web/package.json" -O woodpecker-package.json wget "${TOKEN_ARGS[@]}" "$woodpecker_src/web/package.json" -O woodpecker-package.json
web_tmpdir=$(mktemp -d) trap 'rm -rf pnpm-lock.yaml' EXIT
trap 'rm -rf "$web_tmpdir"' EXIT wget "${TOKEN_ARGS[@]}" "$woodpecker_src/web/pnpm-lock.yaml"
pushd "$web_tmpdir" pnpm-lock-export --schema yarn.lock@v1
wget "${TOKEN_ARGS[@]}" "$woodpecker_src/web/yarn.lock"
yarn_hash=$(prefetch-yarn-deps yarn.lock) yarn_hash=$(prefetch-yarn-deps yarn.lock)
popd
# Use friendlier hashes # Use friendlier hashes
src_hash=$(nix hash to-sri --type sha256 "$src_hash")
vendorHash=$(nix hash to-sri --type sha256 "$vendorHash")
yarn_hash=$(nix hash to-sri --type sha256 "$yarn_hash") yarn_hash=$(nix hash to-sri --type sha256 "$yarn_hash")
sed -i -E -e "s#version = \".*\"#version = \"$version\"#" common.nix sed -i -E -e "s#version = \".*\"#version = \"$version\"#" common.nix
sed -i -E -e "s#srcHash = \".*\"#srcHash = \"$src_hash\"#" common.nix sed -i -E -e "s#srcHash = \".*\"#srcHash = \"$src_hash\"#" common.nix
sed -i -E -e "s#vendorHash = \".*\"#vendorHash = \"$vendorHash\"#" common.nix
sed -i -E -e "s#yarnHash = \".*\"#yarnHash = \"$yarn_hash\"#" common.nix sed -i -E -e "s#yarnHash = \".*\"#yarnHash = \"$yarn_hash\"#" common.nix

92
pkgs/development/tools/continuous-integration/woodpecker/woodpecker-package.json
View file

@ -17,46 +17,60 @@
"test": "echo 'No tests configured' && exit 0" "test": "echo 'No tests configured' && exit 0"
}, },
"dependencies": { "dependencies": {
"@kyvg/vue3-notification": "2.3.4", "@intlify/unplugin-vue-i18n": "^0.10.1",
"ansi-to-html": "0.7.2", "@kyvg/vue3-notification": "^2.9.1",
"dayjs": "1.10.7", "@vueuse/core": "^9.13.0",
"floating-vue": "2.0.0-beta.5", "ansi_up": "^5.2.1",
"fuse.js": "6.4.6", "dayjs": "^1.11.9",
"humanize-duration": "3.27.0", "floating-vue": "^2.0.0-beta.24",
"javascript-time-ago": "2.3.10", "fuse.js": "^6.6.2",
"node-emoji": "1.11.0", "humanize-duration": "^3.28.0",
"pinia": "2.0.0", "javascript-time-ago": "^2.5.9",
"vue": "v3.2.20", "lodash": "^4.17.21",
"vue-router": "4.0.10" "node-emoji": "^1.11.0",
"pinia": "^2.1.4",
"prismjs": "^1.29.0",
"vue": "^3.3.4",
"vue-i18n": "^9.2.2",
"vue-router": "^4.2.2"
}, },
"devDependencies": { "devDependencies": {
"@iconify/json": "1.1.421", "@iconify/json": "^2.2.85",
"@types/humanize-duration": "3.27.0", "@types/humanize-duration": "^3.27.1",
"@types/javascript-time-ago": "2.0.3", "@types/javascript-time-ago": "^2.0.3",
"@types/node": "16.11.6", "@types/lodash": "^4.14.195",
"@types/node-emoji": "1.8.1", "@types/node": "^18.16.19",
"@typescript-eslint/eslint-plugin": "5.6.0", "@types/node-emoji": "^1.8.2",
"@typescript-eslint/parser": "5.6.0", "@types/prismjs": "^1.26.0",
"@vitejs/plugin-vue": "1.9.4", "@typescript-eslint/eslint-plugin": "^5.60.1",
"@vue/compiler-sfc": "3.2.20", "@typescript-eslint/parser": "^5.60.1",
"eslint": "7.32.0", "@vitejs/plugin-vue": "^4.2.3",
"eslint-config-airbnb-base": "15.0.0", "@vue/compiler-sfc": "^3.3.4",
"eslint-config-airbnb-typescript": "16.1.0", "eslint": "^8.44.0",
"eslint-config-prettier": "8.3.0", "eslint-config-airbnb-base": "^15.0.0",
"eslint-plugin-import": "2.25.3", "eslint-config-airbnb-typescript": "^17.0.0",
"eslint-plugin-prettier": "4.0.0", "eslint-config-prettier": "^8.8.0",
"eslint-plugin-promise": "5.1.1", "eslint-plugin-import": "^2.27.5",
"eslint-plugin-simple-import-sort": "7.0.0", "eslint-plugin-prettier": "^4.2.1",
"eslint-plugin-vue": "7.18.0", "eslint-plugin-promise": "^6.1.1",
"eslint-plugin-vue-scoped-css": "1.3.0", "eslint-plugin-simple-import-sort": "^10.0.0",
"prettier": "2.4.1", "eslint-plugin-vue": "^9.15.1",
"typescript": "4.4.4", "eslint-plugin-vue-scoped-css": "^2.5.0",
"unplugin-icons": "0.12.17", "prettier": "^2.8.8",
"unplugin-vue-components": "0.17.0", "typescript": "5.0.3",
"vite": "2.9.13", "unplugin-icons": "^0.16.3",
"vite-plugin-windicss": "1.4.12", "unplugin-vue-components": "^0.24.1",
"vite-svg-loader": "3.0.0", "vite": "^4.3.9",
"vue-tsc": "0.28.10", "vite-plugin-prismjs": "^0.0.8",
"windicss": "3.2.0" "vite-plugin-windicss": "^1.9.0",
"vite-svg-loader": "^4.0.0",
"vue-eslint-parser": "^9.3.1",
"vue-tsc": "^1.8.3",
"windicss": "^3.5.6"
},
"pnpm": {
"overrides": {
"semver@<7.5.2": ">=7.5.2"
}
} }
} }

3219
pkgs/development/tools/continuous-integration/woodpecker/yarn.lock Normal file
View file

File diff suppressed because it is too large Load diff

29
pkgs/development/tools/ldid-procursus/default.nix Normal file
View file

@ -0,0 +1,29 @@
{ lib
, stdenv
, fetchFromGitHub
, pkg-config
, libplist
, openssl
}:
stdenv.mkDerivation (finalAttrs: {
pname = "ldid-procursus";
version = "2.1.5-procursus7";
src = fetchFromGitHub {
owner = "ProcursusTeam";
repo = "ldid";
rev = "v${finalAttrs.version}";
hash = "sha256-QnSmWY9zCOPYAn2VHc5H+VQXjTCyr0EuosxvKGGpDtQ=";
};
nativeBuildInputs = [ pkg-config libplist openssl ];
stripDebugFlags = [ "--strip-unneeded" ];
makeFlags = [ "PREFIX=${placeholder "out"}" ];
meta = with lib; {
description = "Put real or fake signatures in a Mach-O binary";
homepage = "https://github.com/ProcursusTeam/ldid";
maintainers = with maintainers; [ keto ];
platforms = platforms.unix;
license = licenses.agpl3Only;
};
})

25
pkgs/development/tools/rubyfmt/0001-cargo-lock-update-version.patch Normal file
View file

@ -0,0 +1,25 @@
From d9df7aaaaf9c758499f569376a041045d99e4015 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Thu, 9 Feb 2023 16:17:46 +0100
Subject: [PATCH 1/2] cargo: lock: update version
---
Cargo.lock | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Cargo.lock b/Cargo.lock
index 79a81d1..374c10a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -642,7 +642,7 @@ dependencies = [
[[package]]
name = "rubyfmt-main"
-version = "0.8.0-pre"
+version = "0.8.1"
dependencies = [
"atty",
"clap",
--
2.39.1

62
pkgs/development/tools/rubyfmt/0002-remove-dependency-on-git.patch Normal file
View file

@ -0,0 +1,62 @@
From 3bbc396c4ddc8a5e26f7776155bb366c8d47c440 Mon Sep 17 00:00:00 2001
From: Bob van der Linden <bobvanderlinden@gmail.com>
Date: Thu, 9 Feb 2023 16:55:00 +0100
Subject: [PATCH 2/2] remove dependency on git
---
librubyfmt/build.rs | 35 +++--------------------------------
1 file changed, 3 insertions(+), 32 deletions(-)
diff --git a/librubyfmt/build.rs b/librubyfmt/build.rs
index ef94c09..4668785 100644
--- a/librubyfmt/build.rs
+++ b/librubyfmt/build.rs
@@ -26,27 +26,9 @@ fn main() -> Output {
let path = std::env::current_dir()?;
let ruby_checkout_path = path.join("ruby_checkout");
- let old_checkout_sha = if ruby_checkout_path.join(ripper).exists() {
- Some(get_ruby_checkout_sha())
- } else {
- None
- };
-
- let _ = Command::new("git")
- .args(&["submodule", "update", "--init"])
- .status();
-
- let new_checkout_sha = get_ruby_checkout_sha();
-
- // Only rerun this build if the ruby_checkout has changed
- match old_checkout_sha {
- Some(old_sha) if old_sha == new_checkout_sha => {}
- _ => {
- make_configure(&ruby_checkout_path)?;
- run_configure(&ruby_checkout_path)?;
- build_ruby(&ruby_checkout_path)?;
- }
- }
+ make_configure(&ruby_checkout_path)?;
+ run_configure(&ruby_checkout_path)?;
+ build_ruby(&ruby_checkout_path)?;
cc::Build::new()
.file("src/rubyfmt.c")
@@ -152,14 +134,3 @@ fn check_process_success(command: &str, code: ExitStatus) -> Output {
}
}
-fn get_ruby_checkout_sha() -> String {
- String::from_utf8(
- Command::new("git")
- .args(&["rev-parse", "HEAD"])
- .current_dir("./ruby_checkout")
- .output()
- .expect("git rev-parse shouldn't fail")
- .stdout,
- )
- .expect("output should be valid utf8")
-}
--
2.39.1

78
pkgs/development/tools/rubyfmt/default.nix Normal file
View file

@ -0,0 +1,78 @@
{ lib
, stdenv
, rustPlatform
, fetchFromGitHub
, autoconf
, automake
, bison
, ruby
, zlib
, readline
, libiconv
, libobjc
, libunwind
, libxcrypt
, Foundation
, Security
}:
rustPlatform.buildRustPackage rec {
pname = "rubyfmt";
version = "0.8.1";
src = fetchFromGitHub {
owner = "fables-tales";
repo = "rubyfmt";
rev = "v${version}";
hash = "sha256-lHq9lcLMp6HUHMonEe3T2YGwMYW1W131H1jo1cy6kyc=";
fetchSubmodules = true;
};
nativeBuildInputs = [
autoconf
automake
bison
ruby
];
buildInputs = [
zlib
libxcrypt
] ++ lib.optionals stdenv.isDarwin [
readline
libiconv
libobjc
libunwind
Foundation
Security
];
preConfigure = ''
pushd librubyfmt/ruby_checkout
autoreconf --install --force --verbose
./configure
popd
'';
cargoPatches = [
# The 0.8.1 release did not have an up-to-date lock file. The rubyfmt
# version in Cargo.toml was bumped, but it wasn't updated in the lock file.
./0001-cargo-lock-update-version.patch
# Avoid checking whether ruby gitsubmodule is up-to-date.
./0002-remove-dependency-on-git.patch
];
cargoHash = "sha256-keeIonGNgE0U0IVi8DeXAy6ygTXVXH+WDjob36epUDI=";
preFixup = ''
mv $out/bin/rubyfmt{-main,}
'';
meta = with lib; {
description = "A Ruby autoformatter";
homepage = "https://github.com/fables-tales/rubyfmt";
license = licenses.mit;
maintainers = with maintainers; [ bobvanderlinden ];
};
}

10
pkgs/development/web/pnpm-lock-export/default.nix
View file

@ -1,16 +1,16 @@
{ lib, buildNpmPackage, fetchFromGitHub }: { lib, buildNpmPackage, fetchFromGitHub }:
buildNpmPackage rec { buildNpmPackage rec {
pname = "pnpm-lock-export"; pname = "pnpm-lock-export";
version = "0.4.0"; version = "unstable-2023-07-31";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cvent"; owner = "adamcstephens";
repo = "pnpm-lock-export"; repo = "pnpm-lock-export";
rev = "v${version}"; rev = "cc03755d6718a9c0d268d0f375907328ac15dc92";
hash = "sha256-vS6AW3R4go1Fdr3PBOCnuN4JDrDkl1lWVF7q+q+xDGg="; hash = "sha256-9OlFgmdKjvz4pB36Wm/fUAQDsD8zs32OSA3m2IAgrH8=";
}; };
npmDepsHash = "sha256-3uW/lzB+UDhFQtRb3X8szNlgAWTcSdwVdtyZvLu+cjI="; npmDepsHash = "sha256-nqkH7vFD78YvYr9Klguk2o7qHr5wr3ZjaywUKRRRjJo=";
postPatch = '' postPatch = ''
cp ${./package-lock.json} package-lock.json cp ${./package-lock.json} package-lock.json

3424
pkgs/development/web/pnpm-lock-export/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

15
pkgs/development/web/pnpm-lock-export/update.sh
View file

@ -16,22 +16,19 @@ fi
set -x set -x
cd "$(dirname "$0")" cd "$(dirname "$0")"
version="$1" rev="$1"
set -euo pipefail set -euo pipefail
if [ -z "$version" ]; then if [ -z "$rev" ]; then
version="$(wget -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/cvent/pnpm-lock-export/releases?per_page=1" | jq -r '.[0].tag_name')" rev="$(wget -O- "${TOKEN_ARGS[@]}" "https://api.github.com/repos/adamcstephens/pnpm-lock-export/commits?per_page=1" | jq -r '.[0].sha')"
fi fi
# strip leading "v"
version="${version#v}"
# pnpm-lock-export repository # pnpm-lock-export repository
src_hash=$(nix-prefetch-github cvent pnpm-lock-export --rev "v${version}" | jq -r .hash) src_hash=$(nix-prefetch-github adamcstephens pnpm-lock-export --rev "${rev}" | jq -r .hash)
# Front-end dependencies # Front-end dependencies
upstream_src="https://raw.githubusercontent.com/cvent/pnpm-lock-export/v$version" upstream_src="https://raw.githubusercontent.com/adamcstephens/pnpm-lock-export/${rev}"
trap 'rm -rf package.json' EXIT trap 'rm -rf package.json' EXIT
wget "${TOKEN_ARGS[@]}" "$upstream_src/package.json" wget "${TOKEN_ARGS[@]}" "$upstream_src/package.json"
@ -41,6 +38,6 @@ deps_hash=$(prefetch-npm-deps package-lock.json)
# Use friendlier hashes # Use friendlier hashes
deps_hash=$(nix hash to-sri --type sha256 "$deps_hash") deps_hash=$(nix hash to-sri --type sha256 "$deps_hash")
sed -i -E -e "s#version = \".*\"#version = \"$version\"#" default.nix sed -i -E -e "s#rev = \".*\"#rev = \"$rev\"#" default.nix
sed -i -E -e "s#hash = \".*\"#hash = \"$src_hash\"#" default.nix sed -i -E -e "s#hash = \".*\"#hash = \"$src_hash\"#" default.nix
sed -i -E -e "s#npmDepsHash = \".*\"#npmDepsHash = \"$deps_hash\"#" default.nix sed -i -E -e "s#npmDepsHash = \".*\"#npmDepsHash = \"$deps_hash\"#" default.nix

8
pkgs/os-specific/linux/kernel/zen-kernels.nix
View file

@ -4,16 +4,16 @@ let
# comments with variant added for update script # comments with variant added for update script
# ./update-zen.py zen # ./update-zen.py zen
zenVariant = { zenVariant = {
version = "6.4.6"; #zen version = "6.4.7"; #zen
suffix = "zen1"; #zen suffix = "zen1"; #zen
sha256 = "0vsdqyb5416004dq0r03q2j6x3z8lw7a9632ji6acjhc5rd84s6a"; #zen sha256 = "1xxznqkgn17sh134c4szjhk8im342zh7z6200k3csnqd9fink2r7"; #zen
isLqx = false; isLqx = false;
}; };
# ./update-zen.py lqx # ./update-zen.py lqx
lqxVariant = { lqxVariant = {
version = "6.4.6"; #lqx version = "6.4.7"; #lqx
suffix = "lqx1"; #lqx suffix = "lqx1"; #lqx
sha256 = "1xz2z1smy7xmwkc0l23nabz7sgbp8ipkcbxhnb91azql006mz80h"; #lqx sha256 = "055l8l83368858ap1pslxcs76hkms8ik627v7d7wczm9f1vldbln"; #lqx
isLqx = true; isLqx = true;
}; };
zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // {

178
pkgs/servers/uwsgi/default.nix
View file

@ -1,5 +1,12 @@
{ stdenv, nixosTests, lib, pkg-config, jansson, pcre, libxcrypt { stdenv
, expat, zlib , nixosTests
, lib
, pkg-config
, jansson
, pcre
, libxcrypt
, expat
, zlib
# plugins: list of strings, eg. [ "python2" "python3" ] # plugins: list of strings, eg. [ "python2" "python3" ]
, plugins ? [] , plugins ? []
, pam, withPAM ? stdenv.isLinux , pam, withPAM ? stdenv.isLinux
@ -10,90 +17,97 @@
, makeWrapper, fetchFromGitHub , makeWrapper, fetchFromGitHub
}: }:
let php-embed = php.override { let
embedSupport = true; php-embed = php.override {
apxs2Support = false; embedSupport = true;
}; apxs2Support = false;
};
pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "3"}" { pythonPlugin = pkg : lib.nameValuePair "python${if pkg.isPy2 then "2" else "3"}" {
interpreter = pkg.pythonForBuild.interpreter; interpreter = pkg.pythonForBuild.interpreter;
path = "plugins/python"; path = "plugins/python";
inputs = [ pkg ncurses ]; inputs = [ pkg ncurses ];
install = '' install = ''
install -Dm644 uwsgidecorators.py $out/${pkg.sitePackages}/uwsgidecorators.py install -Dm644 uwsgidecorators.py $out/${pkg.sitePackages}/uwsgidecorators.py
${pkg.pythonForBuild.executable} -m compileall $out/${pkg.sitePackages}/ ${pkg.pythonForBuild.executable} -m compileall $out/${pkg.sitePackages}/
${pkg.pythonForBuild.executable} -O -m compileall $out/${pkg.sitePackages}/ ${pkg.pythonForBuild.executable} -O -m compileall $out/${pkg.sitePackages}/
''; '';
}; };
available = lib.listToAttrs [ available = lib.listToAttrs [
(pythonPlugin python2) (pythonPlugin python2)
(pythonPlugin python3) (pythonPlugin python3)
(lib.nameValuePair "rack" { (lib.nameValuePair "rack" {
path = "plugins/rack"; path = "plugins/rack";
inputs = [ ruby ]; inputs = [ ruby ];
}) })
(lib.nameValuePair "cgi" { (lib.nameValuePair "cgi" {
# usage: https://uwsgi-docs.readthedocs.io/en/latest/CGI.html?highlight=cgi # usage: https://uwsgi-docs.readthedocs.io/en/latest/CGI.html?highlight=cgi
path = "plugins/cgi"; path = "plugins/cgi";
inputs = [ ]; inputs = [ ];
}) })
(lib.nameValuePair "php" { (lib.nameValuePair "php" {
# usage: https://uwsgi-docs.readthedocs.io/en/latest/PHP.html#running-php-apps-with-nginx # usage: https://uwsgi-docs.readthedocs.io/en/latest/PHP.html#running-php-apps-with-nginx
path = "plugins/php"; path = "plugins/php";
inputs = [ inputs = [
php-embed php-embed
php-embed.extensions.session php-embed.extensions.session
php-embed.extensions.session.dev php-embed.extensions.session.dev
php-embed.unwrapped.dev php-embed.unwrapped.dev
] ++ php-embed.unwrapped.buildInputs; ] ++ php-embed.unwrapped.buildInputs;
}) })
]; ];
getPlugin = name: getPlugin = name:
let all = lib.concatStringsSep ", " (lib.attrNames available); let
in if lib.hasAttr name available all = lib.concatStringsSep ", " (lib.attrNames available);
then lib.getAttr name available // { inherit name; } in
else throw "Unknown UWSGI plugin ${name}, available : ${all}"; if lib.hasAttr name available
then lib.getAttr name available // { inherit name; }
else throw "Unknown UWSGI plugin ${name}, available : ${all}";
needed = builtins.map getPlugin plugins; needed = builtins.map getPlugin plugins;
in in
stdenv.mkDerivation rec { stdenv.mkDerivation (finalAttrs: {
pname = "uwsgi"; pname = "uwsgi";
version = "2.0.21"; version = "2.0.22";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "unbit"; owner = "unbit";
repo = "uwsgi"; repo = "uwsgi";
rev = version; rev = finalAttrs.version;
sha256 = "sha256-TUASYDyG+p1tlhmqi+ivaC7aW6UZBrPTFQUTYys5ICE="; hash = "sha256-pfy3EDXq3KVY2mC3BMAp/87IUiP4NhdTWZo+zVBJ+Pc=";
}; };
patches = [ patches = [
./no-ext-session-php_session.h-on-NixOS.patch ./no-ext-session-php_session.h-on-NixOS.patch
./additional-php-ldflags.patch ./additional-php-ldflags.patch
]; ];
nativeBuildInputs = [ python3 pkg-config makeWrapper ]; nativeBuildInputs = [
makeWrapper
pkg-config
python3
];
buildInputs = [ jansson pcre libxcrypt ] buildInputs = [ jansson pcre libxcrypt ]
++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ expat zlib ] ++ lib.optionals (stdenv.isDarwin && stdenv.isAarch64) [ expat zlib ]
++ lib.optional withPAM pam ++ lib.optional withPAM pam
++ lib.optional withSystemd systemd ++ lib.optional withSystemd systemd
++ lib.optional withCap libcap ++ lib.optional withCap libcap
++ lib.concatMap (x: x.inputs) needed ++ lib.concatMap (x: x.inputs) needed;
;
basePlugins = lib.concatStringsSep "," basePlugins = lib.concatStringsSep ","
( lib.optional withPAM "pam" ( lib.optional withPAM "pam"
++ lib.optional withSystemd "systemd_logger" ++ lib.optional withSystemd "systemd_logger"
); );
UWSGI_INCLUDES = lib.optionalString withCap "${libcap.dev}/include"; UWSGI_INCLUDES = lib.optionalString withCap "${libcap.dev}/include";
passthru = { passthru = {
inherit python2 python3; inherit python2 python3;
tests.uwsgi = nixosTests.uwsgi;
}; };
postPatch = '' postPatch = ''
@ -105,29 +119,42 @@ stdenv.mkDerivation rec {
''; '';
configurePhase = '' configurePhase = ''
runHook preConfigure
export pluginDir=$out/lib/uwsgi export pluginDir=$out/lib/uwsgi
substituteAll ${./nixos.ini} buildconf/nixos.ini substituteAll ${./nixos.ini} buildconf/nixos.ini
runHook postConfigure
''; '';
# this is a hack to make the php plugin link with session.so (which on nixos is a separate package) # this is a hack to make the php plugin link with session.so (which on nixos is a separate package)
# the hack works in coordination with ./additional-php-ldflags.patch # the hack works in coordination with ./additional-php-ldflags.patch
UWSGICONFIG_PHP_LDFLAGS = lib.optionalString (builtins.any (x: x.name == "php") needed) UWSGICONFIG_PHP_LDFLAGS = lib.optionalString
(lib.concatStringsSep "," [ (builtins.any (x: x.name == "php") needed)
"-Wl" (lib.concatStringsSep "," [
"-rpath=${php-embed.extensions.session}/lib/php/extensions/" "-Wl"
"--library-path=${php-embed.extensions.session}/lib/php/extensions/" "-rpath=${php-embed.extensions.session}/lib/php/extensions/"
"-l:session.so" "--library-path=${php-embed.extensions.session}/lib/php/extensions/"
]); "-l:session.so"
]);
buildPhase = '' buildPhase = ''
runHook preBuild
mkdir -p $pluginDir mkdir -p $pluginDir
python3 uwsgiconfig.py --build nixos python3 uwsgiconfig.py --build nixos
${lib.concatMapStringsSep ";" (x: "${x.preBuild or ""}\n ${x.interpreter or "python3"} uwsgiconfig.py --plugin ${x.path} nixos ${x.name}") needed} ${lib.concatMapStringsSep ";" (x: "${x.preBuild or ""}\n ${x.interpreter or "python3"} uwsgiconfig.py --plugin ${x.path} nixos ${x.name}") needed}
runHook postBuild
''; '';
installPhase = '' installPhase = ''
runHook preInstall
install -Dm755 uwsgi $out/bin/uwsgi install -Dm755 uwsgi $out/bin/uwsgi
${lib.concatMapStringsSep "\n" (x: x.install or "") needed} ${lib.concatMapStringsSep "\n" (x: x.install or "") needed}
runHook postInstall
''; '';
postFixup = lib.optionalString (builtins.any (x: x.name == "php") needed) postFixup = lib.optionalString (builtins.any (x: x.name == "php") needed)
@ -135,14 +162,11 @@ stdenv.mkDerivation rec {
wrapProgram $out/bin/uwsgi --set PHP_INI_SCAN_DIR ${php-embed}/lib wrapProgram $out/bin/uwsgi --set PHP_INI_SCAN_DIR ${php-embed}/lib
''; '';
meta = with lib; { meta = {
homepage = "https://uwsgi-docs.readthedocs.org/en/latest/";
description = "A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C"; description = "A fast, self-healing and developer/sysadmin-friendly application container server coded in pure C";
license = licenses.gpl2; homepage = "https://uwsgi-docs.readthedocs.org/en/latest/";
maintainers = with maintainers; [ abbradar schneefux globin ]; license = lib.licenses.gpl2;
platforms = platforms.unix; maintainers = with lib.maintainers; [ abbradar schneefux globin ];
platforms = lib.platforms.unix;
}; };
})
passthru.tests.uwsgi = nixosTests.uwsgi;
}

6
pkgs/tools/misc/phrase-cli/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "phrase-cli"; pname = "phrase-cli";
version = "2.8.2"; version = "2.8.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "phrase"; owner = "phrase";
repo = "phrase-cli"; repo = "phrase-cli";
rev = version; rev = version;
sha256 = "sha256-jsN7JouIyrFd//+kDAcEEsXiGLZx8e5jQsiNVQuDiQg="; sha256 = "sha256-tYpn93PSvO9g31soDOW0+gOBaypMUlx9Xfo0H3ftJQk=";
}; };
vendorHash = "sha256-a0QA/1vUryAnO0Nr+m8frxtpnSHBOSOP1pq+BORTIJw="; vendorHash = "sha256-SooYBVXcll8QciK8J68wUAsAH6kN+lWlmPS8h0Hw4e0=";
ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ]; ldflags = [ "-X=github.com/phrase/phrase-cli/cmd.PHRASE_CLIENT_VERSION=${version}" ];

6
pkgs/tools/networking/juicity/default.nix
View file

@ -4,16 +4,16 @@
}: }:
buildGoModule rec { buildGoModule rec {
pname = "juicity"; pname = "juicity";
version = "0.1.0"; version = "0.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "juicity"; owner = "juicity";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-JuV9nIFyT2AO0baayVSiKiVDH1waRsqqIp9I4KZ9Xu4="; hash = "sha256-wTMWmHQPJ65FRJUNt7liLF+nM/tXdq067KT0fMWlDfM=";
}; };
vendorHash = "sha256-xrSy6ZUbmUrRZ+vXBo9VPdhsbD/RV19xBHvNuhDWOPo="; vendorHash = "sha256-RTf0+rf6DPJf9DKRNstZzJbQ3+pU/8siLSRgUo9Bcu8=";
proxyVendor = true; proxyVendor = true;

15
pkgs/top-level/all-packages.nix
View file

@ -17863,6 +17863,11 @@ with pkgs;
rbenv = callPackage ../development/ruby-modules/rbenv { }; rbenv = callPackage ../development/ruby-modules/rbenv { };
rubyfmt = callPackage ../development/tools/rubyfmt {
inherit (darwin.apple_sdk.frameworks) Foundation Security;
inherit (darwin) libobjc;
};
inherit (darwin.apple_sdk_11_0.callPackage ../development/interpreters/ruby { inherit (darwin.apple_sdk_11_0.callPackage ../development/interpreters/ruby {
inherit (darwin) libobjc libunwind; inherit (darwin) libobjc libunwind;
inherit (darwin.apple_sdk_11_0.frameworks) Foundation; inherit (darwin.apple_sdk_11_0.frameworks) Foundation;
@ -25433,6 +25438,8 @@ with pkgs;
}; };
zig = zig_0_10; zig = zig_0_10;
zigHook = callPackage ../development/compilers/zig/hook.nix { };
zimlib = callPackage ../development/libraries/zimlib { }; zimlib = callPackage ../development/libraries/zimlib { };
zita-convolver = callPackage ../development/libraries/audio/zita-convolver { }; zita-convolver = callPackage ../development/libraries/audio/zita-convolver { };
@ -30722,6 +30729,8 @@ with pkgs;
extraIntegrations = extras; extraIntegrations = extras;
}; };
dayon = callPackage ../applications/networking/remote/dayon { };
ddgr = callPackage ../applications/misc/ddgr { }; ddgr = callPackage ../applications/misc/ddgr { };
deadbeef = callPackage ../applications/audio/deadbeef { }; deadbeef = callPackage ../applications/audio/deadbeef { };
@ -31516,7 +31525,7 @@ with pkgs;
firefox-devedition-unwrapped = firefoxPackages.firefox-devedition; firefox-devedition-unwrapped = firefoxPackages.firefox-devedition;
firefox-esr-102-unwrapped = firefoxPackages.firefox-esr-102; firefox-esr-102-unwrapped = firefoxPackages.firefox-esr-102;
firefox-esr-115-unwrapped = firefoxPackages.firefox-esr-115; firefox-esr-115-unwrapped = firefoxPackages.firefox-esr-115;
firefox-esr-unwrapped = firefoxPackages.firefox-esr-102; firefox-esr-unwrapped = firefoxPackages.firefox-esr-115;
firefox = wrapFirefox firefox-unwrapped { }; firefox = wrapFirefox firefox-unwrapped { };
firefox-beta = wrapFirefox firefox-beta-unwrapped { }; firefox-beta = wrapFirefox firefox-beta-unwrapped { };
@ -31524,7 +31533,7 @@ with pkgs;
firefox-mobile = callPackage ../applications/networking/browsers/firefox/mobile-config.nix { }; firefox-mobile = callPackage ../applications/networking/browsers/firefox/mobile-config.nix { };
firefox-esr = firefox-esr-102; firefox-esr = firefox-esr-115;
firefox-esr-102 = wrapFirefox firefox-esr-102-unwrapped { }; firefox-esr-102 = wrapFirefox firefox-esr-102-unwrapped { };
firefox-esr-115 = wrapFirefox firefox-esr-115-unwrapped { }; firefox-esr-115 = wrapFirefox firefox-esr-115-unwrapped { };
@ -41483,6 +41492,8 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; inherit (darwin.apple_sdk.frameworks) CoreFoundation Security;
}; };
ldid-procursus = callPackage ../development/tools/ldid-procursus { };
xcolor = callPackage ../tools/graphics/xcolor { }; xcolor = callPackage ../tools/graphics/xcolor { };
xcfun = callPackage ../development/libraries/science/chemistry/xcfun { }; xcfun = callPackage ../development/libraries/science/chemistry/xcfun { };