MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-16 14:54:29 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/master' into haskell-updates

Browse source
This commit is contained in:
sternenseemann 2023-01-31 13:25:41 +01:00
commit c57b63152a
399 changed files with 7078 additions and 1980 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
.github/CODEOWNERS vendored
View file

@ -134,7 +134,9 @@
/pkgs/development/ruby-modules @marsam
# Rust
/pkgs/development/compilers/rust @Mic92 @LnL7 @zowoq
/pkgs/development/compilers/rust @Mic92 @LnL7 @zowoq @winterqt @figsoda
/pkgs/build-support/rust @zowoq @winterqt @figsoda
/doc/languages-frameworks/rust.section.md @zowoq @winterqt @figsoda
# C compilers
/pkgs/development/compilers/gcc @matthewbauer

2
doc/stdenv/stdenv.chapter.md
View file

@ -253,7 +253,7 @@ The propagated equivalent of `depsTargetTarget`. This is prefixed for the same r
#### `NIX_DEBUG` {#var-stdenv-NIX_DEBUG}
A natural number indicating how much information to log. If set to 1 or higher, `stdenv` will print moderate debugging information during the build. In particular, the `gcc` and `ld` wrapper scripts will print out the complete command line passed to the wrapped tools. If set to 6 or higher, the `stdenv` setup script will be run with `set -x` tracing. If set to 7 or higher, the `gcc` and `ld` wrapper scripts will also be run with `set -x` tracing.
A number between 0 and 7 indicating how much information to log. If set to 1 or higher, `stdenv` will print moderate debugging information during the build. In particular, the `gcc` and `ld` wrapper scripts will print out the complete command line passed to the wrapped tools. If set to 6 or higher, the `stdenv` setup script will be run with `set -x` tracing. If set to 7 or higher, the `gcc` and `ld` wrapper scripts will also be run with `set -x` tracing.
### Attributes affecting build properties {#attributes-affecting-build-properties}

9
lib/systems/inspect.nix
View file

@ -82,8 +82,13 @@ rec {
isMusl = with abis; map (a: { abi = a; }) [ musl musleabi musleabihf muslabin32 muslabi64 ];
isUClibc = with abis; map (a: { abi = a; }) [ uclibc uclibceabi uclibceabihf ];
isEfi = map (family: { cpu.family = family; })
[ "x86" "arm" "riscv" ];
isEfi = [
{ cpu = { family = "arm"; version = "6"; }; }
{ cpu = { family = "arm"; version = "7"; }; }
{ cpu = { family = "arm"; version = "8"; }; }
{ cpu = { family = "riscv"; }; }
{ cpu = { family = "x86"; }; }
];
};
matchAnyAttrs = patterns:

22
maintainers/maintainer-list.nix
View file

@ -2530,6 +2530,12 @@
githubId = 89596;
name = "Florian Friesdorf";
};
ChaosAttractor = {
email = "lostattractor@gmail.com";
github = "LostAttractor";
githubId = 46527539;
name = "ChaosAttractor";
};
chekoopa = {
email = "chekoopa@mail.ru";
github = "chekoopa";
@ -13990,6 +13996,13 @@
githubId = 2666479;
name = "Y Nguyen";
};
superherointj = {
name = "Sérgio Marcelo";
email = "sergiomarcelo+nixpkgs@ya.ru";
matrix = "@superherointj:matrix.org";
github = "superherointj";
githubId = 5861043;
};
SuperSandro2000 = {
email = "sandro.jaeckel@gmail.com";
matrix = "@sandro:supersandro.de";
@ -14124,6 +14137,15 @@
githubId = 5991987;
name = "Alexander Sosedkin";
};
t4ccer = {
email = "t4ccer@gmail.com";
github = "t4ccer";
githubId = 64430288;
name = "Tomasz Maciosowski";
keys = [{
fingerprint = "6866 981C 4992 4D64 D154 E1AC 19E5 A2D8 B1E4 3F19";
}];
};
tadeokondrak = {
email = "me@tadeo.ca";
github = "tadeokondrak";

4
maintainers/team-list.nix
View file

@ -698,9 +698,11 @@ with lib.maintainers; {
rust = {
members = [
andir
figsoda
lnl7
mic92
tjni
winter
zowoq
];
scope = "Maintain the Rust compiler toolchain and nixpkgs integration.";

2
nixos/doc/manual/configuration/config-file.section.md
View file

@ -170,6 +170,6 @@ Packages
```
The latter option definition changes the default PostgreSQL package
used by NixOS's PostgreSQL service to 10.x. For more information on
used by NixOS's PostgreSQL service to 14.x. For more information on
packages, including how to add new ones, see
[](#sec-custom-packages).

2
nixos/doc/manual/from_md/configuration/config-file.section.xml
View file

@ -221,7 +221,7 @@ services.postgresql.package = pkgs.postgresql_14;
</programlisting>
<para>
The latter option definition changes the default PostgreSQL
package used by NixOS’s PostgreSQL service to 10.x. For more
package used by NixOS’s PostgreSQL service to 14.x. For more
information on packages, including how to add new ones, see
<xref linkend="sec-custom-packages" />.
</para>

17
nixos/doc/manual/from_md/release-notes/rl-2305.section.xml
View file

@ -351,6 +351,12 @@
relying on this should provide their own implementation.
</para>
</listitem>
<listitem>
<para>
Calling <literal>makeSetupHook</literal> without passing a
<literal>name</literal> argument is deprecated.
</para>
</listitem>
<listitem>
<para>
Qt 5.12 and 5.14 have been removed, as the corresponding
@ -413,6 +419,17 @@
https://dotnet.microsoft.com/en-us/platform/support/policy/dotnet-core
</para>
</listitem>
<listitem>
<para>
The iputils package, which is installed by default, no longer
provides the <literal>ninfod</literal>,
<literal>rarpd</literal> and <literal>rdisc</literal> tools.
See
<link xlink:href="https://github.com/iputils/iputils/releases/tag/20221126">upstream’s
release notes</link> for more details and available
replacements.
</para>
</listitem>
</itemizedlist>
</section>
<section xml:id="sec-release-23.05-notable-changes">

7
nixos/doc/manual/release-notes/rl-2305.section.md
View file

@ -87,6 +87,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- The EC2 image module previously detected and activated swap-formatted instance store devices and partitions in stage-1 (initramfs). This behaviour has been removed. Users relying on this should provide their own implementation.
- Calling `makeSetupHook` without passing a `name` argument is deprecated.
- Qt 5.12 and 5.14 have been removed, as the corresponding branches have been EOL upstream for a long time. This affected under 10 packages in nixpkgs, largely unmaintained upstream as well, however, out-of-tree package expressions may need to be updated manually.
- The [services.wordpress.sites.&lt;name&gt;.plugins](#opt-services.wordpress.sites._name_.plugins) and [services.wordpress.sites.&lt;name&gt;.themes](#opt-services.wordpress.sites._name_.themes) options have been converted from sets to attribute sets to allow for consumers to specify explicit install paths via attribute name.
@ -101,6 +103,11 @@ In addition to numerous new and upgraded packages, this release has the followin
- .NET 5.0 was removed due to being end-of-life, use a newer, supported .NET version - https://dotnet.microsoft.com/en-us/platform/support/policy/dotnet-core
- The iputils package, which is installed by default, no longer provides the
`ninfod`, `rarpd` and `rdisc` tools. See
[upstream's release notes](https://github.com/iputils/iputils/releases/tag/20221126)
for more details and available replacements.
## Other Notable Changes {#sec-release-23.05-notable-changes}
<!-- To avoid merge conflicts, consider adding your item at an arbitrary place in the list instead. -->

17
nixos/modules/services/desktops/pipewire/daemon/client-rt.conf.json
View file

@ -35,5 +35,20 @@
}
],
"filter.properties": {},
"stream.properties": {}
"stream.properties": {},
"alsa.properties": {},
"alsa.rules": [
{
"matches": [
{
"application.process.binary": "resolve"
}
],
"actions": {
"update-props": {
"alsa.buffer-bytes": 131072
}
}
}
]
}

12
nixos/modules/services/desktops/pipewire/daemon/jack.conf.json
View file

@ -58,6 +58,18 @@
"node.passive": true
}
}
},
{
"matches": [
{
"client.name": "Mixxx"
}
],
"actions": {
"update-props": {
"jack.merge-monitor": false
}
}
}
]
}

27
nixos/modules/services/hardware/bluetooth.nix
View file

@ -71,6 +71,29 @@ in
};
description = lib.mdDoc "Set configuration for system-wide bluetooth (/etc/bluetooth/main.conf).";
};
input = mkOption {
type = cfgFmt.type;
default = { };
example = {
General = {
IdleTimeout = 30;
ClassicBondedOnly = true;
};
};
description = lib.mdDoc "Set configuration for the input service (/etc/bluetooth/input.conf).";
};
network = mkOption {
type = cfgFmt.type;
default = { };
example = {
General = {
DisableSecurity = true;
};
};
description = lib.mdDoc "Set configuration for the network service (/etc/bluetooth/network.conf).";
};
};
};
@ -80,6 +103,10 @@ in
environment.systemPackages = [ package ]
++ optional cfg.hsphfpd.enable pkgs.hsphfpd;
environment.etc."bluetooth/input.conf".source =
cfgFmt.generate "input.conf" cfg.input;
environment.etc."bluetooth/network.conf".source =
cfgFmt.generate "network.conf" cfg.network;
environment.etc."bluetooth/main.conf".source =
cfgFmt.generate "main.conf" (recursiveUpdate defaults cfg.settings);
services.udev.packages = [ package ];

1
nixos/modules/services/networking/openconnect.nix
View file

@ -90,6 +90,7 @@ let
generateConfig = name: icfg:
pkgs.writeText "config" ''
interface=${name}
${optionalString (icfg.protocol != null) "protocol=${icfg.protocol}"}
${optionalString (icfg.user != null) "user=${icfg.user}"}
${optionalString (icfg.passwordFile != null) "passwd-on-stdin"}
${optionalString (icfg.certificate != null)

1
nixos/modules/services/x11/desktop-managers/plasma5.nix
View file

@ -365,6 +365,7 @@ in
pkgs.xdg-user-dirs # Update user dirs as described in https://freedesktop.org/wiki/Software/xdg-user-dirs/
];
optionalPackages = [
pkgs.aha # needed by kinfocenter for fwupd support
plasma-browser-integration
konsole
oxygen

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

@ -4,13 +4,13 @@
stdenv.mkDerivation rec {
pname = "flacon";
version = "9.5.1";
version = "10.0.0";
src = fetchFromGitHub {
owner = "flacon";
repo = "flacon";
rev = "v${version}";
sha256 = "sha256-45aA2Ib69Gb1Mg/5907rp1nfRbNyQq12pm/aFwTdgeA=";
sha256 = "sha256-59p5x+d7Vmxx+bdBDxrlf4+NRIdUBuRk+DqohV98XYY=";
};
nativeBuildInputs = [ cmake pkg-config wrapQtAppsHook ];

4
pkgs/applications/audio/fluidsynth/default.nix
View file

@ -5,13 +5,13 @@
stdenv.mkDerivation rec {
pname = "fluidsynth";
version = "2.3.0";
version = "2.3.1";
src = fetchFromGitHub {
owner = "FluidSynth";
repo = "fluidsynth";
rev = "v${version}";
sha256 = "sha256-7SuM7a8IIecAJ83QvJfUba/wArAEXywqL2HwVbeG8H4=";
sha256 = "05lr9f0q4x1kvgfa3xrfmagpwvijv9m1s316aa9figqlkcc5vv4k";
};
nativeBuildInputs = [ buildPackages.stdenv.cc pkg-config cmake ];

50
pkgs/applications/audio/go-musicfox/default.nix Normal file
View file

@ -0,0 +1,50 @@
{ lib
, fetchFromGitHub
, buildGoModule
, clangStdenv
, pkg-config
, alsa-lib
, flac
}:
# gcc only supports objc on darwin
buildGoModule.override { stdenv = clangStdenv; } rec {
pname = "go-musicfox";
version = "3.6.1";
src = fetchFromGitHub {
owner = "anhoder";
repo = pname;
rev = "v${version}";
hash = "sha256-iinEo+HrcNM3gx1iUqe1duRd45PrYgVybRt9NKphwuY=";
};
deleteVendor = true;
vendorHash = "sha256-DbdAEvcspTYMYMvc5IBEUtQAJMW8JZpNi0UA/DvzGFo=";
subPackages = [ "cmd/musicfox.go" ];
ldflags = [
"-s"
"-w"
"-X go-musicfox/pkg/constants.AppVersion=${version}"
];
nativeBuildInputs = [
pkg-config
];
buildInputs = [
alsa-lib
flac
];
meta = with lib; {
description = "Terminal netease cloud music client written in Go";
homepage = "https://github.com/anhoder/go-musicfox";
license = licenses.mit;
mainProgram = "musicfox";
maintainers = with maintainers; [ zendo ];
};
}

4
pkgs/applications/audio/open-stage-control/default.nix
View file

@ -2,13 +2,13 @@
buildNpmPackage rec {
pname = "open-stage-control";
version = "1.21.0";
version = "1.22.0";
src = fetchFromGitHub {
owner = "jean-emmanuel";
repo = "open-stage-control";
rev = "v${version}";
hash = "sha256-6tRd8boVwWc8qGlklYqA/Kp76VOMvtUJlu/G/InvHkA=";
hash = "sha256-tfWimJ9eEFBUxPRVNjgbu8tQNokPbXOxOXO64mFuMfM=";
};
# Remove some Electron stuff from package.json

8
pkgs/applications/audio/rhvoice/honor_nix_environment.patch
View file

@ -1,5 +1,3 @@
diff --git a/SConstruct b/SConstruct
index 3ad4d9a..fb02365 100644
--- a/SConstruct
+++ b/SConstruct
@@ -94,11 +94,8 @@ def CheckWiX(context):
@ -16,13 +14,15 @@ index 3ad4d9a..fb02365 100644
def validate_spd_version(key,val,env):
m=re.match(r"^\d+\.\d+",val)
@@ -208,9 +205,9 @@ def create_base_env(user_vars):
@@ -207,10 +204,10 @@ def create_base_env(user_vars):
env_args["LIBS"]=[]
env_args["package_name"]="RHVoice"
env_args["CPPDEFINES"]=[("RHVOICE","1")]
env=Environment(**env_args)
- env=Environment(**env_args)
- if env["dev"]:
- env["prefix"]=os.path.abspath("local")
- env["RPATH"]=env.Dir("$libdir").abspath
+ env=Environment(ENV = os.environ, **env_args)
+ env.PrependENVPath("PATH", os.environ["PATH"])
+ env["ENV"]["PKG_CONFIG_PATH"]=os.environ["PKG_CONFIG_PATH"]
+ env["RPATH"]=env.Dir("$libdir").abspath

120
pkgs/applications/audio/yesplaymusic/default.nix Normal file
View file

@ -0,0 +1,120 @@
{ lib
, stdenv
, fetchurl
, undmg
, dpkg
, autoPatchelfHook
, wrapGAppsHook
, makeWrapper
, alsa-lib
, at-spi2-atk
, cups
, nspr
, nss
, mesa # for libgbm
, xorg
, xdg-utils
, libdrm
, libnotify
, libsecret
, libuuid
, gtk3
, systemd
}:
let
pname = "YesPlayMusic";
version = "0.4.5";
srcs = {
x86_64-linux = fetchurl {
url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/yesplaymusic_${version}_amd64.deb";
hash = "sha256-igd2MzIjwDSOLP0Xi2mSJnEPGWendggPC/MwTDCDui0=";
};
aarch64-linux = fetchurl {
url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/yesplaymusic_${version}_arm64.deb";
hash = "sha256-6MZrAJGXuEJ9HMUje3ppTz2rdaBydwoQKBk6af81pT0=";
};
x86_64-darwin = fetchurl {
url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/YesPlayMusic-mac-${version}-x64.dmg";
hash = "sha256-mvmaSrDoIDeOVylkJCVY97yRUHfEI8CysmKrgBUrFGM=";
};
aarch64-darwin = fetchurl {
url = "https://github.com/qier222/YesPlayMusic/releases/download/v${version}/YesPlayMusic-mac-${version}-arm64.dmg";
hash = "sha256-Qo03rGS/qB6Sc1IunU7F81WJ/t+mWR7ZRsKYK97LHik=";
};
};
src = srcs.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
libraries = [
alsa-lib
at-spi2-atk
cups
nspr
nss
mesa
xorg.libxshmfence
xorg.libXScrnSaver
xorg.libXtst
xdg-utils
libdrm
libnotify
libsecret
libuuid
gtk3
];
meta = with lib; {
description = "A good-looking third-party netease cloud music player";
homepage = "https://github.com/qier222/YesPlayMusic/";
license = licenses.mit;
maintainers = with maintainers; [ ChaosAttractor ];
platforms = builtins.attrNames srcs;
};
in
if stdenv.isDarwin
then stdenv.mkDerivation {
inherit pname version src meta;
nativeBuildInputs = [ undmg ];
sourceRoot = ".";
installPhase = ''
mkdir -p $out/Applications
cp -r *.app $out/Applications
'';
}
else stdenv.mkDerivation {
inherit pname version src meta;
nativeBuildInputs = [
autoPatchelfHook
wrapGAppsHook
makeWrapper
];
buildInputs = libraries;
runtimeDependencies = [
(lib.getLib systemd)
];
unpackPhase = ''
${dpkg}/bin/dpkg-deb -x $src .
'';
installPhase = ''
runHook preInstall
mkdir -p $out/bin
cp -r opt $out/opt
cp -r usr/share $out/share
substituteInPlace $out/share/applications/yesplaymusic.desktop \
--replace "/opt/YesPlayMusic/yesplaymusic" "$out/bin/yesplaymusic"
makeWrapper $out/opt/YesPlayMusic/yesplaymusic $out/bin/yesplaymusic \
--argv0 "yesplaymusic" \
--add-flags "$out/opt/YesPlayMusic/resources/app.asar"
runHook postInstall
'';
}

4
pkgs/applications/blockchains/haven-cli/default.nix
View file

@ -10,13 +10,13 @@
stdenv.mkDerivation rec {
pname = "haven-cli";
version = "3.0.3";
version = "3.0.7";
src = fetchFromGitHub {
owner = "haven-protocol-org";
repo = "haven-main";
rev = "v${version}";
sha256 = "sha256-JbNk1TF0N3tRYGfZfSBFk+t/8GA4yjqP9G6S0ktdur8=";
sha256 = "sha256-HLZ9j75MtF7FkHA4uefkrYp07pVZe1Ac1wny7T0CMpA=";
fetchSubmodules = true;
};

10
pkgs/applications/editors/standardnotes/src.json
View file

@ -1,13 +1,13 @@
{
"version": "3.139.0",
"version": "3.142.1",
"appimage": {
"x86_64-linux": {
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.139.0/standard-notes-3.139.0-linux-x86_64.AppImage",
"hash": "sha512-0s/tQmP5PINoQB7FOhR5wYuBvynKHpM9uMNmkJs77z84rY+WXOdZRjki6ZeG60niNXr8rUSLOBffy4jyLka6tg=="
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.142.1/standard-notes-3.142.1-linux-x86_64.AppImage",
"hash": "sha512-tf6vk108RMnxk7ZCFIAbWnlTvQqCkU6NtG+JCmMK/oR+/N3T5TDaHyufNJ9yVIh9pZrmaKMHjDUdCUgGc7lIRA=="
},
"aarch64-linux": {
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.139.0/standard-notes-3.139.0-linux-arm64.AppImage",
"hash": "sha512-LralbOiIVQCtQTqmhTtKttdtMz4M14drPFZ00LPFcwzQviLdU2C/od3NUxf5H5piGgqt5TJlgMCOcLIiyoNKFA=="
"url": "https://github.com/standardnotes/app/releases/download/%40standardnotes/desktop%403.142.1/standard-notes-3.142.1-linux-arm64.AppImage",
"hash": "sha512-wQYeWUDLbthgcWPWcz5TbqR1rk3OkdISr/SsdbbrLIyroAaXppg+7FA/FbPW7wlrksiMKowJ/hAPQz1NIxSRZg=="
}
}
}

6
pkgs/applications/graphics/eyedropper/default.nix
View file

@ -15,19 +15,19 @@
stdenv.mkDerivation rec {
pname = "eyedropper";
version = "0.5.0";
version = "0.5.1";
src = fetchFromGitHub {
owner = "FineFindus";
repo = pname;
rev = "v${version}";
hash = "sha256-sDrMIryVFkjMGHbYvNDmKb1HyJNGb3Hd+muxUJKhogE=";
hash = "sha256-kc/UREQpmw3suA6bYEr9fCIwMzNMrEY9E5qf+rhKsC4=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${pname}-${version}";
hash = "sha256-mztc44hHdqzR3WbG6tkCL38EfgBajRLlpMC8ElpXnlo=";
hash = "sha256-/eas1PObrj9IuDIzlBVbfhEhH8eDyZ7CD871JmAqnyY=";
};
nativeBuildInputs = [

21
pkgs/applications/graphics/fluxus/default.nix
View file

@ -22,26 +22,6 @@
, zlib
}:
let
libs = [
alsa-lib
bzip2
fftw
freeglut
freetype
glew
libjack2
libGL
libGLU
libjpeg
liblo
libpng
libsndfile
libtiff
ode
openal
openssl
zlib
];
racket = racket_7_9;
in
stdenv.mkDerivation rec {
@ -77,7 +57,6 @@ stdenv.mkDerivation rec {
"RacketPrefix=${racket}"
"RacketInclude=${racket}/include/racket"
"RacketLib=${racket}/lib/racket"
"LIBPATH=${lib.makeLibraryPath libs}"
"DESTDIR=build"
];
configurePhase = ''

34
pkgs/applications/graphics/fluxus/fix-build.patch
View file

@ -1,5 +1,10 @@
diff --git a/SConstruct b/SConstruct
index 32cb644..650333a 100644
scons does not use os environment by default:
https://scons.org/doc/2.1.0/HTML/scons-user/x1750.html
nixpkgs' cc-wrapper on the other hand relies on various NIX_* variables
to be passed through like NIX_CFLAGS_COMPILE_BEFORE.
While at it ported to python3-style print().
--- a/SConstruct
+++ b/SConstruct
@@ -6,7 +6,7 @@
@ -11,16 +16,15 @@ index 32cb644..650333a 100644
MajorVersion = "0"
MinorVersion = "19"
@@ -225,13 +225,18 @@ if env['PLATFORM'] == 'posix':
["asound", "alsa/asoundlib.h"],
["openal", "AL/al.h"]]
@@ -100,6 +100,7 @@ IncludePaths = [
paranoid = ' -W -Wcast-qual -Wwrite-strings -Wcast-align -Wpointer-arith -Wconversion -Wredundant-decls -Wunreachable-code -Winline -Wlarger-than-256'
+env.Append(ENV={'PATH': ' ' + os.environ['PATH'], })
+env.Append(LIBPATH=ARGUMENTS.get('LIBPATH', '').split(':'))
+env.Append(CCFLAGS=' ' + os.environ.get('NIX_CFLAGS_COMPILE',''))
+env.Append(CCFLAGS=' -DNULL=0')
+
################################################################################
env = Environment(CCFLAGS = '-ggdb -pipe -Wall -O3 -ffast-math -Wno-unused -fPIC -pthread',
+ ENV = os.environ,
VERSION_NUM = FluxusVersion)
env.MergeFlags(ARGUMENTS.get('CCFLAGS', '').split())
env.MergeFlags(ARGUMENTS.get('LDFLAGS', '').split())
@@ -229,9 +230,9 @@ if env['PLATFORM'] == 'posix':
# Make sure we have these libraries availible
if not GetOption('clean'):
@ -33,7 +37,7 @@ index 32cb644..650333a 100644
# detect ode precision
if not GetOption('clean'):
try:
@@ -240,27 +245,27 @@ if not GetOption('clean'):
@@ -240,27 +241,27 @@ if not GetOption('clean'):
if isinstance(ode_str[0], str):
env.MergeFlags(ode_str[0])
except:
@ -65,7 +69,7 @@ index 32cb644..650333a 100644
Exit(1)
if not conf.CheckFunc("dInitODE2"):
@@ -334,7 +339,7 @@ if not GetOption('clean'):
@@ -334,7 +335,7 @@ if not GetOption('clean'):
])
if raco_status != 0:
@ -74,7 +78,7 @@ index 32cb644..650333a 100644
Exit(1)
@@ -377,8 +382,8 @@ if not GetOption('clean') and static_modules:
@@ -377,8 +378,8 @@ if not GetOption('clean') and static_modules:
app_env['LIBS'].remove("pthread")
app_env['LIBS'].remove("dl")
@ -85,7 +89,7 @@ index 32cb644..650333a 100644
# now go through the rest of the libs, removing them from
# the environment at the same time
@@ -425,7 +430,7 @@ SConscript(dirs = build_dirs,
@@ -425,7 +426,7 @@ SConscript(dirs = build_dirs,
if not GetOption('clean'):
helpmap_status = subprocess.call(["racket", "makehelpmap.scm"], cwd="docs/helpmap")
if helpmap_status != 0:

4
pkgs/applications/misc/gremlin-console/default.nix
View file

@ -2,10 +2,10 @@
stdenv.mkDerivation rec {
pname = "gremlin-console";
version = "3.6.1";
version = "3.6.2";
src = fetchzip {
url = "https://downloads.apache.org/tinkerpop/${version}/apache-tinkerpop-gremlin-console-${version}-bin.zip";
sha256 = "sha256-lr3ffyAL8LBj7mt4EmN2Kq2pxvW4P7zd66gU9X4qzJw=";
sha256 = "sha256-c7uwXqmMrWDYZ9CpGuVoo1e5yWHsoNd0zihZKdCTg7E=";
};
nativeBuildInputs = [ makeWrapper ];

6
pkgs/applications/misc/josm/default.nix
View file

@ -3,15 +3,15 @@
}:
let
pname = "josm";
version = "18622";
version = "18646";
srcs = {
jar = fetchurl {
url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar";
hash = "sha256-AtV7Lj+z1GOCEl8xUaumYcN848pMsLIfMGmBXved6WU=";
hash = "sha256-nncN1cGpuVy4O3JeH56iQfwZGM5/xs3U/V+gVZbChOE=";
};
macosx = fetchurl {
url = "https://josm.openstreetmap.de/download/macosx/josm-macos-${version}-java17.zip";
hash = "sha256-q3Kr0YWe6Jm6wO6h7fMANKLCWKfU0zDpBZjRH662eSg=";
hash = "sha256-ihBEOl6WnIaA7x40D2HTdVIDb30BYnhlh0sQrbNA/SU=";
};
pkg = fetchsvn {
url = "https://josm.openstreetmap.de/svn/trunk/native/linux/tested";

6
pkgs/applications/misc/oxker/default.nix
View file

@ -2,14 +2,14 @@
rustPlatform.buildRustPackage rec {
pname = "oxker";
version = "0.1.11";
version = "0.2.1";
src = fetchCrate {
inherit pname version;
sha256 = "sha256-O4fVEYstDkVHn7fBVOGu1ok9K9xiO9uLx0+vb6qMZoA=";
sha256 = "sha256-CsfzQN7n/LsNIivJShDG02cHwPktkXl/0udBSPz0i2U=";
};
cargoHash = "sha256-LSMAE24E8Is/ejUE/2vogP0GmpF+9oO2pJoQOZ8OfU8=";
cargoHash = "sha256-FSuhG+ZSQzwj1YB3xs3A1uFWPhwK8FIfVfUY9V/J2Z8=";
meta = with lib; {
description = "A simple tui to view & control docker containers";

6
pkgs/applications/misc/process-compose/default.nix
View file

@ -8,13 +8,13 @@ let config-module = "github.com/f1bonacc1/process-compose/src/config";
in
buildGoModule rec {
pname = "process-compose";
version = "0.29.7";
version = "0.40.0";
src = fetchFromGitHub {
owner = "F1bonacc1";
repo = pname;
rev = "v${version}";
hash = "sha256-gVXil6Gc65/6VMuONfVyxU6SSV0vCbJKXDvtG4a+pbU=";
hash = "sha256-8gyALVW+ort76r/zevWAhZlJ/fg5DBmwUNvjZ21wWKY=";
# populate values that require us to use git. By doing this in postFetch we
# can delete .git afterwards and maintain better reproducibility of the src.
leaveDotGit = true;
@ -43,7 +43,7 @@ buildGoModule rec {
installShellFiles
];
vendorHash = "sha256-fL12Rx/0TF2jjciSHgfIDfrqdQxxm2JiGfgO3Dgz81M=";
vendorHash = "sha256-rbGKFZY9YEcBAFFxG6v3xaVLQxVoqIehN0LgINku3Xo=";
doCheck = false;

3
pkgs/applications/misc/todoist-electron/default.nix
View file

@ -38,7 +38,8 @@ stdenv.mkDerivation rec {
postFixup = ''
makeWrapper ${electron_21}/bin/electron $out/bin/${pname} \
--add-flags $out/share/${pname}/resources/app.asar \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}"
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ stdenv.cc.cc libsecret ]}" \
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}"
'';
meta = with lib; {

6
pkgs/applications/misc/usql/default.nix
View file

@ -10,18 +10,18 @@
buildGoModule rec {
pname = "usql";
version = "0.13.6";
version = "0.13.8";
src = fetchFromGitHub {
owner = "xo";
repo = "usql";
rev = "v${version}";
hash = "sha256-FmwsiCXSnTEvA1oAScJhnl1ZG7WTfbNQyJBULnNt9/c=";
hash = "sha256-oNsA9VM6MN2czeZSTFGvmCWX0T3iVaAhQk1mVRyKgWw=";
};
buildInputs = [ unixODBC icu ];
vendorHash = "sha256-lla+smDg6nNNQZYEQI5xY3iRw4gm6WCDh8gDZ6N9lqk=";
vendorHash = "sha256-LG5gTHXB1ItDZFbTBHyZGHZLaSYb8wekIHkahTMXzkk=";
proxyVendor = true;
# Exclude broken impala & hive driver

23
pkgs/applications/misc/ydict/default.nix
View file

@ -1,4 +1,9 @@
{ lib, fetchFromGitHub, buildGoModule }:
{ lib
, fetchFromGitHub
, buildGoModule
, makeWrapper
, mpg123
}:
buildGoModule rec {
pname = "ydict";
@ -13,16 +18,26 @@ buildGoModule rec {
vendorSha256 = "sha256-c5nQVQd4n978kFAAKcx5mX2Jz16ZOhS8iL/oxS1o5xs=";
ldflags = [ "-s" "-w" "-X=main.Version=${version}" ];
ldflags = [
"-s"
"-w"
"-X=main.Version=${version}"
];
nativeBuildInputs = [ makeWrapper ];
preFixup = ''
wrapProgram $out/bin/${pname} \
--prefix PATH ":" "${lib.makeBinPath [ mpg123 ]}";
'';
# has no tests
doCheck = false;
meta = with lib; {
description = "A command-line Chinese dictionary";
description = "Yet another command-line Youdao Chinese dictionary";
homepage = "https://github.com/TimothyYe/ydict";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ zendo ];
};
}

2
pkgs/applications/networking/browsers/firefox/common.nix
View file

@ -525,7 +525,7 @@ buildStdenv.mkDerivation ({
fi
# Extract the debug info.
header "separating debug info from $i (build ID $id)"
echo "separating debug info from $i (build ID $id)"
mkdir -p "$dst/''${id:0:2}"
$OBJCOPY --only-keep-debug "$i" "$dst/''${id:0:2}/''${id:2}.debug"

2
pkgs/applications/networking/browsers/firefox/wrapper.nix
View file

@ -15,6 +15,7 @@
, pciutils
, sndio
, libjack2
, speechd
}:
## configurability of the wrapper itself
@ -82,6 +83,7 @@ let
++ lib.optional sndioSupport sndio
++ lib.optional jackSupport libjack2
++ lib.optional smartcardSupport opensc
++ lib.optional (cfg.speechSynthesisSupport or false) speechd
++ pkcs11Modules;
gtk_modules = [ libcanberra-gtk3 ];

6
pkgs/applications/networking/cluster/acorn/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "acorn";
version = "0.4.2";
version = "0.5.0";
src = fetchFromGitHub {
owner = "acorn-io";
repo = pname;
rev = "v${version}";
hash = "sha256-IzjCYVQ9RhuAmgloue421F43ARviaHW7mTkLhLW/VPM=";
hash = "sha256-wrtuBme12pilFKDyzKWlZFUu99NQKgwnx2fUOfL+VAY=";
};
vendorHash = "sha256-z2ya/CgH9AcxHe73Yt9XWbJqH4OrZWt0bRDsna5hYeo=";
vendorHash = "sha256-9cq64397RB4KWVatuKXi1EwjolGEpwAc+tC1zs3boQ4=";
ldflags = [
"-s"

4
pkgs/applications/networking/cluster/argocd/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "argocd";
version = "2.5.8";
version = "2.5.9";
src = fetchFromGitHub {
owner = "argoproj";
repo = "argo-cd";
rev = "v${version}";
sha256 = "sha256-4L0xj4+NLThSLzXTncUnUILOsV3qr9+f8osv19OW6oI=";
sha256 = "sha256-RZ3bcuJmUUnucD2lhfxLU8vbrorVUowF8hAW9NGSmbI=";
};
proxyVendor = true; # darwin/linux hash mismatch

2
pkgs/applications/networking/cluster/fluxcd/default.nix
View file

@ -65,7 +65,7 @@ in buildGoModule rec {
'';
homepage = "https://fluxcd.io";
license = licenses.asl20;
maintainers = with maintainers; [ bryanasdev000 jlesquembre ];
maintainers = with maintainers; [ bryanasdev000 jlesquembre superherointj ];
mainProgram = "flux";
};
}

2
pkgs/applications/networking/cluster/k3s/default.nix
View file

@ -75,7 +75,7 @@ let
description = "A lightweight Kubernetes distribution";
license = licenses.asl20;
homepage = "https://k3s.io";
maintainers = with maintainers; [ euank mic92 ];
maintainers = with maintainers; [ euank mic92 superherointj ];
platforms = platforms.linux;
};

6
pkgs/applications/networking/cluster/k9s/default.nix
View file

@ -2,13 +2,13 @@
buildGoModule rec {
pname = "k9s";
version = "0.26.7";
version = "0.27.0";
src = fetchFromGitHub {
owner = "derailed";
repo = "k9s";
rev = "v${version}";
sha256 = "sha256-TshUQJIwGSqVP+YUJvSHSczvnvzr1kX761oIbfQzVzw=";
sha256 = "sha256-optEMGB6izGlpcq2AJOY4lTt8igYBilE0Bg8KxE8AsU=";
};
ldflags = [
@ -20,7 +20,7 @@ buildGoModule rec {
tags = [ "netgo" ];
vendorSha256 = "sha256-W0yU5rMUuO2JtKRZpexsCqIUy3h+2hSDRcq/lp0UHX8=";
vendorHash = "sha256-57JrBmund2hwcgqWkLos/h1EOgZQb9HfKUf1BX0MYGQ=";
# TODO investigate why some config tests are failing
doCheck = !(stdenv.isDarwin && stdenv.isAarch64);

6
pkgs/applications/networking/cluster/karmor/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "karmor";
version = "0.11.5";
version = "0.11.6";
src = fetchFromGitHub {
owner = "kubearmor";
repo = "kubearmor-client";
rev = "v${version}";
hash = "sha256-xVYhZT4yqbSmxGH5DaarXzrGYMS1BuTaQ2T+huWYLBw=";
hash = "sha256-toN/pIvmmMwIARhY1i/2nmrC5ZVyTR7pttqkyXNuMaE=";
};
vendorHash = "sha256-rlvAQ99/3+3VotyYAR2TgWG8ZdTKUT2XRv4hTF+QFpI=";
vendorHash = "sha256-TE+VPOhkTPqQTapxAcJzlQzRZfmb1J4pAWUKiTGLnZE=";
nativeBuildInputs = [ installShellFiles ];

6
pkgs/applications/networking/cluster/minikube/default.nix
View file

@ -12,9 +12,9 @@
buildGoModule rec {
pname = "minikube";
version = "1.28.0";
version = "1.29.0";
vendorSha256 = "sha256-CyIpzwSYHbv96UoQ/SZXOl6v3xn3pvT39ZO+RpVHU5I=";
vendorHash = "sha256-wRCSUDzz+1e4/ijwAnIM8a/AlnNNdVkiz3WO4Nhuy+M=";
doCheck = false;
@ -22,7 +22,7 @@ buildGoModule rec {
owner = "kubernetes";
repo = "minikube";
rev = "v${version}";
sha256 = "sha256-Gn/RXZedID0sh5qTcBNg7GeLtI1JZYKXEWg2RZGXlDw=";
sha256 = "sha256-rdcMgL7bzdlxrelui+V1APJik0v/4YyUqj9QlMRq1nI=";
};
nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ];

6
pkgs/applications/networking/cluster/nerdctl/default.nix
View file

@ -10,16 +10,16 @@
buildGoModule rec {
pname = "nerdctl";
version = "1.1.0";
version = "1.2.0";
src = fetchFromGitHub {
owner = "containerd";
repo = pname;
rev = "v${version}";
sha256 = "sha256-i178AN8LDm1SmCx3G8uLmW1+/F3B8DQsrkawSBoefGw=";
hash = "sha256-6AXki9/gJVlHpA3iSS1GqkLWaUqE0c+X8alWdMyCFiU=";
};
vendorSha256 = "sha256-0EWrFc55I3EmrAmmIYdsYtvO6xqDHbo5Uo6XC+NezZI=";
vendorHash = "sha256-28Wt9uQ7+PEWe+RaNv4HLz7HQbO7hXlX3O7s9SooLu8=";
nativeBuildInputs = [ makeWrapper installShellFiles ];

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

@ -442,22 +442,22 @@
"vendorHash": "sha256-aVbJT31IIgW0GYzwVX7kT4j7E+dadSbnttThh2lzGyE="
},
"google": {
"hash": "sha256-R104jYttXER/Pzd3ePHh9ZOvpcziuVQK0JcFqdbWtG0=",
"hash": "sha256-yxw+LtrBhfZlTVh36o3uUdt3zGo7VLTjk5Cc8xoqhio=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google",
"rev": "v4.50.0",
"rev": "v4.51.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o="
},
"google-beta": {
"hash": "sha256-OrotSvDNK7PC6nyHEAvmTOYgdYFiHEE8YwfWcOAbPsk=",
"hash": "sha256-KQxIi9EF59FTcWoiE5oTZx+lVV+Pb+PH0QIz02PztN4=",
"homepage": "https://registry.terraform.io/providers/hashicorp/google-beta",
"owner": "hashicorp",
"proxyVendor": true,
"repo": "terraform-provider-google-beta",
"rev": "v4.50.0",
"rev": "v4.51.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-oModEw/gaQCDHLf+2EKf1O1HQSGWnqEReXowE6F7W0o="
},
@ -571,13 +571,13 @@
"vendorHash": null
},
"ibm": {
"hash": "sha256-DvJow7KDyv1wGBw0QIQQ4MoLgQIT8+Cf6fjc7w4W7Ds=",
"hash": "sha256-Qdb5HpamjCNGlqSf3etFv0++Skrk/jm6UVBFsKGU+jw=",
"homepage": "https://registry.terraform.io/providers/IBM-Cloud/ibm",
"owner": "IBM-Cloud",
"repo": "terraform-provider-ibm",
"rev": "v1.49.0",
"rev": "v1.50.0",
"spdx": "MPL-2.0",
"vendorHash": "sha256-Vt1AKXJ8KRoDESFvUeZPTjUFm7gwP/Uji4hyU16GhjY="
"vendorHash": "sha256-JkmfZ9yz3r26j1SHIwnyNA+nYWAy4DoaWEMfFUTzD3Y="
},
"icinga2": {
"hash": "sha256-Y/Oq0aTzP+oSKPhHiHY9Leal4HJJm7TNDpcdqkUsCmk=",
@ -843,11 +843,11 @@
"vendorHash": null
},
"opennebula": {
"hash": "sha256-+EbEVwgo2HWmVhff7u5ohSJW8wuxK1kvWfvRWRwIP4o=",
"hash": "sha256-r8z5rpSvjNSDuvcRLtnOUFnBFFNAlcvfCbmW6LLHP5E=",
"homepage": "https://registry.terraform.io/providers/OpenNebula/opennebula",
"owner": "OpenNebula",
"repo": "terraform-provider-opennebula",
"rev": "v1.1.0",
"rev": "v1.1.1",
"spdx": "MPL-2.0",
"vendorHash": "sha256-zKtBDnvlQHe+q0OZUMUGu1gNsx2wIrIoArtJrt0VaBk="
},
@ -870,11 +870,11 @@
"vendorHash": "sha256-49ViIxICpvWgpv+uY0NTDvXGJthjH6aT38COfS+AOaQ="
},
"opsgenie": {
"hash": "sha256-NMaTTZQyEJ0vb+eDNTGRozTrme78Vo+/GuIR43AeDbU=",
"hash": "sha256-Wbe+DyK5wKuZZX8yd3DJN+2wT8KZt+YsBwJYKnZnfcI=",
"homepage": "https://registry.terraform.io/providers/opsgenie/opsgenie",
"owner": "opsgenie",
"repo": "terraform-provider-opsgenie",
"rev": "v0.6.19",
"rev": "v0.6.20",
"spdx": "MPL-2.0",
"vendorHash": null
},

6
pkgs/applications/networking/dnscontrol/default.nix
View file

@ -2,16 +2,16 @@
buildGoModule rec {
pname = "dnscontrol";
version = "3.24.0";
version = "3.25.0";
src = fetchFromGitHub {
owner = "StackExchange";
repo = pname;
rev = "v${version}";
sha256 = "sha256-+fOcFu52f2PiynF0B8r3zAW/ANypXx9inLnf4ZtwI2M=";
sha256 = "sha256-XH9o1DTwG5ne5TZDgsS4HfC5WqLXc16JtjkKQtiE8z0=";
};
vendorSha256 = "sha256-+43UegjFjh86vXjH1A4jbORk8xTDZaJRc41RhFPcESk=";
vendorSha256 = "sha256-iVyLNPvmzkI46Cp0SgbxK6xIQspJjpYjqPf3mOMoZvU=";
ldflags = [ "-s" "-w" ];

4
pkgs/applications/networking/instant-messengers/cinny/default.nix
View file

@ -4,11 +4,11 @@ let
configOverrides = writeText "cinny-config-overrides.json" (builtins.toJSON conf);
in stdenv.mkDerivation rec {
pname = "cinny";
version = "2.2.3";
version = "2.2.4";
src = fetchurl {
url = "https://github.com/ajbura/cinny/releases/download/v${version}/cinny-v${version}.tar.gz";
hash = "sha256-Q6f24LRYCxdgAguUVl7jf7srkd2L1IptiBgHJQq2dHE=";
hash = "sha256-BqxEZgI9uxoUpl/CJ2jSWjNIpfP2N392C4h/muBlhZY=";
};
installPhase = ''

22
pkgs/applications/networking/instant-messengers/deltachat-desktop/default.nix
View file

@ -21,17 +21,17 @@
let
libdeltachat' = libdeltachat.overrideAttrs (old: rec {
version = "1.106.0";
version = "1.107.0";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-core-rust";
rev = version;
hash = "sha256-S53ghVFb1qDI7MVNbc2ZlHqDN4VRBFQJCJg2J+w0erc=";
hash = "sha256-fjiS7GZy1BLgmxu4LFOWgucORcVx+9KleQcga+hRkSY=";
};
cargoDeps = rustPlatform.fetchCargoTarball {
inherit src;
name = "${old.pname}-${version}";
hash = "sha256-k4j814Ao7FAyd0w1nH2fuX1cJKjBkhPw0CVZqNU7Hqs=";
hash = "sha256-7XhSI/C0GEmsaL0UupvufB1bfPGbzSQJH720Y4/Do3o=";
};
});
esbuild' = esbuild.override {
@ -48,24 +48,16 @@ let
};
in buildNpmPackage rec {
pname = "deltachat-desktop";
version = "1.34.2";
version = "1.34.3";
src = fetchFromGitHub {
owner = "deltachat";
repo = "deltachat-desktop";
rev = "v${version}";
hash = "sha256-XOGfKa0eGVZKKKC0Pm2kw48XWWcrxCyDdYzCSKp+wco=";
hash = "sha256-6WZJD8lMsk1WNguMkXygBCTVpOzNkNuVZJ3Ygv6VBkM=";
};
patches = [
(fetchpatch {
name = "bump-electron-to-22.1.0.patch";
url = "https://github.com/deltachat/deltachat-desktop/commit/944d2735cda6cd5a95cb83c57484fbaf16720a9c.patch";
hash = "sha256-kaKi32eFQ3hGLZLjiXmH9qs4GXezcDQ7zTdT2+D8NcQ=";
})
];
npmDepsHash = "sha256-J3/S/jYQvO/U8StDtYI+jozon0d4VCdeqFX6x1hHzMo=";
npmDepsHash = "sha256-B91yQ/xi8+uyOllqYR7lZTfLBpJvZat1cIIJk9TkM/c=";
nativeBuildInputs = [
makeWrapper
@ -137,8 +129,6 @@ in buildNpmPackage rec {
];
});
passthru.updateScript = ./update.sh;
meta = with lib; {
description = "Email-based instant messaging for Desktop";
homepage = "https://github.com/deltachat/deltachat-desktop";

32
pkgs/applications/networking/instant-messengers/deltachat-desktop/update.sh
View file

@ -1,32 +0,0 @@
#! /usr/bin/env nix-shell
#! nix-shell -i bash -p coreutils curl gnused jq moreutils nix-prefetch prefetch-npm-deps
set -euo pipefail
cd "$(dirname "$0")"
owner=deltachat
repo=deltachat-desktop
nixpkgs=../../../../..
rev=$(
curl -s "https://api.github.com/repos/$owner/$repo/releases" |
jq 'map(select(.prerelease | not)) | .[0].tag_name' --raw-output
)
ver=$(echo "$rev" | sed 's/^v//')
old_ver=$(tac default.nix | sed -n 's/.*\bversion = "\(.*\)".*/\1/p' | head -1)
if [ "$ver" = "$old_ver" ]; then
echo "Up to date: $ver"
exit
fi
echo "$old_ver -> $ver"
hash=$(nix-prefetch -f "$nixpkgs" deltachat-desktop --rev "$rev")
tac default.nix \
| sed -e "0,/version = \".*\"/s//version = \"$ver\"/" \
-e "0,/hash = \".*\"/s//hash = \"${hash//\//\\/}\"/" \
| tac \
| sponge default.nix
src=$(nix-build "$nixpkgs" -A deltachat-desktop.src --no-out-link)
hash=$(prefetch-npm-deps $src/package-lock.json)
sed -i "s,npmDepsHash = \".*\",npmDepsHash = \"$hash\"," default.nix

4
pkgs/applications/networking/instant-messengers/pidgin/default.nix
View file

@ -9,11 +9,11 @@
let unwrapped = stdenv.mkDerivation rec {
pname = "pidgin";
version = "2.14.10";
version = "2.14.12";
src = fetchurl {
url = "mirror://sourceforge/pidgin/pidgin-${version}.tar.bz2";
sha256 = "sha256-RUsbkovGvLsYM1OvMPv95VlfIkWjQjoaRubJei3yKBA=";
sha256 = "sha256-KwUka+IIYF7buTrp7cB5WD1EniqXENttNI0X9ZAgpLc=";
};
nativeBuildInputs = [ makeWrapper intltool ];

4
pkgs/applications/networking/mullvad-vpn/default.nix
View file

@ -1,7 +1,7 @@
{ stdenv, lib, fetchurl, dpkg
, alsa-lib, atk, cairo, cups, dbus, expat, fontconfig, freetype
, gdk-pixbuf, glib, pango, nspr, nss, gtk3, mesa
, xorg, autoPatchelfHook, systemd, libnotify, libappindicator
, wayland, xorg, autoPatchelfHook, systemd, libnotify, libappindicator
, makeWrapper
}:
@ -63,7 +63,7 @@ stdenv.mkDerivation rec {
unpackPhase = "dpkg-deb -x $src .";
runtimeDependencies = [ (lib.getLib systemd) libnotify libappindicator ];
runtimeDependencies = [ (lib.getLib systemd) libnotify libappindicator wayland ];
installPhase = ''
runHook preInstall

1
pkgs/applications/networking/newsreaders/slrn/default.nix
View file

@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
configureFlags = [
"--with-slang=${slang.dev}"
"--with-ssl=${openssl.dev}"
"--with-slrnpull"
];
buildInputs = [ slang ncurses openssl ];

6
pkgs/applications/radio/flex-ndax/default.nix
View file

@ -2,18 +2,18 @@
buildGoModule rec {
pname = "flex-ndax";
version = "0.2-20221007.1";
version = "0.3-20230126.0";
src = fetchFromGitHub {
owner = "kc2g-flex-tools";
repo = "nDAX";
rev = "v${version}";
hash = "sha256-QldbiJnCjWrlXEPvyAqV5Xwz9YvsnVobVy/E/OB0A1k=";
hash = "sha256-co2S3DrdGeoNneqNyifd+Z1z5TshyD+FgHkiSRqK3SQ=";
};
buildInputs = [ libpulseaudio ];
vendorSha256 = "sha256-eHy8oFYicVONQr31LQQ9b5auzeBoIzbszw2buKaBQbQ=";
vendorHash = "sha256-eHy8oFYicVONQr31LQQ9b5auzeBoIzbszw2buKaBQbQ=";
meta = with lib; {
broken = stdenv.isDarwin;

6
pkgs/applications/radio/urh/default.nix
View file

@ -6,13 +6,13 @@
python3Packages.buildPythonApplication rec {
pname = "urh";
version = "2.9.3";
version = "2.9.4";
src = fetchFromGitHub {
owner = "jopohl";
repo = pname;
rev = "v${version}";
sha256 = "sha256-TrvyPcpSMACrbKPVOjxHsVsC28LmruiVO/CyCPh0KZ8=";
rev = "refs/tags/v${version}";
sha256 = "sha256-Hi0VqBtGeaXMsibxbHk+2FN8mzfpmkuDr37JRW4Fp+s=";
};
nativeBuildInputs = [ qt5.wrapQtAppsHook ];

4
pkgs/applications/science/biology/diamond/default.nix
View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "diamond";
version = "2.0.15";
version = "2.1.0";
src = fetchFromGitHub {
owner = "bbuchfink";
repo = "diamond";
rev = "v${version}";
sha256 = "17z9vwj58i1zc22gv4qscx0dk3nxf5ix443gxsibh3a5zsnc6dkg";
sha256 = "sha256-tcUVWfb/EtJ6heJjQ3989uNjkWa6FocReJ5gjE35AMY=";
};

4
pkgs/applications/terminal-emulators/xterm/default.nix
View file

@ -4,14 +4,14 @@
stdenv.mkDerivation rec {
pname = "xterm";
version = "377";
version = "378";
src = fetchurl {
urls = [
"ftp://ftp.invisible-island.net/xterm/${pname}-${version}.tgz"
"https://invisible-mirror.net/archives/xterm/${pname}-${version}.tgz"
];
hash = "sha256-2xCP56Rdjtl+YEchtYRDtHNknmHiY2Mb+HWfhhipkLI=";
hash = "sha256-ZJ37/V7dDtnkfPjk2VO0sNPDC8KAFm38T/0Ulz/sPpI=";
};
strictDeps = true;

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

@ -28,7 +28,7 @@ assert sendEmailSupport -> perlSupport;
assert svnSupport -> perlSupport;
let
version = "2.39.0";
version = "2.39.1";
svn = subversionClient.override { perlBindings = perlSupport; };
gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ];
in
@ -41,7 +41,7 @@ stdenv.mkDerivation (finalAttrs: {
src = fetchurl {
url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz";
sha256 = "sha256-uhmbE/tamco97JF7C9c2vA61qd+Hc31DXt398Q1pJls=";
sha256 = "sha256-QKOKCEezDDcbNYc7OvzxI4hd1B6j7Lv1EO+pfzzlwWE=";
};
outputs = [ "out" ] ++ lib.optional withManual "doc";

6
pkgs/applications/video/cinelerra/default.nix
View file

@ -44,13 +44,13 @@
stdenv.mkDerivation {
pname = "cinelerra-cv";
version = "unstable-2021-02-14";
version = "unstable-2023-01-29";
src = fetchFromGitHub {
owner = "cinelerra-cv-team";
repo = "cinelerra-cv";
rev = "7d0e8ede557d0cdf3606e0a8d97166a22f88d89e";
sha256 = "0n84y2wp47y89drc48cm1609gads5c6saw6c6bqcf5c5wcg1yfbj";
rev = "bb00ac6b70fcf3cf419348b56f9b264bc01c1a89";
sha256 = "11965kb3d7xcvlcf8p7jlzk9swk5i78x7wja4s3043wlzmqmwv0q";
};
preConfigure = ''

4
pkgs/applications/video/mpv/scripts/mpvacious.nix
View file

@ -8,13 +8,13 @@
stdenvNoCC.mkDerivation rec {
pname = "mpvacious";
version = "0.18";
version = "0.20";
src = fetchFromGitHub {
owner = "Ajatt-Tools";
repo = "mpvacious";
rev = "v${version}";
sha256 = "sha256-FiYEpZVaeJQVSXa9obFYSKNVASJolOBm5D3faOlCzNY=";
sha256 = "sha256-9Lf7MVaJ5eC5Gb1PdGBvtENU8AAVq2jsUkY3wJfztt8=";
};
postPatch = ''

6
pkgs/applications/video/mpv/scripts/sponsorblock.nix
View file

@ -3,13 +3,13 @@
# Usage: `pkgs.mpv.override { scripts = [ pkgs.mpvScripts.sponsorblock ]; }`
stdenvNoCC.mkDerivation {
pname = "mpv_sponsorblock";
version = "unstable-2022-09-24";
version = "unstable-2023-01-30";
src = fetchFromGitHub {
owner = "po5";
repo = "mpv_sponsorblock";
rev = "248d108c1280e05de551c42867aebb72cf0c83b9";
sha256 = "1aacchyci34xyx7rcyd2r02i4rlqq8q61l6dcci8yd4g4hjiqqld";
rev = "7785c1477103f2fafabfd65fdcf28ef26e6d7f0d";
sha256 = "sha256-iUXaTWWFEdxhxClu2NYbQcThlvYty3A2dEYGooeAVAQ=";
};
dontBuild = true;

25
pkgs/applications/video/w_scan2/default.nix Normal file
View file

@ -0,0 +1,25 @@
{
lib,
stdenv,
fetchFromGitHub,
}:
stdenv.mkDerivation rec {
pname = "w_scan2";
version = "1.0.14";
src = fetchFromGitHub {
owner = "stefantalpalaru";
repo = "w_scan2";
rev = version;
sha256 = "sha256-fDFAJ4EMwu4X1Go3jkRjwA66xDY4tJ5wCKlEdZUT4qQ=";
};
meta = {
description = "A small channel scan tool which generates ATSC, DVB-C, DVB-S/S2 and DVB-T/T2 channels.conf files";
homepage = "https://github.com/stefantalpalaru/w_scan2";
platforms = lib.platforms.linux;
maintainers = with lib.maintainers; [ _0x4A6F ] ;
license = lib.licenses.gpl2Only;
};
}

6
pkgs/applications/virtualization/conmon-rs/default.nix
View file

@ -7,19 +7,19 @@
rustPlatform.buildRustPackage rec {
pname = "conmon-rs";
version = "0.4.0";
version = "0.5.0";
src = fetchFromGitHub {
owner = "containers";
repo = pname;
rev = "v${version}";
sha256 = "sha256-VwVJWf9tKZ5rVF8tXDf35zsS2PipqC8FPbXUpOzsw/Y=";
sha256 = "sha256-mngs5ivRyMJ927VV00mFNIG+nD9EuE3qLyN+OHMMkHQ=";
};
nativeBuildInputs = [ capnproto protobuf ];
doCheck = false;
cargoSha256 = "sha256-zY9fsZK1C3HnCxeNA5dCbQQHYx3IVDMHCHYwFh5ev2k=";
cargoSha256 = "sha256-ruChRz2rnPalBiXcpco/WS/eDgg52ckPBLBuoQa9us4=";
meta = with lib; {
description = "An OCI container runtime monitor written in Rust";

70
pkgs/applications/window-managers/dwl/default.nix
View file

@ -1,36 +1,42 @@
{ lib
, stdenv
, fetchFromGitHub
, installShellFiles
, libX11
, libinput
, libxcb
, libxkbcommon
, pixman
, pkg-config
, substituteAll
, wayland
, wayland-protocols
, wlroots
, wlroots_0_16
, writeText
, enable-xwayland ? true, xwayland, libX11
, xcbutilwm
, xwayland
, enableXWayland ? true
, conf ? null
, patches ? [ ]
}:
let
totalPatches = patches ++ [ ];
wlroots = wlroots_0_16;
in
stdenv.mkDerivation rec {
stdenv.mkDerivation (self: {
pname = "dwl";
version = "0.3.1";
version = "0.4";
src = fetchFromGitHub {
owner = "djpohly";
repo = pname;
rev = "v${version}";
hash = "sha256-VHxBjjnzJNmtJxrm3ywJzvt2bNHGk/Cx8TICw6SaoiQ=";
repo = "dwl";
rev = "v${self.version}";
hash = "sha256-OW7K7yMYSzqZWpQ9Vmpy8EgdWvyv3q1uh8A40f6AQF4=";
};
nativeBuildInputs = [ pkg-config ];
nativeBuildInputs = [
installShellFiles
pkg-config
];
buildInputs = [
libinput
@ -40,18 +46,13 @@ stdenv.mkDerivation rec {
wayland
wayland-protocols
wlroots
] ++ lib.optionals enable-xwayland [
] ++ lib.optionals enableXWayland [
libX11
xcbutilwm
xwayland
];
# Allow users to set their own list of patches
patches = totalPatches;
# Last line of config.mk enables XWayland
prePatch = lib.optionalString enable-xwayland ''
sed -i -e '$ s|^#||' config.mk
'';
outputs = [ "out" "man" ];
# Allow users to set an alternative config.def.h
postPatch = let
@ -60,21 +61,19 @@ stdenv.mkDerivation rec {
else writeText "config.def.h" conf;
in lib.optionalString (conf != null) "cp ${configFile} config.def.h";
NIX_CFLAGS_COMPILE = [
# https://github.com/djpohly/dwl/issues/186
"-Wno-error=unused-result"
];
dontConfigure = true;
installPhase = ''
runHook preInstall
install -d $out/bin
install -m755 dwl $out/bin
runHook postInstall
preBuild = ''
makeFlagsArray+=(
XWAYLAND=${if enableXWayland then "-DXWAYLAND" else ""}
XLIBS=${if enableXWayland then "xcb\\ xcb-icccm" else ""}
)
'';
meta = with lib; {
installFlags = [
"PREFIX=$(out)"
"MANDIR=$(man)/share/man/man1"
];
meta = {
homepage = "https://github.com/djpohly/dwl/";
description = "Dynamic window manager for Wayland";
longDescription = ''
@ -88,9 +87,10 @@ stdenv.mkDerivation rec {
- Limited to 2000 SLOC to promote hackability
- Tied to as few external dependencies as possible
'';
license = licenses.gpl3Only;
maintainers = with maintainers; [ AndersonTorres ];
changelog = "https://github.com/djpohly/dwl/releases/tag/v${self.version}";
license = lib.licenses.gpl3Only;
maintainers = [ lib.maintainers.AndersonTorres ];
inherit (wayland.meta) platforms;
};
}
})
# TODO: custom patches from upstream website

4
pkgs/applications/window-managers/icewm/default.nix
View file

@ -41,13 +41,13 @@
stdenv.mkDerivation (finalAttrs: {
pname = "icewm";
version = "3.3.0";
version = "3.3.1";
src = fetchFromGitHub {
owner = "ice-wm";
repo = "icewm";
rev = finalAttrs.version;
hash = "sha256-Zl7ob0JcFN8sl8Zuf2aB7l7q3W8GmvVBoI1W3aLLXfU=";
hash = "sha256-2gEZRkym21X4rvj6kzZh9WChZUkfqgS1wiWh7LBioZM=";
};
nativeBuildInputs = [

22
pkgs/applications/window-managers/leftwm/0001-patch-version.patch Normal file
View file

@ -0,0 +1,22 @@
diff --git a/Cargo.lock b/Cargo.lock
index ac3125a..c02b11d 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -431,7 +431,7 @@ dependencies = [
[[package]]
name = "leftwm"
-version = "0.4.0"
+version = "0.4.1"
dependencies = [
"anyhow",
"clap",
@@ -467,7 +467,7 @@ dependencies = [
[[package]]
name = "leftwm-core"
-version = "0.4.0"
+version = "0.4.1"
dependencies = [
"dirs-next",
"futures",

12
pkgs/applications/window-managers/leftwm/default.nix
View file

@ -6,16 +6,20 @@ in
rustPlatform.buildRustPackage rec {
pname = "leftwm";
version = "0.4.0";
version = "0.4.1";
src = fetchFromGitHub {
owner = "leftwm";
repo = "leftwm";
rev = version;
sha256 = "sha256-4f9YOVkOXn7+TzTUZS2Lultgj9WhiOPUa/fHUeyLBUU=";
sha256 = "sha256-ZAlX8Vu4JAwQlwBOHT435Bz3g3qqK5ePm9v0cDqP8Q4=";
};
cargoSha256 = "sha256-D00IFTELRlqeKQ7zheJKTvu5FBgYQXsZ+OnPnVzweC4=";
cargoSha256 = "sha256-nn/P9ZZNf1Zts4JiJ2kXWAAG/HT1GnlYHXcPijYiBlU=";
cargoPatches = [
./0001-patch-version.patch
];
buildInputs = rpathLibs;
@ -33,7 +37,7 @@ rustPlatform.buildRustPackage rec {
homepage = "https://github.com/leftwm/leftwm";
license = licenses.mit;
platforms = platforms.linux;
maintainers = with maintainers; [ ];
maintainers = with maintainers; [ yanganto ];
changelog = "https://github.com/leftwm/leftwm/blob/${version}/CHANGELOG";
};
}

12
pkgs/build-support/cc-wrapper/default.nix
View file

@ -321,6 +321,11 @@ stdenv.mkDerivation {
&& !(stdenv.targetPlatform.useLLVM or false)
&& gccForLibs != null) ''
echo "--gcc-toolchain=${gccForLibs}" >> $out/nix-support/cc-cflags
# Pull in 'cc.out' target to get 'libstdc++fs.a'. It should be in
# 'cc.lib'. But it's a gcc package bug.
# TODO(trofi): remove once gcc is fixed to move libraries to .lib output.
echo "-L${gccForLibs}/${optionalString (targetPlatform != hostPlatform) "/${targetPlatform.config}"}/lib" >> $out/nix-support/cc-ldflags
''
##
@ -338,11 +343,18 @@ stdenv.mkDerivation {
# compile, because it uses "#include_next <limits.h>" to find the
# limits.h file in ../includes-fixed. To remedy the problem,
# another -idirafter is necessary to add that directory again.
#
# We use --sysroot=/nix/store/does/not/exist to drop embedded default
# path to glibc headers gcc was built against. Without it -idirafter
# only appends to the list and outdated glibc headers end up being
# used. 'cc-cflags-before' is used to allow user's --sysroot= option
# to override our default.
+ optionalString (libc != null) (''
touch "$out/nix-support/libc-cflags"
touch "$out/nix-support/libc-ldflags"
echo "-B${libc_lib}${libc.libdir or "/lib/"}" >> $out/nix-support/libc-crt1-cflags
'' + optionalString (!(cc.langD or false)) ''
echo "--sysroot=/nix/store/does/not/exist" >> $out/nix-support/cc-cflags-before
echo "-idirafter ${libc_dev}${libc.incdir or "/include"}" >> $out/nix-support/libc-cflags
'' + optionalString (isGNU && (!(cc.langD or false))) ''
for dir in "${cc}"/lib/gcc/*/*/include-fixed; do

4
pkgs/build-support/fetchbzr/builder.sh
View file

@ -1,10 +1,8 @@
if [ -e .attrs.sh ]; then source .attrs.sh; fi
source "$stdenv/setup"
header "exporting \`$url' (revision $rev) into \`$out'"
echo "exporting \`$url' (revision $rev) into \`$out'"
# Perform a lightweight checkout so that we don't end up importing
# all the repository's history.
BZR_LOG=/dev/null bzr -Ossl.cert_reqs=none export -r "$rev" --format=dir "$out" "$url"
stopNest

2
pkgs/build-support/fetchcvs/builder.sh
View file

@ -24,5 +24,3 @@ else
fi
(cd export && cvs -f -z0 -d "$cvsRoot" export $tag "$module")
mv export/* $out
stopNest

4
pkgs/build-support/fetchdarcs/builder.sh
View file

@ -11,10 +11,8 @@ elif test -n "$context"; then
tagflags="--context=$context"
fi
header "getting $url $partial ${tagtext} into $out"
echo "getting $url $partial ${tagtext} into $out"
darcs get --lazy $tagflags "$url" "$out"
# remove metadata, because it can change
rm -rf "$out/_darcs"
stopNest

3
pkgs/build-support/fetchdocker/fetchdocker-builder.sh
View file

@ -1,6 +1,6 @@
if [ -e .attrs.sh ]; then source .attrs.sh; fi
source "${stdenv}/setup"
header "exporting ${repository}/${imageName} (tag: ${tag}) into ${out}"
echo "exporting ${repository}/${imageName} (tag: ${tag}) into ${out}"
mkdir -p "${out}"
cat <<EOF > "${out}/compositeImage.sh"
@ -26,4 +26,3 @@ ${gnutar}/bin/tar \
-c "${manifest}" "${repositories}" -T "${imageFileStorePaths}"
EOF
chmod +x "${out}/compositeImage.sh"
stopNest

6
pkgs/build-support/fetchdocker/generic-fetcher.nix
View file

@ -36,7 +36,7 @@ stdenv.mkDerivation {
inherit name;
builder = writeText "${fetcher}-builder.sh" ''
source "$stdenv/setup"
header "${fetcher} exporting to $out"
echo "${fetcher} exporting to $out"
declare -A creds
@ -49,7 +49,7 @@ stdenv.mkDerivation {
fi
if [ -f "$dockerCredentialsFile" ]; then
header "using credentials from $dockerCredentialsFile"
echo "using credentials from $dockerCredentialsFile"
CREDSFILE=$(cat "$dockerCredentialsFile")
creds[token]=$(${awk} -F'=' '/DOCKER_TOKEN/ {print $2}' <<< "$CREDSFILE" | head -n1)
@ -77,8 +77,6 @@ stdenv.mkDerivation {
${layerDigestFlag} \
"${repository}/${imageName}" \
"${tag}"
stopNest
'';
buildInputs = [ haskellPackages.hocker ];

2
pkgs/build-support/fetchfirefoxaddon/default.nix
View file

@ -29,7 +29,7 @@ stdenv.mkDerivation {
builder = writeScript "xpibuilder" ''
source $stdenv/setup
header "firefox addon $name into $out"
echo "firefox addon $name into $out"
UUID="${extid}"
mkdir -p "$out/$UUID"

4
pkgs/build-support/fetchfossil/builder.sh
View file

@ -1,6 +1,6 @@
if [ -e .attrs.sh ]; then source .attrs.sh; fi
source $stdenv/setup
header "Cloning Fossil $url [$rev] into $out"
echo "Cloning Fossil $url [$rev] into $out"
# Fossil, bless its adorable little heart, wants to write global configuration
# to $HOME/.fossil. AFAICT, there is no way to disable this functionality.
@ -19,5 +19,3 @@ popd
# Just nuke the checkout file.
rm $out/.fslckout
stopNest

3
pkgs/build-support/fetchgit/builder.sh
View file

@ -6,7 +6,7 @@
if [ -e .attrs.sh ]; then source .attrs.sh; fi
source $stdenv/setup
header "exporting $url (rev $rev) into $out"
echo "exporting $url (rev $rev) into $out"
$SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" \
${leaveDotGit:+--leave-dotGit} \
@ -18,4 +18,3 @@ $SHELL $fetcher --builder --url "$url" --out "$out" --rev "$rev" \
${branchName:+--branch-name "$branchName"}
runHook postFetch
stopNest

4
pkgs/build-support/fetchhg/builder.sh
View file

@ -1,10 +1,8 @@
if [ -e .attrs.sh ]; then source .attrs.sh; fi
source $stdenv/setup
header "getting $url${rev:+ ($rev)} into $out"
echo "getting $url${rev:+ ($rev)} into $out"
hg clone --insecure "$url" hg-clone
hg archive -q$subrepoClause -y ${rev:+-r "$rev"} --cwd hg-clone $out
rm -f $out/.hg_archival.txt
stopNest

12
pkgs/build-support/fetchmtn/builder.sh
View file

@ -8,7 +8,7 @@ if ! [ -f "$cacheDB" ]; then
mtn --db "$cacheDB" db init
fi
header "getting revision $selector";
echo "getting revision $selector";
done=;
for source in $dbs; do
@ -32,9 +32,7 @@ for source in $dbs; do
fi;
done;
stopNest;
header "checking out the revision $revision";
echo "checking out the revision $revision";
if test -n "$done"; then
mtn checkout --db "$cacheDB" -r "$revision" "$out" -b "${branch}"
@ -43,10 +41,6 @@ else
exit 1;
fi;
stopNest
header "clearing _MTN in the output"
echo "clearing _MTN in the output"
rm -rf "$out/_MTN"
stopNest

4
pkgs/build-support/fetchsvn/builder.sh
View file

@ -1,7 +1,7 @@
if [ -e .attrs.sh ]; then source .attrs.sh; fi
source $stdenv/setup
header "exporting $url (r$rev) into $out"
echo "exporting $url (r$rev) into $out"
if test -n "$http_proxy"; then
# Configure proxy
@ -22,5 +22,3 @@ fi;
svn export --trust-server-cert --non-interactive \
${ignoreExternals:+--ignore-externals} ${ignoreKeywords:+--ignore-keywords} \
-r "$rev" "$url" "$out"
stopNest

4
pkgs/build-support/fetchsvnssh/builder.sh
View file

@ -1,7 +1,7 @@
if [ -e .attrs.sh ]; then source .attrs.sh; fi
source $stdenv/setup
header "exporting $url (r$rev) into $out"
echo "exporting $url (r$rev) into $out"
if test "$sshSupport"; then
export SVN_SSH="$openssh/bin/ssh"
@ -12,5 +12,3 @@ fi
# whether the server is being spoofed --- only the cryptographic
# hash of the output matters.
expect -f $sshSubversion "$username" "$password" "$rev" "$url" $out
stopNest

2
pkgs/build-support/fetchurl/builder.sh
View file

@ -37,7 +37,7 @@ if [ -n "$downloadToTemp" ]; then downloadedFile="$TMPDIR/file"; fi
tryDownload() {
local url="$1"
echo
header "trying $url"
echo "trying $url"
local curlexit=18;
success=

5
pkgs/build-support/pkg-config-wrapper/default.nix
View file

@ -46,14 +46,11 @@ stdenv.mkDerivation {
strictDeps = true;
dontBuild = true;
dontConfigure = true;
dontUnpack = true;
# Additional flags passed to pkg-config.
addFlags = lib.optional stdenv.targetPlatform.isStatic "--static";
unpackPhase = ''
src=$PWD
'';
installPhase =
''
mkdir -p $out/bin $out/nix-support

6
pkgs/build-support/release/debian-build.nix
View file

@ -43,9 +43,8 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
[ ! -f /etc/lsb-release ] || (source /etc/lsb-release; echo "OS release: $DISTRIB_DESCRIPTION")
echo "System/kernel: $(uname -a)"
if test -e /etc/debian_version; then echo "Debian release: $(cat /etc/debian_version)"; fi
header "installed Debian packages"
echo "installed Debian packages"
dpkg-query --list
stopNest
'';
installPhase = ''
@ -73,11 +72,10 @@ vmTools.runInLinuxImage (stdenv.mkDerivation (
[ "$(echo $out/debs/*.deb)" != "" ]
for i in $out/debs/*.deb; do
header "Generated DEB package: $i"
echo "Generated DEB package: $i"
dpkg-deb --info "$i"
pkgName=$(dpkg-deb -W "$i" | awk '{print $1}')
echo "file deb $i" >> $out/nix-support/hydra-build-products
stopNest
done
dpkg -i $out/debs/*.deb

3
pkgs/build-support/release/nix-build.nix
View file

@ -74,10 +74,9 @@ stdenv.mkDerivation (
if test -n "$succeedOnFailure"; then
if test -n "$keepBuildDirectory"; then
KEEPBUILDDIR="$out/`basename $TMPDIR`"
header "Copying build directory to $KEEPBUILDDIR"
echo "Copying build directory to $KEEPBUILDDIR"
mkdir -p $KEEPBUILDDIR
cp -R "$TMPDIR/"* $KEEPBUILDDIR
stopNest
fi
fi
'';

3
pkgs/build-support/release/source-tarball.nix
View file

@ -64,10 +64,9 @@ stdenv.mkDerivation (
if test -n "$succeedOnFailure"; then
if test -n "$keepBuildDirectory"; then
KEEPBUILDDIR="$out/`basename $TMPDIR`"
header "Copying build directory to $KEEPBUILDDIR"
echo "Copying build directory to $KEEPBUILDDIR"
mkdir -p $KEEPBUILDDIR
cp -R "$TMPDIR/"* $KEEPBUILDDIR
stopNest
fi
fi
'';

4
pkgs/build-support/setup-hooks/audit-tmpdir.sh
View file

@ -13,7 +13,7 @@ auditTmpdir() {
local dir="$1"
[ -e "$dir" ] || return 0
header "checking for references to $TMPDIR/ in $dir..."
echo "checking for references to $TMPDIR/ in $dir..."
local i
find "$dir" -type f -print0 | while IFS= read -r -d $'\0' i; do
@ -36,6 +36,4 @@ auditTmpdir() {
fi
done
stopNest
}

7
pkgs/build-support/setup-hooks/auto-patchelf.py
View file

@ -131,7 +131,14 @@ def populate_cache(initial: List[Path], recursive: bool =False) -> None:
if not path.is_file():
continue
# As an optimisation, resolve the symlinks here, as the target is unique
# XXX: (layus, 2022-07-25) is this really an optimisation in all cases ?
# It could make the rpath bigger or break the fragile precedence of $out.
resolved = path.resolve()
# Do not use resolved paths when names do not match
if resolved.name != path.name:
resolved = path
try:
with open_elf(path) as elf:
osabi = get_osabi(elf)

3
pkgs/build-support/setup-hooks/canonicalize-jars.sh
View file

@ -6,12 +6,11 @@ fixupOutputHooks+=('if [ -z "$dontCanonicalizeJars" -a -e "$prefix" ]; then cano
canonicalizeJarsIn() {
local dir="$1"
header "canonicalizing jars in $dir"
echo "canonicalizing jars in $dir"
dir="$(realpath -sm -- "$dir")"
while IFS= read -rd '' f; do
canonicalizeJar "$f"
done < <(find -- "$dir" -type f -name '*.jar' -print0)
stopNest
}
source @canonicalize_jar@

2
pkgs/build-support/setup-hooks/make-binary-wrapper/default.nix
View file

@ -10,6 +10,8 @@
}:
makeSetupHook {
name = "make-binary-wrapper-hook";
deps = [ dieHook ]
# https://github.com/NixOS/nixpkgs/issues/148189
++ lib.optional (stdenv.isDarwin && stdenv.isAarch64) cc;

4
pkgs/build-support/setup-hooks/make-symlinks-relative.sh
View file

@ -6,8 +6,8 @@ postFixupHooks+=(_makeSymlinksRelative)
_makeSymlinksRelative() {
local symlinkTarget
if [ -n "${dontRewriteSymlinks-}" ]; then
return 0
if [ "${dontRewriteSymlinks-}" ] || [ ! -e "$prefix" ]; then
return
fi
while IFS= read -r -d $'\0' f; do

26
pkgs/build-support/setup-hooks/multiple-outputs.sh
View file

@ -4,16 +4,32 @@ preFixupHooks+=(_multioutDocs)
preFixupHooks+=(_multioutDevs)
postFixupHooks+=(_multioutPropagateDev)
# Assign the first string containing nonempty variable to the variable named $1
# _assignFirst varName otherVarNames*
#
# Set the value of the variable named $varName to the first of otherVarNames
# that refers to a non-empty variable name.
#
# If none of otherVarNames refers to a non-empty variable, the error message is
# specific to this function's use case, which is setting up the output variables.
_assignFirst() {
local varName="$1"
local REMOVE=REMOVE # slightly hacky - we allow REMOVE (i.e. not a variable name)
shift
while (( $# )); do
if [ -n "${!1-}" ]; then eval "${varName}"="$1"; return; fi
shift
for var in "$@"; do
if [ -n "${!var-}" ]; then eval "${varName}"="${var}"; return; fi
done
echo "Error: _assignFirst found no valid variant!"
echo
echo "error: _assignFirst: could not find a non-empty variable to assign to ${varName}."
echo " The following variables were all unset or empty:"
echo " $*"
if [ -z "${out:-}" ]; then
echo ' If you do not want an "out" output in your derivation, make sure to define'
echo ' the other specific required outputs. This can be achieved by picking one'
echo " of the above as an output."
echo ' You do not have to remove "out" if you want to have a different default'
echo ' output, because the first output is taken as a default.'
echo
fi
return 1 # none found
}

2
pkgs/build-support/setup-hooks/patch-shebangs.sh
View file

@ -100,8 +100,6 @@ patchShebangs() {
fi
fi
done < <(find "$@" -type f -perm -0100 -print0)
stopNest
}
patchShebangsAuto () {

8
pkgs/build-support/setup-hooks/postgresql-test-hook/postgresql-test-hook.sh
View file

@ -53,7 +53,7 @@ EOF
echo >&2 'initdb not found. Did you add postgresql to the nativeCheckInputs?'
false
fi
header 'initializing postgresql'
echo 'initializing postgresql'
initdb -U postgres
# Move the socket
@ -65,10 +65,10 @@ EOF
echo "listen_addresses = ''" >>"$PGDATA/postgresql.conf"
fi
header 'starting postgresql'
echo 'starting postgresql'
eval "${postgresqlStartCommands:-pg_ctl start}"
header 'setting up postgresql'
echo 'setting up postgresql'
eval "$postgresqlTestSetupCommands"
runHook postgresqlTestSetupPost
@ -76,6 +76,6 @@ EOF
}
postgresqlStop() {
header 'stopping postgresql'
echo 'stopping postgresql'
pg_ctl stop
}

2
pkgs/build-support/setup-hooks/separate-debug-info.sh
View file

@ -26,7 +26,7 @@ _separateDebugInfo() {
fi
# Extract the debug info.
header "separating debug info from $i (build ID $id)"
echo "separating debug info from $i (build ID $id)"
mkdir -p "$dst/${id:0:2}"
# This may fail, e.g. if the binary is for a different

2
pkgs/build-support/setup-hooks/strip.sh
View file

@ -36,7 +36,7 @@ _doStrip() {
local -n ranlibCmd="${ranlibCmds[$i]}"
# `dontStrip` disables them all
if [[ "${dontStrip-}" || "${flag-}" ]] || ! type -f "${stripCmd-}" 2>/dev/null
if [[ "${dontStrip-}" || "${flag-}" ]] || ! type -f "${stripCmd-}" 2>/dev/null 1>&2
then continue; fi
stripDirs "$stripCmd" "$ranlibCmd" "$debugDirList" "${stripDebugFlags[*]:--S}"

11
pkgs/build-support/trivial-builders.nix
View file

@ -546,6 +546,7 @@ rec {
* # writes a Linux-exclusive setup hook where @bash@ myscript.sh is substituted for the
* # bash interpreter.
* myhellohookSub = makeSetupHook {
* name = "myscript-hook";
* deps = [ hello ];
* substitutions = { bash = "${pkgs.bash}/bin/bash"; };
* meta.platforms = lib.platforms.linux;
@ -553,13 +554,21 @@ rec {
*
* # setup hook with a package test
* myhellohookTested = makeSetupHook {
* name = "myscript-hook";
* deps = [ hello ];
* substitutions = { bash = "${pkgs.bash}/bin/bash"; };
* meta.platforms = lib.platforms.linux;
* passthru.tests.greeting = callPackage ./test { };
* } ./myscript.sh;
*/
makeSetupHook = { name ? "hook", deps ? [], substitutions ? {}, meta ? {}, passthru ? {} }: script:
makeSetupHook =
{ name ? lib.warn "calling makeSetupHook without passing a name is deprecated." "hook"
, deps ? []
, substitutions ? {}
, meta ? {}
, passthru ? {}
}:
script:
runCommand name
(substitutions // {
inherit meta;

6
pkgs/build-support/vm/default.nix
View file

@ -527,9 +527,8 @@ rec {
echo "System/kernel: $(uname -a)"
if test -e /etc/fedora-release; then echo "Fedora release: $(cat /etc/fedora-release)"; fi
if test -e /etc/SuSE-release; then echo "SUSE release: $(cat /etc/SuSE-release)"; fi
header "installed RPM packages"
echo "installed RPM packages"
rpm -qa --qf "%{Name}-%{Version}-%{Release} (%{Arch}; %{Distribution}; %{Vendor})\n"
stopNest
'';
buildPhase = ''
@ -559,9 +558,8 @@ rec {
find $rpmout -name "*.rpm" -exec cp {} $out/$outDir \;
for i in $out/$outDir/*.rpm; do
header "Generated RPM/SRPM: $i"
echo "Generated RPM/SRPM: $i"
rpm -qip $i
stopNest
done
eval "$postInstall"

35
pkgs/data/fonts/comfortaa/default.nix
View file

@ -1,28 +1,37 @@
{ lib, fetchFromGitHub }:
{ lib, stdenvNoCC, fetchFromGitHub }:
let
version = "2021-07-29";
in fetchFromGitHub rec {
name = "comfortaa-${version}";
stdenvNoCC.mkDerivation rec {
pname = "comfortaa";
version = "unstable-2021-07-29";
owner = "googlefonts";
repo = "comfortaa";
rev = "2a87ac6f6ea3495150bfa00d0c0fb53dd0a2f11b";
src = fetchFromGitHub {
owner = "googlefonts";
repo = pname;
rev = "2a87ac6f6ea3495150bfa00d0c0fb53dd0a2f11b";
postFetch = ''
# Remove the OTF fonts as they are not needed and cause a hash mismatch
rm -rf $out/fonts/{OTF,otf}
'';
hash = "sha256-4ZBRaQyYlnt9l4NgBHezuCnR3rKTJ37L41RTbGAhd0M=";
};
dontBuild = true;
installPhase = ''
runHook preInstall
postFetch = ''
tar -xf $downloadedFile --strip=1
mkdir -p $out/share/fonts/truetype $out/share/doc/comfortaa
cp fonts/TTF/*.ttf $out/share/fonts/truetype
cp FONTLOG.txt README.md $out/share/doc/comfortaa
'';
sha256 = "12ad7qy11q49iv9h3l2d7x7y7kf0hxbqhclb92bzwig8dzly9n2k";
runHook postInstall
'';
meta = with lib; {
homepage = "http://aajohan.deviantart.com/art/Comfortaa-font-105395949";
description = "A clean and modern font suitable for headings and logos";
license = licenses.ofl;
platforms = platforms.all;
maintainers = [maintainers.rycee];
maintainers = [ maintainers.rycee ];
};
}

6
pkgs/data/fonts/undefined-medium/default.nix
View file

@ -2,11 +2,11 @@
stdenvNoCC.mkDerivation rec {
pname = "undefined-medium";
version = "1.0";
version = "1.1";
src = fetchzip {
url = "https://github.com/andirueckel/undefined-medium/archive/v1.0.zip";
hash = "sha256-HG+V7jR7dDI6LeoiCg/8F38lW8Zdo6CyLj2DXy/ff64=";
url = "https://github.com/andirueckel/undefined-medium/archive/v1.1.zip";
hash = "sha256-iquxt7lo92y4AQZf23Ij5Qzg2U7buL3kGLksQSR6vac=";
};
installPhase = ''

2
pkgs/desktops/plasma-5/default.nix
View file

@ -130,7 +130,7 @@ let
kdeplasma-addons = callPackage ./kdeplasma-addons.nix { };
kgamma5 = callPackage ./kgamma5.nix { };
khotkeys = callPackage ./khotkeys.nix { };
kinfocenter = callPackage ./kinfocenter.nix { };
kinfocenter = callPackage ./kinfocenter { };
kmenuedit = callPackage ./kmenuedit.nix { };
kpipewire = callPackage ./kpipewire.nix { };
kscreen = callPackage ./kscreen.nix { };

62
pkgs/desktops/plasma-5/kinfocenter.nix
View file

@ -1,62 +0,0 @@
{ mkDerivation
, lib
, extra-cmake-modules
, kdoctools
, qtbase
, kcmutils
, kcompletion
, kconfig
, kconfigwidgets
, kcoreaddons
, kdbusaddons
, kdeclarative
, ki18n
, kiconthemes
, kio
, kirigami2
, kpackage
, kservice
, kwayland
, kwidgetsaddons
, kxmlgui
, solid
, systemsettings
, libraw1394
, libGLU
, pciutils
}:
mkDerivation {
pname = "kinfocenter";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils
kcompletion
kconfig
kconfigwidgets
kcoreaddons
kdbusaddons
kdeclarative
ki18n
kiconthemes
kio
kirigami2
kpackage
kservice
kwayland
kwidgetsaddons
kxmlgui
solid
systemsettings
libraw1394
libGLU
pciutils
];
preFixup = ''
# fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in
# the same directory, while it is actually located in a completely different
# store path
ln -sf ${lib.getBin systemsettings}/bin/systemsettings5 $out/bin/kinfocenter
'';
}

51
pkgs/desktops/plasma-5/kinfocenter/0001-tool-paths.patch Normal file
View file

@ -0,0 +1,51 @@
diff --git a/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in b/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in
index f591b9c..e883212 100644
--- a/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in
+++ b/Modules/kwinsupportinfo/kcm_kwinsupportinfo.json.in
@@ -63,6 +63,6 @@
"Name[x-test]": "xxWindow Managerxx",
"Name[zh_CN]": "窗口管理器"
},
- "TryExec": "@QtBinariesDir@/qdbus",
+ "TryExec": "@qdbus@",
"X-KDE-KInfoCenter-Category": "graphical_information"
}
diff --git a/Modules/kwinsupportinfo/main.cpp b/Modules/kwinsupportinfo/main.cpp
index 667c079..b727b67 100644
--- a/Modules/kwinsupportinfo/main.cpp
+++ b/Modules/kwinsupportinfo/main.cpp
@@ -19,7 +19,7 @@ public:
explicit KCMKWinSupportInfo(QObject *parent, const KPluginMetaData &data, const QVariantList &args)
: ConfigModule(parent, data, args)
{
- auto outputContext = new CommandOutputContext(QLibraryInfo::location(QLibraryInfo::BinariesPath) + QStringLiteral("/qdbus"),
+ auto outputContext = new CommandOutputContext(QStringLiteral("@qdbus@"),
{QStringLiteral("org.kde.KWin"), QStringLiteral("/KWin"), QStringLiteral("supportInformation")},
parent);
qmlRegisterSingletonInstance("org.kde.kinfocenter.kwinsupportinfo.private", 1, 0, "InfoOutputContext", outputContext);
diff --git a/Modules/xserver/kcm_xserver.json b/Modules/xserver/kcm_xserver.json
index 04acd6b..24b8f36 100644
--- a/Modules/xserver/kcm_xserver.json
+++ b/Modules/xserver/kcm_xserver.json
@@ -130,7 +130,7 @@
"Name[zh_CN]": "X 服务器",
"Name[zh_TW]": "X 伺服器"
},
- "TryExec": "xdpyinfo",
+ "TryExec": "@xdpyinfo@",
"X-DocPath": "kinfocenter/graphical.html#xserver",
"X-KDE-KInfoCenter-Category": "graphical_information",
"X-KDE-Keywords": "X,X-Server,XServer,XFree86,Display,VideoCard,System Information",
diff --git a/Modules/xserver/main.cpp b/Modules/xserver/main.cpp
index c406ff7..a261b90 100644
--- a/Modules/xserver/main.cpp
+++ b/Modules/xserver/main.cpp
@@ -17,7 +17,7 @@ public:
explicit KCMXServer(QObject *parent, const KPluginMetaData &data, const QVariantList &args)
: ConfigModule(parent, data, args)
{
- auto outputContext = new CommandOutputContext(QStringLiteral("xdpyinfo"), {}, parent);
+ auto outputContext = new CommandOutputContext(QStringLiteral("@xdpyinfo@"), {}, parent);
qmlRegisterSingletonInstance("org.kde.kinfocenter.xserver.private", 1, 0, "InfoOutputContext", outputContext);
auto *about = new KAboutData(QStringLiteral("kcm_xserver"), i18nc("@label kcm name", "X-Server"), QStringLiteral("1.0"), QString(), KAboutLicense::GPL);

104
pkgs/desktops/plasma-5/kinfocenter/default.nix Normal file
View file

@ -0,0 +1,104 @@
{ mkDerivation
, lib
, extra-cmake-modules
, kdoctools
, qtbase
, qttools
, kcmutils
, kcompletion
, kconfig
, kconfigwidgets
, kcoreaddons
, kdbusaddons
, kdeclarative
, ki18n
, kiconthemes
, kio
, kirigami2
, kpackage
, kservice
, kwayland
, kwidgetsaddons
, kxmlgui
, solid
, systemsettings
, dmidecode
, fwupd
, libraw1394
, libusb1
, libGLU
, pciutils
, smartmontools
, util-linux
, vulkan-tools
, wayland-utils
, xdpyinfo
}:
let
inherit (lib) getBin getExe;
qdbus = "${getBin qttools}/bin/qdbus";
in
mkDerivation {
pname = "kinfocenter";
nativeBuildInputs = [ extra-cmake-modules kdoctools ];
buildInputs = [
kcmutils
kcompletion
kconfig
kconfigwidgets
kcoreaddons
kdbusaddons
kdeclarative
ki18n
kiconthemes
kio
kirigami2
kpackage
kservice
kwayland
kwidgetsaddons
kxmlgui
solid
systemsettings
dmidecode
fwupd
libraw1394
libusb1
libGLU
pciutils
smartmontools
util-linux
vulkan-tools
wayland-utils
xdpyinfo
];
patches = [
./0001-tool-paths.patch
];
postPatch = ''
for f in Modules/kwinsupportinfo/{kcm_kwinsupportinfo.json.in,main.cpp}; do
substituteInPlace $f \
--replace "@qdbus@" "${qdbus}"
done
for f in Modules/xserver/{kcm_xserver.json,main.cpp}; do
substituteInPlace $f \
--replace "@xdpyinfo@" "${getExe xdpyinfo}"
done
'';
# fix wrong symlink of infocenter pointing to a 'systemsettings5' binary in
# the same directory, while it is actually located in a completely different
# store path
preFixup = ''
ln -sf ${lib.getExe systemsettings} $out/bin/kinfocenter
'';
}

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