Merge branch 'master' into HEAD

This commit is contained in:
Robert Hensing 2024-03-07 18:39:12 +01:00
commit 7d2a83e6c2
442 changed files with 3523 additions and 5115 deletions

View file

@ -2,47 +2,87 @@
rec { rec {
/* Throw if pred is false, else return pred. /**
Intended to be used to augment asserts with helpful error messages. Throw if pred is false, else return pred.
Intended to be used to augment asserts with helpful error messages.
Example: # Inputs
assertMsg false "nope"
stderr> error: nope
assert assertMsg ("foo" == "bar") "foo is not bar, silly"; "" `pred`
stderr> error: foo is not bar, silly
Type: : Predicate that needs to succeed, otherwise `msg` is thrown
assertMsg :: Bool -> String -> Bool
`msg`
: Message to throw in case `pred` fails
# Type
```
assertMsg :: Bool -> String -> Bool
```
# Examples
:::{.example}
## `lib.asserts.assertMsg` usage example
```nix
assertMsg false "nope"
stderr> error: nope
assert assertMsg ("foo" == "bar") "foo is not bar, silly"; ""
stderr> error: foo is not bar, silly
```
:::
*/ */
# TODO(Profpatsch): add tests that check stderr # TODO(Profpatsch): add tests that check stderr
assertMsg = assertMsg =
# Predicate that needs to succeed, otherwise `msg` is thrown
pred: pred:
# Message to throw in case `pred` fails
msg: msg:
pred || builtins.throw msg; pred || builtins.throw msg;
/* Specialized `assertMsg` for checking if `val` is one of the elements /**
of the list `xs`. Useful for checking enums. Specialized `assertMsg` for checking if `val` is one of the elements
of the list `xs`. Useful for checking enums.
Example: # Inputs
let sslLibrary = "libressl";
in assertOneOf "sslLibrary" sslLibrary [ "openssl" "bearssl" ]
stderr> error: sslLibrary must be one of [
stderr> "openssl"
stderr> "bearssl"
stderr> ], but is: "libressl"
Type: `name`
assertOneOf :: String -> ComparableVal -> List ComparableVal -> Bool
: The name of the variable the user entered `val` into, for inclusion in the error message
`val`
: The value of what the user provided, to be compared against the values in `xs`
`xs`
: The list of valid values
# Type
```
assertOneOf :: String -> ComparableVal -> List ComparableVal -> Bool
```
# Examples
:::{.example}
## `lib.asserts.assertOneOf` usage example
```nix
let sslLibrary = "libressl";
in assertOneOf "sslLibrary" sslLibrary [ "openssl" "bearssl" ]
stderr> error: sslLibrary must be one of [
stderr> "openssl"
stderr> "bearssl"
stderr> ], but is: "libressl"
```
:::
*/ */
assertOneOf = assertOneOf =
# The name of the variable the user entered `val` into, for inclusion in the error message
name: name:
# The value of what the user provided, to be compared against the values in `xs`
val: val:
# The list of valid values
xs: xs:
assertMsg assertMsg
(lib.elem val xs) (lib.elem val xs)
@ -50,29 +90,51 @@ rec {
lib.generators.toPretty {} xs}, but is: ${ lib.generators.toPretty {} xs}, but is: ${
lib.generators.toPretty {} val}"; lib.generators.toPretty {} val}";
/* Specialized `assertMsg` for checking if every one of `vals` is one of the elements /**
of the list `xs`. Useful for checking lists of supported attributes. Specialized `assertMsg` for checking if every one of `vals` is one of the elements
of the list `xs`. Useful for checking lists of supported attributes.
Example: # Inputs
let sslLibraries = [ "libressl" "bearssl" ];
in assertEachOneOf "sslLibraries" sslLibraries [ "openssl" "bearssl" ]
stderr> error: each element in sslLibraries must be one of [
stderr> "openssl"
stderr> "bearssl"
stderr> ], but is: [
stderr> "libressl"
stderr> "bearssl"
stderr> ]
Type: `name`
assertEachOneOf :: String -> List ComparableVal -> List ComparableVal -> Bool
: The name of the variable the user entered `val` into, for inclusion in the error message
`vals`
: The list of values of what the user provided, to be compared against the values in `xs`
`xs`
: The list of valid values
# Type
```
assertEachOneOf :: String -> List ComparableVal -> List ComparableVal -> Bool
```
# Examples
:::{.example}
## `lib.asserts.assertEachOneOf` usage example
```nix
let sslLibraries = [ "libressl" "bearssl" ];
in assertEachOneOf "sslLibraries" sslLibraries [ "openssl" "bearssl" ]
stderr> error: each element in sslLibraries must be one of [
stderr> "openssl"
stderr> "bearssl"
stderr> ], but is: [
stderr> "libressl"
stderr> "bearssl"
stderr> ]
```
:::
*/ */
assertEachOneOf = assertEachOneOf =
# The name of the variable the user entered `val` into, for inclusion in the error message
name: name:
# The list of values of what the user provided, to be compared against the values in `xs`
vals: vals:
# The list of valid values
xs: xs:
assertMsg assertMsg
(lib.all (val: lib.elem val xs) vals) (lib.all (val: lib.elem val xs) vals)

View file

@ -98,6 +98,24 @@ in
} }
''; '';
}; };
initialPrefs = mkOption {
type = types.attrs;
description = lib.mdDoc ''
Initial preferences are used to configure the browser for the first run.
Unlike {option}`programs.chromium.extraOpts`, initialPrefs can be changed by users in the browser settings.
More information can be found in the Chromium documentation:
<https://www.chromium.org/administrators/configuring-other-preferences/>
'';
default = {};
example = literalExpression ''
{
"first_run_tabs" = [
"https://nixos.org/"
];
}
'';
};
}; };
}; };
@ -110,6 +128,7 @@ in
{ source = "${cfg.plasmaBrowserIntegrationPackage}/etc/chromium/native-messaging-hosts/org.kde.plasma.browser_integration.json"; }; { source = "${cfg.plasmaBrowserIntegrationPackage}/etc/chromium/native-messaging-hosts/org.kde.plasma.browser_integration.json"; };
"chromium/policies/managed/default.json" = lib.mkIf (defaultProfile != {}) { text = builtins.toJSON defaultProfile; }; "chromium/policies/managed/default.json" = lib.mkIf (defaultProfile != {}) { text = builtins.toJSON defaultProfile; };
"chromium/policies/managed/extra.json" = lib.mkIf (cfg.extraOpts != {}) { text = builtins.toJSON cfg.extraOpts; }; "chromium/policies/managed/extra.json" = lib.mkIf (cfg.extraOpts != {}) { text = builtins.toJSON cfg.extraOpts; };
"chromium/initial_preferences" = lib.mkIf (cfg.initialPrefs != {}) { text = builtins.toJSON cfg.initialPrefs; };
# for google-chrome https://www.chromium.org/administrators/linux-quick-start # for google-chrome https://www.chromium.org/administrators/linux-quick-start
"opt/chrome/native-messaging-hosts/org.kde.plasma.browser_integration.json" = lib.mkIf cfg.enablePlasmaBrowserIntegration "opt/chrome/native-messaging-hosts/org.kde.plasma.browser_integration.json" = lib.mkIf cfg.enablePlasmaBrowserIntegration
{ source = "${cfg.plasmaBrowserIntegrationPackage}/etc/opt/chrome/native-messaging-hosts/org.kde.plasma.browser_integration.json"; }; { source = "${cfg.plasmaBrowserIntegrationPackage}/etc/opt/chrome/native-messaging-hosts/org.kde.plasma.browser_integration.json"; };

View file

@ -66,6 +66,10 @@ in {
"0.0.0.0@53" "0.0.0.0@53"
"::@53" "::@53"
]; ];
listen-quic = [
"0.0.0.0@853"
"::@853"
];
automatic-acl = true; automatic-acl = true;
}; };
@ -129,8 +133,13 @@ in {
key = "xfr_key"; key = "xfr_key";
}; };
remote.primary-quic = {
address = "192.168.0.1@853";
key = "xfr_key";
quic = true;
};
template.default = { template.default = {
master = "primary";
# zonefileless setup # zonefileless setup
# https://www.knot-dns.cz/docs/2.8/html/operation.html#example-2 # https://www.knot-dns.cz/docs/2.8/html/operation.html#example-2
zonefile-sync = "-1"; zonefile-sync = "-1";
@ -139,8 +148,14 @@ in {
}; };
zone = { zone = {
"example.com".file = "example.com.zone"; "example.com" = {
"sub.example.com".file = "sub.example.com.zone"; master = "primary";
file = "example.com.zone";
};
"sub.example.com" = {
master = "primary-quic";
file = "sub.example.com.zone";
};
}; };
log.syslog.any = "debug"; log.syslog.any = "debug";

View file

@ -2,12 +2,12 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "airwindows-lv2"; pname = "airwindows-lv2";
version = "26.2"; version = "28.0";
src = fetchFromSourcehut { src = fetchFromSourcehut {
owner = "~hannes"; owner = "~hannes";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-GpfglGC7zD275lm9OsBmqDC90E/vVUqslm7HjPgm74M="; sha256 = "sha256-1GWkdNCn98ttsF2rPLZE0+GJdatgkLewFQyx9Frr2sM=";
}; };
nativeBuildInputs = [ meson ninja pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config ];

View file

@ -18,13 +18,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cava"; pname = "cava";
version = "0.10.0"; version = "0.10.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "karlstav"; owner = "karlstav";
repo = "cava"; repo = "cava";
rev = version; rev = version;
hash = "sha256-AQR1qc6HgkUkXBRf7kGy4QdtfCj+YVDlYSEIWOutkTk="; hash = "sha256-hndlEuKbI8oHvm0dosO0loQAw/U2qasoJ+4K8JG7I2Q=";
}; };
buildInputs = [ buildInputs = [

View file

@ -41,13 +41,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "easyeffects"; pname = "easyeffects";
version = "7.1.3"; version = "7.1.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "wwmm"; owner = "wwmm";
repo = "easyeffects"; repo = "easyeffects";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-OJy8HhojfpUwWo3zg+FgdFI4pMzWA61VMsdPE03MfeE="; hash = "sha256-UNS7kHyxHB4VneELXGn2G8T8EeKUpjb1ib2q0G+gf/s=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gbsplay"; pname = "gbsplay";
version = "0.0.95"; version = "0.0.96";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mmitch"; owner = "mmitch";
repo = "gbsplay"; repo = "gbsplay";
rev = version; rev = version;
sha256 = "sha256-s6TGAWwIm2raXk3kA3D0/fg+Hn3O/lerPlxGOryXIBQ="; sha256 = "sha256-2sYPP+urcSP67mHzbjRiL9BYgkIpONr7fPPbGQmBOqU=";
}; };
configureFlags = [ configureFlags = [

View file

@ -24,13 +24,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "giada"; pname = "giada";
version = "0.26.1"; version = "1.0.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "monocasual"; owner = "monocasual";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-tONxVxzOFbwnuaW6YoHVZOmgd5S11qz38hcI+yQgjrQ="; sha256 = "sha256-vTOUS9mI4B3yRNnM2dNCH7jgMuD3ztdhe1FMgXUIt58=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View file

@ -3,11 +3,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "linuxsampler"; pname = "linuxsampler";
version = "2.2.0"; version = "2.3.0";
src = fetchurl { src = fetchurl {
url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2"; url = "https://download.linuxsampler.org/packages/${pname}-${version}.tar.bz2";
sha256 = "sha256-xNFjxrrC0B8Oj10HIQ1AmI7pO34HuYRyyUaoB2MDmYw="; sha256 = "sha256-Ii+dylTUXmazP8NVjAAMdHs7NK+puml0IrF4fc6DEls=";
}; };
preConfigure = '' preConfigure = ''

View file

@ -12,20 +12,23 @@
, withPulseAudio ? false, libpulseaudio , withPulseAudio ? false, libpulseaudio
, withPortAudio ? false, portaudio , withPortAudio ? false, portaudio
, withMPRIS ? true, withNotify ? true, dbus , withMPRIS ? true, withNotify ? true, dbus
, nix-update-script
, testers
, ncspot
}: }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "ncspot"; pname = "ncspot";
version = "1.0.0"; version = "1.1.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hrkfdn"; owner = "hrkfdn";
repo = "ncspot"; repo = "ncspot";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-NHrpJC6cF/YAcyqZ4bRQdSdjDNhkEV7U2P/S4LSADao="; hash = "sha256-RgA3jV/vD6qgIVQCZ0Sm+9CST4SlqN4MUurVM3nIdh0=";
}; };
cargoHash = "sha256-HT084XewXwZByL5KZhyymqU7sy99SAjYIWysm3qGvWU="; cargoHash = "sha256-8ZUgm1O4NmZpxgNRKnh1MNhiFNoBWQHo22kyP3hWJwI=";
nativeBuildInputs = [ pkg-config ] nativeBuildInputs = [ pkg-config ]
++ lib.optional withClipboard python3; ++ lib.optional withClipboard python3;
@ -53,12 +56,22 @@ rustPlatform.buildRustPackage rec {
++ lib.optional withMPRIS "mpris" ++ lib.optional withMPRIS "mpris"
++ lib.optional withNotify "notify"; ++ lib.optional withNotify "notify";
postInstall = ''
install -D --mode=444 $src/misc/ncspot.desktop $out/share/applications/${pname}.desktop
install -D --mode=444 $src/images/logo.svg $out/share/icons/hicolor/scalable/apps/${pname}.png
'';
passthru = {
updateScript = nix-update-script { };
tests.version = testers.testVersion { package = ncspot; };
};
meta = with lib; { meta = with lib; {
description = "Cross-platform ncurses Spotify client written in Rust, inspired by ncmpc and the likes"; description = "Cross-platform ncurses Spotify client written in Rust, inspired by ncmpc and the likes";
homepage = "https://github.com/hrkfdn/ncspot"; homepage = "https://github.com/hrkfdn/ncspot";
changelog = "https://github.com/hrkfdn/ncspot/releases/tag/v${version}"; changelog = "https://github.com/hrkfdn/ncspot/releases/tag/v${version}";
license = licenses.bsd2; license = licenses.bsd2;
maintainers = [ maintainers.marsam ]; maintainers = with maintainers; [ marsam liff ];
mainProgram = "ncspot"; mainProgram = "ncspot";
}; };
} }

View file

@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "praat"; pname = "praat";
version = "6.4.05"; version = "6.4.06";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "praat"; owner = "praat";
repo = "praat"; repo = "praat";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-ctCDxE//vH4i22bKYBs14pdmp+1M6K+w7Tm22ZoGOf8="; hash = "sha256-eZYNXNmxrvI+jR1UEgXrsUTriZ8zTTwM9cEy7HgiZzs=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -16,13 +16,13 @@ let
in in
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "psst"; pname = "psst";
version = "unstable-2024-01-28"; version = "unstable-2024-03-04";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "jpochyla"; owner = "jpochyla";
repo = pname; repo = pname;
rev = "38422b1795c98d8d0e3bc8dc479d12f8d5bd7154"; rev = "0cb4f6964b5ba771182ccfe005260a86a494ef92";
hash = "sha256-VTbjlSfkbon38IPBCazwrZtWR8dH9mE0sSVIlmxcUks="; hash = "sha256-W+MFToyvYDQuC/8DqigvENxzJ6QGQOAeAdmdWG6+qZk=";
}; };
cargoLock = { cargoLock = {

View file

@ -51,7 +51,7 @@ index fcbd491..2d71ee3 100644
-pub const GIT_VERSION: &str = git_version!(); -pub const GIT_VERSION: &str = git_version!();
-pub const BUILD_TIME: &str = include!(concat!(env!("OUT_DIR"), "/build-time.txt")); -pub const BUILD_TIME: &str = include!(concat!(env!("OUT_DIR"), "/build-time.txt"));
-pub const REMOTE_URL: &str = include!(concat!(env!("OUT_DIR"), "/remote-url.txt")); -pub const REMOTE_URL: &str = include!(concat!(env!("OUT_DIR"), "/remote-url.txt"));
+pub const GIT_VERSION: &str = "38422b1795c98d8d0e3bc8dc479d12f8d5bd7154"; +pub const GIT_VERSION: &str = "0cb4f6964b5ba771182ccfe005260a86a494ef92";
+pub const BUILD_TIME: &str = "1970-01-01 00:00:00"; +pub const BUILD_TIME: &str = "1970-01-01 00:00:00";
+pub const REMOTE_URL: &str = "https://github.com/jpochyla/psst"; +pub const REMOTE_URL: &str = "https://github.com/jpochyla/psst";

View file

@ -13,11 +13,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "puredata"; pname = "puredata";
version = "0.54-0"; version = "0.54-1";
src = fetchurl { src = fetchurl {
url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz"; url = "http://msp.ucsd.edu/Software/pd-${version}.src.tar.gz";
hash = "sha256-6MFKfYV5CWxuOsm1V4LaYChIRIlx0Qcwah5SbtBFZIU="; hash = "sha256-hcPUvTYgtAHntdWEeHoFIIKylMTE7us1g9dwnZP9BMI=";
}; };
nativeBuildInputs = [ autoreconfHook gettext makeWrapper ]; nativeBuildInputs = [ autoreconfHook gettext makeWrapper ];

View file

@ -12,14 +12,14 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rhvoice"; pname = "rhvoice";
version = "1.8.0"; version = "1.14.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "RHVoice"; owner = "RHVoice";
repo = "RHVoice"; repo = "RHVoice";
rev = version; rev = version;
fetchSubmodules = true; fetchSubmodules = true;
hash = "sha256-G5886rjBaAp0AXcr07O0q7K1OXTayfIbd4zniKwDiLw="; hash = "sha256-eduKnxSTIDTxcW3ExueNxVKf8SjmXkVeTfHvJ0eyBPY=";
}; };
patches = [ patches = [

View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "snd"; pname = "snd";
version = "24.0"; version = "24.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/snd/snd-${version}.tar.gz"; url = "mirror://sourceforge/snd/snd-${version}.tar.gz";
sha256 = "sha256-DU7AtPoLH+WXXsmree8GbHePvNYmPP7MxYSfhEzgOtU="; sha256 = "sha256-hC6GddYjBD6p4zwHD3fCvZZLwpRiNKOb6aaHstRhA1M=";
}; };
nativeBuildInputs = [ pkg-config ]; nativeBuildInputs = [ pkg-config ];

View file

@ -33,16 +33,16 @@ assert lib.assertOneOf "withAudioBackend" withAudioBackend [ "" "alsa" "pulseaud
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "spotify-player"; pname = "spotify-player";
version = "0.16.3"; version = "0.17.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "aome510"; owner = "aome510";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-8naLLHAVGB8ow88XjU3BpnNzY3SFC2F5uYin67hMc0E="; hash = "sha256-fGDIlkTaRg+J6YcP9iBcJFuYm9F0UOA+v/26hhdg9/o=";
}; };
cargoHash = "sha256-NcNEZoERGOcMedLGJE7q9V9plx/7JSnbguZPFD1f4Qg="; cargoHash = "sha256-oZNydOnD2+6gLAsT3YTSlWSQ06EftS7Tl/AvlTbL84U=";
nativeBuildInputs = [ nativeBuildInputs = [
pkg-config pkg-config

View file

@ -45,7 +45,7 @@ in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "touchosc"; pname = "touchosc";
version = "1.2.7.190"; version = "1.2.9.200";
suffix = { suffix = {
aarch64-linux = "linux-arm64"; aarch64-linux = "linux-arm64";
@ -56,9 +56,9 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb"; url = "https://hexler.net/pub/${pname}/${pname}-${version}-${suffix}.deb";
hash = { hash = {
aarch64-linux = "sha256-VUsT14miAkCjaGWwcsREBgd5uhKLOIHaH9/jfQECVZ4="; aarch64-linux = "sha256-JrpwD4xD4t9e3qmBCl6hfHv/InnRBRsYIsNNrxwQojo=";
armv7l-linux = "sha256-x5zpeuIEfimiGmM9YWBSaXknIZdpO9RzQjE/bYMt16g="; armv7l-linux = "sha256-8e50jznyHUJt9aL5K/emp0T8VSLdXMuBl6KCMot8kIY=";
x86_64-linux = "sha256-LdMDFNHIWBcaAf+q2JPOm8MqtkaQ+6Drrqkyrrpx6MM="; x86_64-linux = "sha256-lQi1HFW53LdS6Q86s0exp0WmTMTz4g48yZC73DaM2lo=";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
}; };

View file

@ -25,13 +25,13 @@
mkDerivation rec { mkDerivation rec {
pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc"; pname = "bitcoin" + lib.optionalString (!withGui) "d" + "-abc";
version = "0.28.10"; version = "0.28.11";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bitcoin-ABC"; owner = "bitcoin-ABC";
repo = "bitcoin-abc"; repo = "bitcoin-abc";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-Z43ksM9LX7augeP8VQ1wrfCCoLLS8zuGfnrWbLvdh50="; hash = "sha256-JOAEaz9b89qIpHOJ+aHMu8RVpEvzuVtFv8plUMKcmlM=";
}; };
nativeBuildInputs = [ pkg-config cmake ]; nativeBuildInputs = [ pkg-config cmake ];

View file

@ -8,7 +8,7 @@
let let
pname = "trezor-suite"; pname = "trezor-suite";
version = "24.2.2"; version = "24.2.4";
name = "${pname}-${version}"; name = "${pname}-${version}";
suffix = { suffix = {
@ -19,8 +19,8 @@ let
src = fetchurl { src = fetchurl {
url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage";
hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' hash = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/'
aarch64-linux = "sha512-8ws6umKaHGJQNRp6JV+X4W347bQeO1XSLRgJcLU2A+3qH8U7o/6G9rbTMhRlFNsDtIfyqWjn5W5FcXmZCk7kFw=="; aarch64-linux = "sha512-25nyubEf4Vkjz6jumoQwmqTppJdby0vBVztF2eGZmLA81qysx9cpHboVKqQM3dEPBlYO7EVNSeW9d7qEenweBA==";
x86_64-linux = "sha512-s1MwQeEYmOM+OxdqryP3FaZEMxOk5c9nHvxZerSe+jXQMkQLhy0ivXCIz2KXoxUxxEiVgwu/uemv19FLy+q0MQ=="; x86_64-linux = "sha512-oI7D6eRSzUzMphgJByYFsQ1xcHTKj+SOuDG+8Pb7nX8HVb8tiRqKY+ZZ87LAJppM75eXvf3X1hRNRk5PlI2ELA==";
}.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}");
}; };

View file

@ -1,5 +1,5 @@
{ lib { lib
, mkDerivation , stdenv
, fetchurl , fetchurl
, cmake , cmake
, pkg-config , pkg-config
@ -10,13 +10,13 @@
, desktop-file-utils , desktop-file-utils
}: }:
mkDerivation rec { stdenv.mkDerivation rec {
pname = "molsketch"; pname = "molsketch";
version = "0.8.0"; version = "0.8.1";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/molsketch/Molsketch-${version}-src.tar.gz"; url = "mirror://sourceforge/molsketch/Molsketch-${version}-src.tar.gz";
hash = "sha256-Mpx4fHktxqBAkmdwqg2pXvEgvvGUQPbgqxKwXKjhJuQ="; hash = "sha256-6wFvl3Aktv8RgEdI2ENsKallKlYy/f8Tsm5C0FB/igI=";
}; };
patches = [ patches = [
@ -54,5 +54,6 @@ mkDerivation rec {
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
maintainers = [ maintainers.moni ]; maintainers = [ maintainers.moni ];
mainProgram = "molsketch"; mainProgram = "molsketch";
platforms = platforms.unix;
}; };
} }

View file

@ -5,7 +5,7 @@
, ffmpeg , ffmpeg
, discord-rpc , discord-rpc
, libedit , libedit
, libelf , elfutils
, libepoxy , libepoxy
, libsForQt5 , libsForQt5
, libzip , libzip
@ -49,7 +49,7 @@ stdenv.mkDerivation (finalAttrs: {
SDL2 SDL2
ffmpeg ffmpeg
libedit libedit
libelf elfutils
libepoxy libepoxy
libzip libzip
lua lua

View file

@ -12,14 +12,14 @@
python3Packages.buildPythonPackage rec { python3Packages.buildPythonPackage rec {
pname = "hydrus"; pname = "hydrus";
version = "559"; version = "564";
format = "other"; format = "other";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hydrusnetwork"; owner = "hydrusnetwork";
repo = "hydrus"; repo = "hydrus";
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-+aYrqt1sifCe6/qS4kZyx0CLSHEoutFk6cyxmOXmN7Q="; hash = "sha256-U2Z04bFrSJBCk6RwLcKr/x+Pia9V5UHjpUi8AzaCf9o=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -6,7 +6,7 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "lightburn"; pname = "lightburn";
version = "1.5.00"; version = "1.5.02";
nativeBuildInputs = [ nativeBuildInputs = [
p7zip p7zip
@ -15,7 +15,7 @@ stdenv.mkDerivation rec {
src = fetchurl { src = fetchurl {
url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z"; url = "https://github.com/LightBurnSoftware/deployment/releases/download/${version}/LightBurn-Linux64-v${version}.7z";
sha256 = "sha256-KnhwulPpYdN6x1n9TD89Gv1Y20tSmKWT2WcuhoTMg3Y="; sha256 = "sha256-1gmiPWrNk3T8WJ9u/4UzrhwxOcPUKyWIqtwqJiXA4c4=";
}; };
buildInputs = [ buildInputs = [

View file

@ -5,13 +5,13 @@
mkDerivation rec { mkDerivation rec {
pname = "yacreader"; pname = "yacreader";
version = "9.13.1"; version = "9.14.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "YACReader"; owner = "YACReader";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-kiacyHA/G0TnRH/96RqDTF7vdDnf2POMw/iSgtSRbmM="; sha256 = "sha256-gQ4Aaapini6j3lCtowFbrfwbe91aFl50hp1EfxTO8uY=";
}; };
nativeBuildInputs = [ qmake pkg-config ]; nativeBuildInputs = [ qmake pkg-config ];

View file

@ -9,25 +9,25 @@
let let
pname = "1password"; pname = "1password";
version = if channel == "stable" then "8.10.26" else "8.10.28-11.BETA"; version = if channel == "stable" then "8.10.27" else "8.10.28-11.BETA";
sources = { sources = {
stable = { stable = {
x86_64-linux = { x86_64-linux = {
url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz"; url = "https://downloads.1password.com/linux/tar/stable/x86_64/1password-${version}.x64.tar.gz";
hash = "sha256-w2Msl8eSQGX6euRcNJY4rET2yJpLWyfWzqvf0veFDU0="; hash = "sha256-xQQXPDC8mvQyC+z3y0n5KpRpLjrBeslwXPf28wfKVSM=";
}; };
aarch64-linux = { aarch64-linux = {
url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz"; url = "https://downloads.1password.com/linux/tar/stable/aarch64/1password-${version}.arm64.tar.gz";
hash = "sha256-3Hq202h2BOUnk1XiAgeW2Tc2BBq3ZCN0EXTh8u3OQ6o="; hash = "sha256-c26G/Zp+1Y6ZzGYeybFBJOB2gDx3k+4/Uu7sMlXHYjM=";
}; };
x86_64-darwin = { x86_64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip"; url = "https://downloads.1password.com/mac/1Password-${version}-x86_64.zip";
hash = "sha256-PXlmJfcMiTHdUoXfnk2Za86xUHozQF8cpKMJ75SmCjg="; hash = "sha256-9LrSJ9PLRXFbA7xkBbqFIZVtAuy7UrDBh7e6rlLqrM0=";
}; };
aarch64-darwin = { aarch64-darwin = {
url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip"; url = "https://downloads.1password.com/mac/1Password-${version}-aarch64.zip";
hash = "sha256-Wd5rsln8itagb/F5ZaDenBiBjJc8SlRxtlWD+JCDrVY="; hash = "sha256-4oqpsRZ10y2uh2gp4QyHfUdKER8v8n8mjNFVwKRYkpo=";
}; };
}; };
beta = { beta = {

View file

@ -110,8 +110,8 @@ in stdenv.mkDerivation {
cp -a resources/icons $out/share cp -a resources/icons $out/share
interp="$(cat $NIX_CC/nix-support/dynamic-linker)" interp="$(cat $NIX_CC/nix-support/dynamic-linker)"
patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-HIDHelper,1Password-KeyringHelper,1Password-LastPass-Exporter,op-ssh-sign} patchelf --set-interpreter $interp $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,1Password-LastPass-Exporter,op-ssh-sign}
patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-HIDHelper,1Password-KeyringHelper,1Password-LastPass-Exporter,op-ssh-sign} patchelf --set-rpath ${rpath}:$out/share/1password $out/share/1password/{1password,1Password-BrowserSupport,1Password-KeyringHelper,1Password-LastPass-Exporter,op-ssh-sign}
for file in $(find $out -type f -name \*.so\* ); do for file in $(find $out -type f -name \*.so\* ); do
patchelf --set-rpath ${rpath}:$out/share/1password $file patchelf --set-rpath ${rpath}:$out/share/1password $file
done done

View file

@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "bemenu"; pname = "bemenu";
version = "0.6.17"; version = "0.6.19";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Cloudef"; owner = "Cloudef";
repo = finalAttrs.pname; repo = finalAttrs.pname;
rev = finalAttrs.version; rev = finalAttrs.version;
sha256 = "sha256-HfA8VtYP8YHMQNXrg3E6IwX7rR3rp/gyE62InsddjZE="; hash = "sha256-k7xpMZUANacW/Qw7PSt+6XMPshSkmTHh/OGQlu7nmKY=";
}; };
strictDeps = true; strictDeps = true;

View file

@ -9,11 +9,11 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "camunda-modeler"; pname = "camunda-modeler";
version = "5.19.0"; version = "5.20.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz"; url = "https://github.com/camunda/camunda-modeler/releases/download/v${version}/camunda-modeler-${version}-linux-x64.tar.gz";
hash = "sha256-EKtdja55KFF394sHIh1C/cXxdjedBPbmHzicDVrbXCA="; hash = "sha256-W8//7sU/ewA99ea3lDPi+IbdAdswt9rukdjoQWj2H9Q=";
}; };
sourceRoot = "camunda-modeler-${version}-linux-x64"; sourceRoot = "camunda-modeler-${version}-linux-x64";

View file

@ -13,13 +13,13 @@
}: }:
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "cartridges"; pname = "cartridges";
version = "2.7.3"; version = "2.7.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kra-mo"; owner = "kra-mo";
repo = "cartridges"; repo = "cartridges";
rev = "v${finalAttrs.version}"; rev = "v${finalAttrs.version}";
hash = "sha256-N1Ow2lkBOSnrxI0qLaaJeqgdU2E+jRYxj5Zu/wzS6ds="; hash = "sha256-AfO+vLJSWdaMqqbzRZWrY94nu/9BM7mqdad9rkiq1pg=";
}; };
pythonPath = with python3Packages; [ pythonPath = with python3Packages; [

View file

@ -9,13 +9,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cubiomes-viewer"; pname = "cubiomes-viewer";
version = "3.4.2"; version = "4.0.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Cubitect"; owner = "Cubitect";
repo = pname; repo = pname;
rev = version; rev = version;
sha256 = "sha256-bZXsCRT2qBq7N3h2C7WQDDoQsJGlz3rDT7OZ0fUGtiI="; sha256 = "sha256-UUvNSTM98r8D/Q+/pPTXwGzW4Sl1qhgem4WsFRfybuo=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View file

@ -10,13 +10,13 @@
mkDerivation rec { mkDerivation rec {
pname = "ddcui"; pname = "ddcui";
version = "0.4.2"; version = "0.5.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "rockowitz"; owner = "rockowitz";
repo = "ddcui"; repo = "ddcui";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-T4/c8K1P/o91DWJik/9HtHav948vbVa40qPdy7nKmos="; sha256 = "sha256-/20gPMUTRhC58YFlblahOEdDHLVhbzwpU3n55NtLAcM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "fetchmail"; pname = "fetchmail";
version = "6.4.37"; version = "6.4.38";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz"; url = "mirror://sourceforge/fetchmail/fetchmail-${version}.tar.xz";
sha256 = "sha256-ShguXYk+mr5qw3rnHlQmUfzm1gYjT8c1wqquGGV+aeo="; sha256 = "sha256-pstOqGOsYdJC/7LbVko5EjdhV40+QNcc57bykFvmCdk=";
}; };
buildInputs = [ openssl python3 ]; buildInputs = [ openssl python3 ];

View file

@ -2,12 +2,12 @@
stdenvNoCC.mkDerivation rec { stdenvNoCC.mkDerivation rec {
pname = "fluidd"; pname = "fluidd";
version = "1.27.1"; version = "1.28.1";
src = fetchurl { src = fetchurl {
name = "fluidd-v${version}.zip"; name = "fluidd-v${version}.zip";
url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip"; url = "https://github.com/cadriel/fluidd/releases/download/v${version}/fluidd.zip";
sha256 = "sha256-yBxbN6Pd92HjhJ0wMaTDXETcdV4a795wAhv06JcYjJM="; sha256 = "sha256-mLi0Nvy26PRusdzVrwzuj7UcYN+NGLap+fEAYMpm48w=";
}; };
nativeBuildInputs = [ unzip ]; nativeBuildInputs = [ unzip ];

View file

@ -2,7 +2,7 @@
let let
pname = "joplin-desktop"; pname = "joplin-desktop";
version = "2.13.15"; version = "2.14.17";
inherit (stdenv.hostPlatform) system; inherit (stdenv.hostPlatform) system;
throwSystem = throw "Unsupported system: ${system}"; throwSystem = throw "Unsupported system: ${system}";
@ -16,9 +16,9 @@ let
src = fetchurl { src = fetchurl {
url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}${suffix}"; url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}${suffix}";
sha256 = { sha256 = {
x86_64-linux = "sha256-5tLONAChZaiJqvK/lg1NGTH3LYBlezIAmtQvng0nNNc="; x86_64-linux = "sha256-u4wEchyljurmwVZsRnmUBITZUR6SxDxyGczZjXNsJkg=";
x86_64-darwin = "sha256-MFBOYA6weAwGLp/ezfU58RvSlGFFlkg0Flcx64q7Wo8="; x86_64-darwin = "sha256-KjNwAnJZGX/DvHDPw15vGlSbJ47s6YT59EalARt1mx4=";
aarch64-darwin = "sha256-6CKXa/td567NtzTV7laU7l9xw8WOB9RZR6I1vXeLuyo="; aarch64-darwin = "sha256-OYpsHPI+7riMVNAp2JpBlmdFdJUSNqNvBmeYHDw6yzY=";
}.${system} or throwSystem; }.${system} or throwSystem;
}; };

View file

@ -3,12 +3,12 @@
}: }:
mkDerivation rec { mkDerivation rec {
version = "2.3.6.1"; version = "2.3.7-1";
pname = "lyx"; pname = "lyx";
src = fetchurl { src = fetchurl {
url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz"; url = "ftp://ftp.lyx.org/pub/lyx/stable/2.3.x/${pname}-${version}.tar.xz";
sha256 = "sha256-xr7SYzQZiY4Bp8w1AxDX2TS/WRyrcln8JYGqTADq+ng="; sha256 = "sha256-Ob6IZPuGs06IMQ5w+4Dl6eKWYB8IVs8WGqCUFxcY2O0=";
}; };
# Needed with GCC 12 # Needed with GCC 12

View file

@ -20,13 +20,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "otpclient"; pname = "otpclient";
version = "3.3.0"; version = "3.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "paolostivanin"; owner = "paolostivanin";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-ca0lGlpR9ynaGQPNLoe7/MegXcyRxLltF/65DJC3830="; hash = "sha256-MiWEnyhHo6+3woWi4Vf75s+cfzJSPE0xdnvuPbsxrsc=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -2,11 +2,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pdfsam-basic"; pname = "pdfsam-basic";
version = "5.2.0"; version = "5.2.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb";
hash = "sha256-Q1387Su6bmBkXvcrTgWtYZb9z/pKHiOTfUkUNHN8ItY="; hash = "sha256-+Hc3f8rf0ymddIu52vLtdqNZO4ODW9JnPlyneSZt/OQ=";
}; };
unpackPhase = '' unpackPhase = ''

View file

@ -9,14 +9,14 @@
rofi-unwrapped.overrideAttrs (oldAttrs: rec { rofi-unwrapped.overrideAttrs (oldAttrs: rec {
pname = "rofi-wayland-unwrapped"; pname = "rofi-wayland-unwrapped";
version = "1.7.5+wayland2"; version = "1.7.5+wayland3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "lbonn"; owner = "lbonn";
repo = "rofi"; repo = "rofi";
rev = version; rev = version;
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "sha256-5pxDA/71PV4B5T3fzLKVC4U8Gt13vwy3xSDPDsSDAKU="; sha256 = "sha256-pKxraG3fhBh53m+bLPzCigRr6dBcH/A9vbdf67CO2d8=";
}; };
nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-scanner ]; nativeBuildInputs = oldAttrs.nativeBuildInputs ++ [ wayland-scanner ];

View file

@ -216,6 +216,9 @@ let
# (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21): # (we currently package 1.26 in Nixpkgs while Chromium bundles 1.21):
# Source: https://bugs.chromium.org/p/angleproject/issues/detail?id=7582#c1 # Source: https://bugs.chromium.org/p/angleproject/issues/detail?id=7582#c1
./patches/angle-wayland-include-protocol.patch ./patches/angle-wayland-include-protocol.patch
# Chromium reads initial_preferences from its own executable directory
# This patch modifies it to read /etc/chromium/initial_preferences
./patches/chromium-initial-prefs.patch
] ++ lib.optionals (chromiumVersionAtLeast "120") [ ] ++ lib.optionals (chromiumVersionAtLeast "120") [
# We need to revert this patch to build M120+ with LLVM 17: # We need to revert this patch to build M120+ with LLVM 17:
./patches/chromium-120-llvm-17.patch ./patches/chromium-120-llvm-17.patch

View file

@ -0,0 +1,19 @@
diff --git a/chrome/browser/first_run/first_run_internal_linux.cc b/chrome/browser/first_run/first_run_internal_linux.cc
index 33fd579012..9a17b54b37 100644
--- a/chrome/browser/first_run/first_run_internal_linux.cc
+++ b/chrome/browser/first_run/first_run_internal_linux.cc
@@ -19,13 +19,7 @@ bool IsOrganicFirstRun() {
}
base::FilePath InitialPrefsPath() {
- // The standard location of the initial prefs is next to the chrome binary.
- base::FilePath dir_exe;
- if (!base::PathService::Get(base::DIR_EXE, &dir_exe)) {
- return base::FilePath();
- }
-
- return installer::InitialPreferences::Path(dir_exe);
+ return base::FilePath("/etc/chromium/initial_preferences");
}
} // namespace internal

View file

@ -15,9 +15,9 @@
version = "2024-01-22"; version = "2024-01-22";
}; };
}; };
hash = "sha256-7fIs8qQon9L0iNmM/cHuyqtVm09qf7L4j9qb6KSbw2w="; hash = "sha256-43h11bx/k78W7fEPZz4LwxNVExwGSSt74mlbiUYf5ig=";
hash_deb_amd64 = "sha256-hOm7YZ9ya/SmwKhj6uIPkdgIDv5bIbss398szBYHuXk="; hash_deb_amd64 = "sha256-juwTFdJB1hgAA14aabNIrql5aaP1JWQy7nOsoTF2Vto=";
version = "122.0.6261.94"; version = "122.0.6261.111";
}; };
ungoogled-chromium = { ungoogled-chromium = {
deps = { deps = {
@ -28,12 +28,12 @@
version = "2024-01-22"; version = "2024-01-22";
}; };
ungoogled-patches = { ungoogled-patches = {
hash = "sha256-vqiizzSVWV2/iADPac8qgfdZcbunc0QgMqN15NwJ9js="; hash = "sha256-7c4VQLotLHmSFKfzzXrlwXKB3XPFpyRTnuATrS9RfEw=";
rev = "122.0.6261.94-1"; rev = "122.0.6261.111-1";
}; };
}; };
hash = "sha256-7fIs8qQon9L0iNmM/cHuyqtVm09qf7L4j9qb6KSbw2w="; hash = "sha256-43h11bx/k78W7fEPZz4LwxNVExwGSSt74mlbiUYf5ig=";
hash_deb_amd64 = "sha256-hOm7YZ9ya/SmwKhj6uIPkdgIDv5bIbss398szBYHuXk="; hash_deb_amd64 = "sha256-juwTFdJB1hgAA14aabNIrql5aaP1JWQy7nOsoTF2Vto=";
version = "122.0.6261.94"; version = "122.0.6261.111";
}; };
} }

View file

@ -51,11 +51,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "opera"; pname = "opera";
version = "106.0.4998.70"; version = "107.0.5045.36";
src = fetchurl { src = fetchurl {
url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb"; url = "${mirror}/${version}/linux/${pname}-stable_${version}_amd64.deb";
hash = "sha256-JTLu59x5fthTKwP4cTX8pabRWFVhkatGNm0bV2yHBxE="; hash = "sha256-NSJmPwDZbmZUv7HoTiZJbvJTAS6HENFWX+JjKVC0oPc=";
}; };
unpackPhase = "dpkg-deb -x $src ."; unpackPhase = "dpkg-deb -x $src .";

View file

@ -101,7 +101,7 @@ lib.warnIf (useHardenedMalloc != null)
++ lib.optionals mediaSupport [ ffmpeg ] ++ lib.optionals mediaSupport [ ffmpeg ]
); );
version = "13.0.10"; version = "13.0.11";
sources = { sources = {
x86_64-linux = fetchurl { x86_64-linux = fetchurl {
@ -111,7 +111,7 @@ lib.warnIf (useHardenedMalloc != null)
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-x86_64-${version}.tar.xz"
]; ];
hash = "sha256-/Lpz8R2NvMuV+3NzBy7gC/vWheHliNm9thQQw/9bkuw="; hash = "sha256-a8BAesBp85oaHJrkQYcYufH9cy7OrFrfnljZZrFPlGE=";
}; };
i686-linux = fetchurl { i686-linux = fetchurl {
@ -121,7 +121,7 @@ lib.warnIf (useHardenedMalloc != null)
"https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
"https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux-i686-${version}.tar.xz"
]; ];
hash = "sha256-zDiXXNRik/R3DBQEWBuXD31MI+Kg4UL1KK6em+JtyCs="; hash = "sha256-cyZnLcJmXNjBJhBLwBoW09K6dsT6Og+h0ufc4/6zxac=";
}; };
}; };

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "k9s"; pname = "k9s";
version = "0.32.2"; version = "0.32.3";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "derailed"; owner = "derailed";
repo = "k9s"; repo = "k9s";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-lqLXk98rH5ZBI54ovj7YlyPh88d9Z9/jPjwUixeNJQc="; hash = "sha256-rw+MoMI/VmFvCE94atfP+djg+N75qwRfxjRlyCvLxR8=";
}; };
ldflags = [ ldflags = [

View file

@ -9,13 +9,13 @@
buildGoModule rec { buildGoModule rec {
pname = "kaniko"; pname = "kaniko";
version = "1.21.0"; version = "1.21.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "GoogleContainerTools"; owner = "GoogleContainerTools";
repo = "kaniko"; repo = "kaniko";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-OxsRyewBiZHrZtPyhuR7MQGVqtSpoW+qZRmZQDGPWck="; hash = "sha256-mVoXJPNkG0VPTaZ1pg6oB5qa/bYQa9Gn82CoGRsVwWg=";
}; };
vendorHash = null; vendorHash = null;

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "temporal"; pname = "temporal";
version = "1.22.5"; version = "1.22.6";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "temporalio"; owner = "temporalio";
repo = "temporal"; repo = "temporal";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-PHdRyYOhNoJ6NpSKNbCF2hddZeY5mIF34HQP05n/sy0="; hash = "sha256-L5TOFhAMfbKjNK/Q74V2lcZs5vyynvMZMhHFB1ay5F8=";
}; };
vendorHash = "sha256-Aum5OsdJ69MkP8tXXGWa6IdouX6F4xKjD/ndAqShMhw="; vendorHash = "sha256-ItJ4Bng9TTGJpSHaNglODIheO2ZmntHl7QfK4+2I2CM=";
excludedPackages = [ "./build" ]; excludedPackages = [ "./build" ];

View file

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "terragrunt"; pname = "terragrunt";
version = "0.55.11"; version = "0.55.12";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "gruntwork-io"; owner = "gruntwork-io";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-pInZs9XWYRcVzeKRS/BK5mqqlfGnWUFbJT/jdrW0gyQ="; hash = "sha256-RwPpABQnfcMfOMZm2PPT3w03HU8Y73leI+xxlHqZF10=";
}; };
vendorHash = "sha256-gXqpBi89VVxHSuHzzcxVRAsdu7TRsNo/vQgI1tMVuaM="; vendorHash = "sha256-sdEA/5QQ85tGfo7qSCD/lD20uAh045fl3tF9nFfH6x0=";
doCheck = false; doCheck = false;

View file

@ -5,16 +5,16 @@
buildGoModule rec { buildGoModule rec {
pname = "zarf"; pname = "zarf";
version = "0.32.2"; version = "0.32.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "defenseunicorns"; owner = "defenseunicorns";
repo = "zarf"; repo = "zarf";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-LQe/M7uX6VKA7q040wFWKYQ96M1Ynp37uglENqvyAaU="; hash = "sha256-Pm8xvJKKIa7PX6oYR1LoxmHeG3rQdsfS444kL5R3/zQ=";
}; };
vendorHash = "sha256-HAIupM30qmOqol661iFm2lNjukoKBvYY1tPTnc0u3lg="; vendorHash = "sha256-2cXkGgyZoCsVYLPB4sglOWZURl1AS0Gb/7ke7P3mdyw=";
proxyVendor = true; proxyVendor = true;
preBuild = '' preBuild = ''

View file

@ -6,19 +6,19 @@
buildGoModule rec { buildGoModule rec {
pname = "coreth"; pname = "coreth";
version = "0.12.10"; version = "0.13.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ava-labs"; owner = "ava-labs";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-0Wx1dr/jH9OOjxJ4PPmdWIru+QVpsGvVV/VxLY+M+E4="; hash = "sha256-Fdc8U5dN31mfeucmYdi3R+EM5wPvm/i3O1ib3Y30Qng=";
}; };
# go mod vendor has a bug, see: golang/go#57529 # go mod vendor has a bug, see: golang/go#57529
proxyVendor = true; proxyVendor = true;
vendorHash = "sha256-kPeUe0kr1LmtGuscRC3AhKb6Cn4TFFxm1gZ6W6nPA28="; vendorHash = "sha256-oJ/oz3PtkzEwZw93eoZV2hoD1uOWg2qdxgsvM+nX7mk=";
ldflags = [ ldflags = [
"-s" "-s"

View file

@ -12,11 +12,11 @@
mkDerivation rec { mkDerivation rec {
pname = "datovka"; pname = "datovka";
version = "4.23.4"; version = "4.23.6";
src = fetchurl { src = fetchurl {
url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz"; url = "https://gitlab.nic.cz/datovka/datovka/-/archive/v${version}/datovka-v${version}.tar.gz";
sha256 = "sha256-xyRUm6DaxlIFmeskQuUMu6JV3QtzgOZf/pLiBNGUBRo="; sha256 = "sha256-g6IMUAE8z5uoLSUpoT+GradQRgwyIXNANt7g4JPOCxg=";
}; };
buildInputs = [ libdatovka qmake qtbase qtsvg libxml2 qtwebsockets ]; buildInputs = [ libdatovka qmake qtbase qtsvg libxml2 qtwebsockets ];

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "deck"; pname = "deck";
version = "1.32.1"; version = "1.35.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Kong"; owner = "Kong";
repo = "deck"; repo = "deck";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-7lE/Wnrlv3L6V1ex+357q6XXpdx0810m1rKkqITowXY="; hash = "sha256-Cng1T/TjhPttLFcI3if0Ea/M2edXDnrMVAFzAZmNAD8=";
}; };
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];
@ -21,7 +21,7 @@ buildGoModule rec {
]; ];
proxyVendor = true; # darwin/linux hash mismatch proxyVendor = true; # darwin/linux hash mismatch
vendorHash = "sha256-D260T3E0aufOAqlN918SChv3aNDCFHfe2e0It1pcPiU="; vendorHash = "sha256-tv/wI4AN10io9x1wl2etKC+MB2vz+6FkmT/eJSsT4VI=";
postInstall = '' postInstall = ''
installShellCompletion --cmd deck \ installShellCompletion --cmd deck \

View file

@ -5,11 +5,11 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "alfaview"; pname = "alfaview";
version = "9.8.1"; version = "9.8.2";
src = fetchurl { src = fetchurl {
url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb"; url = "https://assets.alfaview.com/stable/linux/deb/${pname}_${version}.deb";
hash = "sha256-agi0f3aj5nHGV2/TAjaX+tY8/4nTdRlRiRn6rkTqokY="; hash = "sha256-xDi51AtQGM8htkFaLKlHXHh0VaT477qK/7VZVmFIE0M=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -4,7 +4,7 @@
, cmake , cmake
, wrapQtAppsHook , wrapQtAppsHook
, qtbase , qtbase
, qtquickcontrols2 , qtquickcontrols2 ? null # only a separate package on qt5
, qtkeychain , qtkeychain
, qtmultimedia , qtmultimedia
, qttools , qttools
@ -13,14 +13,18 @@
, olm , olm
}: }:
stdenv.mkDerivation rec { let
inherit (lib) cmakeBool;
in
stdenv.mkDerivation (finalAttrs: {
pname = "quaternion"; pname = "quaternion";
version = "0.0.96.1"; version = "0.0.96.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "quotient-im"; owner = "quotient-im";
repo = "Quaternion"; repo = "Quaternion";
rev = "refs/tags/${version}"; rev = finalAttrs.version;
hash = "sha256-lRCSEb/ldVnEv6z0moU4P5rf0ssKb9Bw+4QEssLjuwI="; hash = "sha256-lRCSEb/ldVnEv6z0moU4P5rf0ssKb9Bw+4QEssLjuwI=";
}; };
@ -36,8 +40,12 @@ stdenv.mkDerivation rec {
nativeBuildInputs = [ cmake qttools wrapQtAppsHook ]; nativeBuildInputs = [ cmake qttools wrapQtAppsHook ];
# qt6 needs UTF
env.LANG = "C.UTF-8";
cmakeFlags = [ cmakeFlags = [
"-DBUILD_WITH_QT6=OFF" # drop this from 0.0.97 onwards as it will be qt6 only
(cmakeBool "BUILD_WITH_QT6" ((lib.versions.major qtbase.version) == "6"))
]; ];
postInstall = postInstall =
@ -55,6 +63,6 @@ stdenv.mkDerivation rec {
homepage = "https://matrix.org/ecosystem/clients/quaternion/"; homepage = "https://matrix.org/ecosystem/clients/quaternion/";
license = licenses.gpl3; license = licenses.gpl3;
maintainers = with maintainers; [ peterhoeg ]; maintainers = with maintainers; [ peterhoeg ];
inherit (qtquickcontrols2.meta) platforms; inherit (qtbase.meta) platforms;
}; };
} })

View file

@ -4,11 +4,11 @@ let
in in
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "rocketchat-desktop"; pname = "rocketchat-desktop";
version = "3.9.11"; version = "3.9.14";
src = fetchurl { src = fetchurl {
url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb"; url = "https://github.com/RocketChat/Rocket.Chat.Electron/releases/download/${version}/rocketchat-${version}-linux-amd64.deb";
hash = "sha256-jyBHXzzFkCHGy8tdnE/daNbADYYAINBlC5td+wHOl4k="; hash = "sha256-1ZNxdzkkhsDPbwyTTTKmF7p10VgGRvRw31W91m1H4YM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -48,23 +48,23 @@ let
# and often with different versions. We write them on three lines # and often with different versions. We write them on three lines
# like this (rather than using {}) so that the updater script can # like this (rather than using {}) so that the updater script can
# find where to edit them. # find where to edit them.
versions.aarch64-darwin = "5.17.5.29101"; versions.aarch64-darwin = "5.17.10.30974";
versions.x86_64-darwin = "5.17.5.29101"; versions.x86_64-darwin = "5.17.10.30974";
versions.x86_64-linux = "5.17.5.2543"; versions.x86_64-linux = "5.17.10.3512";
srcs = { srcs = {
aarch64-darwin = fetchurl { aarch64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64"; url = "https://zoom.us/client/${versions.aarch64-darwin}/zoomusInstallerFull.pkg?archType=arm64";
name = "zoomusInstallerFull.pkg"; name = "zoomusInstallerFull.pkg";
hash = "sha256-Zq/8r4Ny9m+Ym6YMm49iMoITvkGO9q1DxQ0IqHC/7Us="; hash = "sha256-JWGy8je6hFDTSKPx4GAUDMJdi5/zKoj4KK5w6E0pcsI=";
}; };
x86_64-darwin = fetchurl { x86_64-darwin = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg"; url = "https://zoom.us/client/${versions.x86_64-darwin}/zoomusInstallerFull.pkg";
hash = "sha256-/GTBPIswV+YSvnbrSYefrLfcv5eXsRCe3vaTDGmptl8="; hash = "sha256-lO0fyW5catdgKZ7cAQhdAbfQW+EewdCjTne+ZC3UW3w=";
}; };
x86_64-linux = fetchurl { x86_64-linux = fetchurl {
url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz"; url = "https://zoom.us/client/${versions.x86_64-linux}/zoom_x86_64.pkg.tar.xz";
hash = "sha256-R8LHyL5ojnaLBk00W997PtnKzDwMaADIpYClKDYkJcQ="; hash = "sha256-dXpfgouZjd+0YyHz1c/7VL3a1SATAX8BpkR4KBeEDbc=";
}; };
}; };

View file

@ -15,13 +15,13 @@
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
pname = "halloy"; pname = "halloy";
version = "2024.1"; version = "2024.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "squidowl"; owner = "squidowl";
repo = "halloy"; repo = "halloy";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-mOP6Xxo1p3Mi36RmraMe4qpqJGQqHs/7fZzruAODr1E="; hash = "sha256-SzjMoXISd4fMHoenF1CK3Yn8bfLq9INuOmt86QTcgk8=";
}; };
cargoLock = { cargoLock = {

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "wee-slack"; pname = "wee-slack";
version = "2.10.1"; version = "2.10.2";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "wee-slack"; repo = "wee-slack";
owner = "wee-slack"; owner = "wee-slack";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-J4s7+JFd/y1espp3HZCs48++fhN6lmpaglGkgomtf3o="; sha256 = "sha256-EtPhaNFYDxxSrSLXHHnY4ARpRycNNxbg5QPKtnPem04=";
}; };
patches = [ patches = [

View file

@ -4,13 +4,13 @@
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "libcoap"; pname = "libcoap";
version = "4.3.4"; version = "4.3.4a";
src = fetchFromGitHub { src = fetchFromGitHub {
repo = "libcoap"; repo = "libcoap";
owner = "obgm"; owner = "obgm";
rev = "v${version}"; rev = "v${version}";
fetchSubmodules = true; fetchSubmodules = true;
sha256 = "sha256-x8r5fHY8J0NYE7nPSw/bPpK/iTLKioKpQKmVw73KOtg="; sha256 = "sha256-SzuXFn4rihZIHxKSH5waC5362mhsOtBdRatIGI6nv4I=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [
automake automake

View file

@ -5,11 +5,11 @@
appimageTools.wrapType2 rec { appimageTools.wrapType2 rec {
pname = "tutanota-desktop"; pname = "tutanota-desktop";
version = "3.122.5"; version = "218.240227.0";
src = fetchurl { src = fetchurl {
url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage"; url = "https://github.com/tutao/tutanota/releases/download/tutanota-desktop-release-${version}/tutanota-desktop-linux.AppImage";
hash = "sha256-3M53Re6FbxEXHBl5KBLDjZg0uTIv8JIT0DlawNRPXBc="; hash = "sha256-Ks046Z2jycOb63q3g16nJrHpaH0FJH+c+ZGTldfHllI=";
}; };
extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ]; extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs) ++ [ pkgs.libsecret ];

View file

@ -2,16 +2,16 @@
buildGoModule rec { buildGoModule rec {
pname = "nextdns"; pname = "nextdns";
version = "1.41.0"; version = "1.42.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nextdns"; owner = "nextdns";
repo = "nextdns"; repo = "nextdns";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-uLX5M9DW8wfVKSV+/pwy+ZK6M6OQSq7qYjRcBvOOqOQ="; sha256 = "sha256-aQUz6FK04h3nzieK9fX7odVVt/zcdhXlX3T1Z1rN/ak=";
}; };
vendorHash = "sha256-vYE/GdN2ooSW4LMg1D5t5zOgATruB4Q449JdNo87fkM="; vendorHash = "sha256-DATSGSFRMrX972CWCiSIlOhDuAG3zcVyuILZ3IpVirM=";
ldflags = [ "-s" "-w" "-X main.version=${version}" ]; ldflags = [ "-s" "-w" "-X main.version=${version}" ];

View file

@ -10,14 +10,14 @@
python3.pkgs.buildPythonApplication rec { python3.pkgs.buildPythonApplication rec {
pname = "pyrosimple"; pname = "pyrosimple";
version = "2.12.1"; version = "2.13.0";
format = "pyproject"; format = "pyproject";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "kannibalox"; owner = "kannibalox";
repo = pname; repo = pname;
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
hash = "sha256-ppSQknpRoxq35t7lPbqz7MPJzy98yq/GgSchPOx4VT4="; hash = "sha256-e69e1Aa10/pew1UZBCIPIH3BK7I8C3HiW59fRuSZlkc=";
}; };
pythonRelaxDeps = [ pythonRelaxDeps = [

View file

@ -27,8 +27,10 @@
, gtkmm3 , gtkmm3
, xorg , xorg
, wrapGAppsHook , wrapGAppsHook
, enableQt ? false , enableQt5 ? false
, enableQt6 ? false
, qt5 , qt5
, qt6Packages
, nixosTests , nixosTests
, enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd
, enableDaemon ? true , enableDaemon ? true
@ -37,6 +39,24 @@
, apparmorRulesFromClosure , apparmorRulesFromClosure
}: }:
let
inherit (lib) cmakeBool optionals;
apparmorRules = apparmorRulesFromClosure { name = "transmission-daemon"; } ([
curl
libdeflate
libevent
libnatpmp
libpsl
miniupnpc
openssl
pcre
zlib
]
++ optionals enableSystemd [ systemd ]
++ optionals stdenv.isLinux [ inotify-tools ]);
in
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "transmission"; pname = "transmission";
version = "4.0.5"; version = "4.0.5";
@ -51,21 +71,17 @@ stdenv.mkDerivation (finalAttrs: {
outputs = [ "out" "apparmor" ]; outputs = [ "out" "apparmor" ];
cmakeFlags = cmakeFlags = [
let (cmakeBool "ENABLE_CLI" enableCli)
mkFlag = opt: if opt then "ON" else "OFF"; (cmakeBool "ENABLE_DAEMON" enableDaemon)
in (cmakeBool "ENABLE_GTK" enableGTK3)
[ (cmakeBool "ENABLE_MAC" false) # requires xcodebuild
"-DENABLE_MAC=OFF" # requires xcodebuild (cmakeBool "ENABLE_QT" (enableQt5 || enableQt6))
"-DENABLE_GTK=${mkFlag enableGTK3}" (cmakeBool "INSTALL_LIB" installLib)
"-DENABLE_QT=${mkFlag enableQt}" ] ++ optionals stdenv.isDarwin [
"-DENABLE_DAEMON=${mkFlag enableDaemon}" # Transmission sets this to 10.13 if not explicitly specified, see https://github.com/transmission/transmission/blob/0be7091eb12f4eb55f6690f313ef70a66795ee72/CMakeLists.txt#L7-L16.
"-DENABLE_CLI=${mkFlag enableCli}" "-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}"
"-DINSTALL_LIB=${mkFlag installLib}" ];
] ++ lib.optionals stdenv.isDarwin [
# Transmission sets this to 10.13 if not explicitly specified, see https://github.com/transmission/transmission/blob/0be7091eb12f4eb55f6690f313ef70a66795ee72/CMakeLists.txt#L7-L16.
"-DCMAKE_OSX_DEPLOYMENT_TARGET=${stdenv.hostPlatform.darwinMinVersion}"
];
postPatch = '' postPatch = ''
# Clean third-party libraries to ensure system ones are used. # Clean third-party libraries to ensure system ones are used.
@ -89,8 +105,9 @@ stdenv.mkDerivation (finalAttrs: {
cmake cmake
python3 python3
] ]
++ lib.optionals enableGTK3 [ wrapGAppsHook ] ++ optionals enableGTK3 [ wrapGAppsHook ]
++ lib.optionals enableQt [ qt5.wrapQtAppsHook ] ++ optionals enableQt5 [ qt5.wrapQtAppsHook ]
++ optionals enableQt6 [ qt6Packages.wrapQtAppsHook ]
; ;
buildInputs = [ buildInputs = [
@ -109,11 +126,12 @@ stdenv.mkDerivation (finalAttrs: {
utf8cpp utf8cpp
zlib zlib
] ]
++ lib.optionals enableQt [ qt5.qttools qt5.qtbase ] ++ optionals enableQt5 (with qt5; [ qttools qtbase ])
++ lib.optionals enableGTK3 [ gtkmm3 xorg.libpthreadstubs ] ++ optionals enableQt6 (with qt6Packages; [ qttools qtbase qtsvg ])
++ lib.optionals enableSystemd [ systemd ] ++ optionals enableGTK3 [ gtkmm3 xorg.libpthreadstubs ]
++ lib.optionals stdenv.isLinux [ inotify-tools ] ++ optionals enableSystemd [ systemd ]
++ lib.optionals stdenv.isDarwin [ libiconv Foundation ]; ++ optionals stdenv.isLinux [ inotify-tools ]
++ optionals stdenv.isDarwin [ libiconv Foundation ];
postInstall = '' postInstall = ''
mkdir $apparmor mkdir $apparmor
@ -123,11 +141,7 @@ stdenv.mkDerivation (finalAttrs: {
include <abstractions/base> include <abstractions/base>
include <abstractions/nameservice> include <abstractions/nameservice>
include <abstractions/ssl_certs> include <abstractions/ssl_certs>
include "${apparmorRulesFromClosure { name = "transmission-daemon"; } ([ include "${apparmorRules}"
curl libevent openssl pcre zlib libdeflate libpsl libnatpmp miniupnpc
] ++ lib.optionals enableSystemd [ systemd ]
++ lib.optionals stdenv.isLinux [ inotify-tools ]
)}"
r @{PROC}/sys/kernel/random/uuid, r @{PROC}/sys/kernel/random/uuid,
r @{PROC}/sys/vm/overcommit_memory, r @{PROC}/sys/vm/overcommit_memory,
r @{PROC}/@{pid}/environ, r @{PROC}/@{pid}/environ,
@ -147,9 +161,9 @@ stdenv.mkDerivation (finalAttrs: {
smoke-test = nixosTests.bittorrent; smoke-test = nixosTests.bittorrent;
}; };
meta = { meta = with lib; {
description = "A fast, easy and free BitTorrent client"; description = "A fast, easy and free BitTorrent client";
mainProgram = if enableQt then "transmission-qt" else if enableGTK3 then "transmission-gtk" else "transmission-cli"; mainProgram = if (enableQt5 || enableQt6) then "transmission-qt" else if enableGTK3 then "transmission-gtk" else "transmission-cli";
longDescription = '' longDescription = ''
Transmission is a BitTorrent client which features a simple interface Transmission is a BitTorrent client which features a simple interface
on top of a cross-platform back-end. on top of a cross-platform back-end.
@ -161,9 +175,9 @@ stdenv.mkDerivation (finalAttrs: {
* Bluetack (PeerGuardian) blocklists with automatic updates * Bluetack (PeerGuardian) blocklists with automatic updates
* Full encryption, DHT, and PEX support * Full encryption, DHT, and PEX support
''; '';
homepage = "http://www.transmissionbt.com/"; homepage = "https://www.transmissionbt.com/";
license = with lib.licenses; [ gpl2Plus mit ]; license = with licenses; [ gpl2Plus mit ];
maintainers = with lib.maintainers; [ astsmtl ]; maintainers = with maintainers; [ astsmtl ];
platforms = lib.platforms.unix; platforms = platforms.unix;
}; };
}) })

View file

@ -13,7 +13,7 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "protonvpn-cli_2"; pname = "protonvpn-cli_2";
version = "2.2.11"; version = "2.2.12";
format = "setuptools"; format = "setuptools";
disabled = pythonOlder "3.5"; disabled = pythonOlder "3.5";
@ -23,7 +23,7 @@ buildPythonApplication rec {
repo = "linux-cli-community"; repo = "linux-cli-community";
# There is a tag and branch with the same name # There is a tag and branch with the same name
rev = "refs/tags/v${version}"; rev = "refs/tags/v${version}";
sha256 = "sha256-CWQpisJPBXbf+d5tCGuxfSQQZBeF36WFF4b6OSUn3GY="; sha256 = "sha256-vNbqjdkIRK+MkYRKUUe7W5Ytc1PU1t5ZLr9fPDOZXUs=";
}; };
propagatedBuildInputs = [ propagatedBuildInputs = [

View file

@ -11,13 +11,13 @@
python3Packages.buildPythonApplication rec { python3Packages.buildPythonApplication rec {
pname = "nicotine-plus"; pname = "nicotine-plus";
version = "3.2.9"; version = "3.3.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "nicotine-plus"; owner = "nicotine-plus";
repo = "nicotine-plus"; repo = "nicotine-plus";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
sha256 = "sha256-PxtHsBbrzcIAcLyQKD9DV8yqf3ljzGS7gT/ZRfJ8qL4="; sha256 = "sha256-dl4fTa+CXsycC+hhSkIzQQxrSkBDPsdrmKdrHPakGig=";
}; };
nativeBuildInputs = [ gettext wrapGAppsHook gobject-introspection ]; nativeBuildInputs = [ gettext wrapGAppsHook gobject-introspection ];

View file

@ -7,13 +7,13 @@
let let
pname = "mendeley"; pname = "mendeley";
version = "2.105.0"; version = "2.110.2";
executableName = "${pname}-reference-manager"; executableName = "${pname}-reference-manager";
src = fetchurl { src = fetchurl {
url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage"; url = "https://static.mendeley.com/bin/desktop/mendeley-reference-manager-${version}-x86_64.AppImage";
hash = "sha256-vs430WLApRu+Xw2gYgriOD0jsQqTW+qhI1g4r67W9aM="; hash = "sha256-AJNNCPEwLAO1+Zub6Yyad5Zcsl35zf4dEboyGE9wSX8=";
}; };
appimageContents = appimageTools.extractType2 { appimageContents = appimageTools.extractType2 {

View file

@ -5,12 +5,12 @@
}: }:
let let
version = "6.6.8"; version = "6.7.3";
pname = "timeular"; pname = "timeular";
src = fetchurl { src = fetchurl {
url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage"; url = "https://s3.amazonaws.com/timeular-desktop-packages/linux/production/Timeular-${version}.AppImage";
hash = "sha256-giQjcUnhBGt2egRmYLEL8cFZYKjtUu34ozh1filNyiw="; hash = "sha256-VnjCTf2x3GzmKW9EfNWGsN/aK7DKjTo8DZOF2qqGJ0Q=";
}; };
appimageContents = appimageTools.extractType2 { appimageContents = appimageTools.extractType2 {

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "hackrf"; pname = "hackrf";
version = "2023.01.1"; version = "2024.02.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "greatscottgadgets"; owner = "greatscottgadgets";
repo = "hackrf"; repo = "hackrf";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-zvSSCNtqHOZVlrBggjgxEyUTqTiAIAhdzUkm4Pm9b3k="; sha256 = "sha256-b3nGrk2P6ZLYBSCSD7c0aIApCh3ZoVDcFftybqm4vx0=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -2,13 +2,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "diamond"; pname = "diamond";
version = "2.1.8"; version = "2.1.9";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "bbuchfink"; owner = "bbuchfink";
repo = "diamond"; repo = "diamond";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-6L/eS3shfJ33bsXo1BaCO4lKklh2KbOIO2tZsvwcjnA="; sha256 = "sha256-cTg9TEpz3FSgX2tpfU4y55cCgFY5+mQY86FziHAwd+s=";
}; };

View file

@ -2,10 +2,10 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "igv"; pname = "igv";
version = "2.17.1"; version = "2.17.2";
src = fetchzip { src = fetchzip {
url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip"; url = "https://data.broadinstitute.org/igv/projects/downloads/${lib.versions.majorMinor version}/IGV_${version}.zip";
sha256 = "sha256-EXI1jVr8cJPYLLe81hzqLpP3IypHBZ0cb6z+WrDeFKQ="; sha256 = "sha256-KMLy+YxRT5EDZhfqkZRHrPR9BmBg6hFWLSNwJhZ2I+k=";
}; };
installPhase = '' installPhase = ''

View file

@ -4,13 +4,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "verilator"; pname = "verilator";
version = "5.020"; version = "5.022";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = pname; owner = pname;
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-7kxH/RPM+fjDuybwJgTYm0X6wpaqesGfu57plrExd8c="; hash = "sha256-Ya3lqK8BfvMVLZUrD2Et6OmptteWXp5VmZb2x2G/V/E=";
}; };
enableParallelBuilding = true; enableParallelBuilding = true;

View file

@ -8,13 +8,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "cryptominisat"; pname = "cryptominisat";
version = "5.11.15"; version = "5.11.21";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "msoos"; owner = "msoos";
repo = "cryptominisat"; repo = "cryptominisat";
rev = version; rev = version;
hash = "sha256-OenuIPo5U0+egWMpxfaKWPLbO5YRQJSXLYptih+ZQQ0="; hash = "sha256-8oH9moMjQEWnQXKmKcqmXuXcYkEyvr4hwC1bC4l26mo=";
}; };
buildInputs = [ python3 boost ]; buildInputs = [ python3 boost ];

View file

@ -1,4 +1,4 @@
{ stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl, runtimeShell { stdenv, lib, runCommand, patchelf, makeWrapper, pkg-config, curl, runtimeShell, fetchpatch
, openssl, zlib, fetchFromGitHub, rustPlatform, libiconv }: , openssl, zlib, fetchFromGitHub, rustPlatform, libiconv }:
rustPlatform.buildRustPackage rec { rustPlatform.buildRustPackage rec {
@ -23,6 +23,14 @@ rustPlatform.buildRustPackage rec {
buildFeatures = [ "no-self-update" ]; buildFeatures = [ "no-self-update" ];
patches = lib.optionals stdenv.isLinux [ patches = lib.optionals stdenv.isLinux [
# revert temporary directory creation, because it break the wrapper
# https://github.com/NixOS/nixpkgs/pull/289941#issuecomment-1980778358
(fetchpatch {
url = "https://github.com/leanprover/elan/commit/bd54acaab75d08b3912ee1f051af8657f3a9cfdf.patch";
hash = "sha256-6If/wxWSea8Zjlp3fx9wh3D0TjmWZbvCuY9q5c2qJGA=";
revert = true;
})
# Run patchelf on the downloaded binaries. # Run patchelf on the downloaded binaries.
# This is necessary because Lean 4 is now dynamically linked. # This is necessary because Lean 4 is now dynamically linked.
(runCommand "0001-dynamically-patchelf-binaries.patch" { (runCommand "0001-dynamically-patchelf-binaries.patch" {

View file

@ -6,13 +6,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "opensmt"; pname = "opensmt";
version = "2.5.2"; version = "2.6.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "usi-verification-and-security"; owner = "usi-verification-and-security";
repo = "opensmt"; repo = "opensmt";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-gP2oaTEBVk54oK4Le5VudF7+HM8JXCzVqv8UXc08RFQ="; sha256 = "sha256-glIiyPSkLG7sGYw5ujfl47GuDuPIPdP+UybA1vSn0Uw=";
}; };
nativeBuildInputs = [ cmake bison flex ]; nativeBuildInputs = [ cmake bison flex ];

View file

@ -15,7 +15,7 @@ assert withThread -> libpthreadstubs != null;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "pari"; pname = "pari";
version = "2.15.4"; version = "2.15.5";
src = fetchurl { src = fetchurl {
urls = [ urls = [
@ -23,7 +23,7 @@ stdenv.mkDerivation rec {
# old versions are at the url below # old versions are at the url below
"https://pari.math.u-bordeaux.fr/pub/pari/OLD/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz" "https://pari.math.u-bordeaux.fr/pub/pari/OLD/${lib.versions.majorMinor version}/${pname}-${version}.tar.gz"
]; ];
hash = "sha256-w1Rb/uDG37QLd/tLurr5mdguYAabn20ovLbPAEyMXA8="; hash = "sha256-Dv3adRXZ2VT2MyTDSzTFYOYPc6gcOSSnEmCizJHV+YE=";
}; };
buildInputs = [ buildInputs = [

View file

@ -4,11 +4,11 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "MAVProxy"; pname = "MAVProxy";
version = "1.8.66"; version = "1.8.70";
src = fetchPypi { src = fetchPypi {
inherit pname version; inherit pname version;
hash = "sha256-tIwXiDHEmFHF5Jdv25hPkzEqAdig+i5h4fW6SGIrZDM="; hash = "sha256-U5K+0lxJbBvwETnJ3MTMkk47CMOSlJBeFrCLHW9OSh8=";
}; };
postPatch = '' postPatch = ''

View file

@ -16,8 +16,8 @@ let
abseil-cpp = fetchFromGitHub { abseil-cpp = fetchFromGitHub {
owner = "abseil"; owner = "abseil";
repo = "abseil-cpp"; repo = "abseil-cpp";
rev = "fb3621f4f897824c0dbe0615fa94543df6192f30"; rev = "2f9e432cce407ce0ae50676696666f33a77d42ac";
hash = "sha256-uNGrTNg5G5xFGtc+BSWE389x0tQ/KxJQLHfebNWas/k="; hash = "sha256-D4E11bICKr3Z5RRah7QkfXVsXtuUg32FMmKpiOGjZDM=";
}; };
benchmark = fetchFromGitHub { benchmark = fetchFromGitHub {
owner = "google"; owner = "google";
@ -34,8 +34,8 @@ let
eigen3 = fetchFromGitLab { eigen3 = fetchFromGitLab {
owner = "libeigen"; owner = "libeigen";
repo = "eigen"; repo = "eigen";
rev = "454f89af9d6f3525b1df5f9ef9c86df58bf2d4d3"; rev = "2a9055b50ed22101da7d77e999b90ed50956fe0b";
hash = "sha256-a9QAnv6vIM8a9Bn8ZmfeMT0+kbtb0QGxM0+m5xwIqm8="; hash = "sha256-tx/XR7xJ7IMh5RMvL8wRo/g+dfD3xcjZkLPSY4D9HaY=";
}; };
googletest = fetchFromGitHub { googletest = fetchFromGitHub {
owner = "google"; owner = "google";
@ -96,8 +96,8 @@ let
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "UPC-ViRVIG"; owner = "UPC-ViRVIG";
repo = name; repo = name;
rev = "7c49cfba9bbec763b5d0f7b90b26555f3dde8088"; rev = "1927bee6bb8225258a39c8cbf14e18a4d50409ae";
hash = "sha256-5bnQ3rHH9Pw1jRVpZpamFnhIJHWnGm6krgZgIBqNtVg="; hash = "sha256-+SFUOdZ6pGZvnQa0mT+yfbTMHWe2CTOlroXcuVBHdOE=";
}; };
patches = [ ./sdflib-system-deps.patch ]; patches = [ ./sdflib-system-deps.patch ];
@ -129,7 +129,7 @@ let
in stdenv.mkDerivation rec { in stdenv.mkDerivation rec {
pname = "mujoco"; pname = "mujoco";
version = "3.1.2"; version = "3.1.3";
# Bumping version? Make sure to look though the MuJoCo's commit # Bumping version? Make sure to look though the MuJoCo's commit
# history for bumped dependency pins! # history for bumped dependency pins!
@ -137,7 +137,7 @@ in stdenv.mkDerivation rec {
owner = "google-deepmind"; owner = "google-deepmind";
repo = "mujoco"; repo = "mujoco";
rev = "refs/tags/${version}"; rev = "refs/tags/${version}";
hash = "sha256-Zbz6qq2Sjhcrf8QAGFlYkSZ8mA/wQaP81gRzMj3xh+g="; hash = "sha256-22yH3zAD479TRNS3XSqy6PuuLqyWmjvwScUTVfKumzY=";
}; };
patches = [ ./mujoco-system-deps-dont-fetch.patch ]; patches = [ ./mujoco-system-deps-dont-fetch.patch ];

View file

@ -1,8 +1,8 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt diff --git a/CMakeLists.txt b/CMakeLists.txt
index 285250b..32d03e3 100644 index eea180c0..efb39178 100644
--- a/CMakeLists.txt --- a/CMakeLists.txt
+++ b/CMakeLists.txt +++ b/CMakeLists.txt
@@ -92,7 +92,7 @@ add_subdirectory(src/render) @@ -93,7 +93,7 @@ add_subdirectory(src/render)
add_subdirectory(src/thread) add_subdirectory(src/thread)
add_subdirectory(src/ui) add_subdirectory(src/ui)
@ -11,7 +11,7 @@ index 285250b..32d03e3 100644
if(MUJOCO_ENABLE_AVX_INTRINSICS) if(MUJOCO_ENABLE_AVX_INTRINSICS)
target_compile_definitions(mujoco PUBLIC mjUSEPLATFORMSIMD) target_compile_definitions(mujoco PUBLIC mjUSEPLATFORMSIMD)
endif() endif()
@@ -117,7 +117,7 @@ target_link_libraries( @@ -118,7 +118,7 @@ target_link_libraries(
lodepng lodepng
qhullstatic_r qhullstatic_r
tinyobjloader tinyobjloader
@ -21,30 +21,17 @@ index 285250b..32d03e3 100644
set_target_properties( set_target_properties(
diff --git a/cmake/MujocoDependencies.cmake b/cmake/MujocoDependencies.cmake diff --git a/cmake/MujocoDependencies.cmake b/cmake/MujocoDependencies.cmake
index 4e3e2c8..f6143d9 100644 index 44962272..656beeb8 100644
--- a/cmake/MujocoDependencies.cmake --- a/cmake/MujocoDependencies.cmake
+++ b/cmake/MujocoDependencies.cmake +++ b/cmake/MujocoDependencies.cmake
@@ -90,153 +90,203 @@ set(BUILD_SHARED_LIBS @@ -93,28 +93,36 @@ set(BUILD_SHARED_LIBS
CACHE INTERNAL "Build SHARED libraries"
)
+
if(NOT TARGET lodepng) if(NOT TARGET lodepng)
- FetchContent_Declare( FetchContent_Declare(
+ fetchcontent_declare(
lodepng lodepng
- GIT_REPOSITORY https://github.com/lvandeve/lodepng.git - GIT_REPOSITORY https://github.com/lvandeve/lodepng.git
- GIT_TAG ${MUJOCO_DEP_VERSION_lodepng} - GIT_TAG ${MUJOCO_DEP_VERSION_lodepng}
) )
+endif() +endif()
+
+if(NOT TARGET lodepng)
+ if(NOT MUJOCO_USE_SYSTEM_lodepng)
+ fetchcontent_declare(
+ lodepng
+ GIT_REPOSITORY https://github.com/lvandeve/lodepng.git
+ GIT_TAG ${MUJOCO_DEP_VERSION_lodepng}
+ )
- FetchContent_GetProperties(lodepng) - FetchContent_GetProperties(lodepng)
- if(NOT lodepng_POPULATED) - if(NOT lodepng_POPULATED)
@ -56,9 +43,17 @@ index 4e3e2c8..f6143d9 100644
- target_compile_options(lodepng PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS}) - target_compile_options(lodepng PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS})
- target_link_options(lodepng PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS}) - target_link_options(lodepng PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS})
- target_include_directories(lodepng PUBLIC ${lodepng_SOURCE_DIR}) - target_include_directories(lodepng PUBLIC ${lodepng_SOURCE_DIR})
+ fetchcontent_getproperties(lodepng) +if(NOT TARGET lodepng)
+ if(NOT MUJOCO_USE_SYSTEM_lodepng)
+ fetchcontent_declare(
+ lodepng
+ GIT_REPOSITORY https://github.com/lvandeve/lodepng.git
+ GIT_TAG ${MUJOCO_DEP_VERSION_lodepng}
+ )
+
+ FetchContent_GetProperties(lodepng)
+ if(NOT lodepng_POPULATED) + if(NOT lodepng_POPULATED)
+ fetchcontent_populate(lodepng) + FetchContent_Populate(lodepng)
+ # This is not a CMake project. + # This is not a CMake project.
+ set(LODEPNG_SRCS ${lodepng_SOURCE_DIR}/lodepng.cpp) + set(LODEPNG_SRCS ${lodepng_SOURCE_DIR}/lodepng.cpp)
+ set(LODEPNG_HEADERS ${lodepng_SOURCE_DIR}/lodepng.h) + set(LODEPNG_HEADERS ${lodepng_SOURCE_DIR}/lodepng.h)
@ -73,19 +68,14 @@ index 4e3e2c8..f6143d9 100644
endif() endif()
if(NOT TARGET marchingcubecpp) if(NOT TARGET marchingcubecpp)
- FetchContent_Declare( FetchContent_Declare(
+ fetchcontent_declare(
marchingcubecpp marchingcubecpp
- GIT_REPOSITORY https://github.com/aparis69/MarchingCubeCpp.git - GIT_REPOSITORY https://github.com/aparis69/MarchingCubeCpp.git
- GIT_TAG ${MUJOCO_DEP_VERSION_MarchingCubeCpp} - GIT_TAG ${MUJOCO_DEP_VERSION_MarchingCubeCpp}
) )
- FetchContent_GetProperties(marchingcubecpp) FetchContent_GetProperties(marchingcubecpp)
+ fetchcontent_getproperties(marchingcubecpp) @@ -124,119 +132,158 @@ if(NOT TARGET marchingcubecpp)
if(NOT marchingcubecpp_POPULATED)
- FetchContent_Populate(marchingcubecpp)
+ fetchcontent_populate(marchingcubecpp)
include_directories(${marchingcubecpp_SOURCE_DIR})
endif() endif()
endif() endif()
@ -118,7 +108,6 @@ index 4e3e2c8..f6143d9 100644
-) -)
-target_compile_options(qhullstatic_r PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS}) -target_compile_options(qhullstatic_r PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS})
-target_link_options(qhullstatic_r PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS}) -target_link_options(qhullstatic_r PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS})
+
+if(NOT MUJOCO_USE_SYSTEM_qhull) +if(NOT MUJOCO_USE_SYSTEM_qhull)
+ # MuJoCo includes a file from libqhull_r which is not exported by the qhull include directories. + # MuJoCo includes a file from libqhull_r which is not exported by the qhull include directories.
+ # Add it to the target. + # Add it to the target.
@ -165,7 +154,6 @@ index 4e3e2c8..f6143d9 100644
) )
-target_compile_options(tinyxml2 PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS}) -target_compile_options(tinyxml2 PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS})
-target_link_options(tinyxml2 PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS}) -target_link_options(tinyxml2 PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS})
+
+if(NOT MUJOCO_USE_SYSTEM_tinyxml2) +if(NOT MUJOCO_USE_SYSTEM_tinyxml2)
+ target_compile_options(tinyxml2 PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS}) + target_compile_options(tinyxml2 PRIVATE ${MUJOCO_MACOS_COMPILE_OPTIONS})
+ target_link_options(tinyxml2 PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS}) + target_link_options(tinyxml2 PRIVATE ${MUJOCO_MACOS_LINK_OPTIONS})
@ -297,7 +285,7 @@ index 4e3e2c8..f6143d9 100644
set(ABSL_PROPAGATE_CXX_STD ON) set(ABSL_PROPAGATE_CXX_STD ON)
# This specific version of Abseil does not have the following variable. We need to work with BUILD_TESTING # This specific version of Abseil does not have the following variable. We need to work with BUILD_TESTING
@@ -249,15 +299,11 @@ if(MUJOCO_BUILD_TESTS) @@ -249,15 +296,11 @@ if(MUJOCO_BUILD_TESTS)
set(ABSL_BUILD_TESTING OFF) set(ABSL_BUILD_TESTING OFF)
findorfetch( findorfetch(
USE_SYSTEM_PACKAGE USE_SYSTEM_PACKAGE
@ -314,7 +302,7 @@ index 4e3e2c8..f6143d9 100644
TARGETS TARGETS
absl::core_headers absl::core_headers
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
@@ -268,6 +314,9 @@ if(MUJOCO_BUILD_TESTS) @@ -268,6 +311,9 @@ if(MUJOCO_BUILD_TESTS)
CACHE BOOL "Build tests." FORCE CACHE BOOL "Build tests." FORCE
) )
@ -324,7 +312,7 @@ index 4e3e2c8..f6143d9 100644
# Avoid linking errors on Windows by dynamically linking to the C runtime. # Avoid linking errors on Windows by dynamically linking to the C runtime.
set(gtest_force_shared_crt set(gtest_force_shared_crt
ON ON
@@ -276,22 +325,20 @@ if(MUJOCO_BUILD_TESTS) @@ -276,22 +322,20 @@ if(MUJOCO_BUILD_TESTS)
findorfetch( findorfetch(
USE_SYSTEM_PACKAGE USE_SYSTEM_PACKAGE
@ -353,7 +341,7 @@ index 4e3e2c8..f6143d9 100644
set(BENCHMARK_EXTRA_FETCH_ARGS "") set(BENCHMARK_EXTRA_FETCH_ARGS "")
if(WIN32 AND NOT MSVC) if(WIN32 AND NOT MSVC)
set(BENCHMARK_EXTRA_FETCH_ARGS set(BENCHMARK_EXTRA_FETCH_ARGS
@@ -310,15 +357,11 @@ if(MUJOCO_BUILD_TESTS) @@ -310,15 +354,11 @@ if(MUJOCO_BUILD_TESTS)
findorfetch( findorfetch(
USE_SYSTEM_PACKAGE USE_SYSTEM_PACKAGE
@ -370,7 +358,7 @@ index 4e3e2c8..f6143d9 100644
TARGETS TARGETS
benchmark::benchmark benchmark::benchmark
benchmark::benchmark_main benchmark::benchmark_main
@@ -328,26 +371,42 @@ if(MUJOCO_BUILD_TESTS) @@ -328,15 +368,18 @@ if(MUJOCO_BUILD_TESTS)
endif() endif()
if(MUJOCO_TEST_PYTHON_UTIL) if(MUJOCO_TEST_PYTHON_UTIL)
@ -387,21 +375,14 @@ index 4e3e2c8..f6143d9 100644
+ set(CMAKE_POLICY_DEFAULT_CMP0057 NEW) + set(CMAKE_POLICY_DEFAULT_CMP0057 NEW)
+ endif() + endif()
- FetchContent_Declare( FetchContent_Declare(
+ fetchcontent_declare(
Eigen3 Eigen3
- GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git - GIT_REPOSITORY https://gitlab.com/libeigen/eigen.git
- GIT_TAG ${MUJOCO_DEP_VERSION_Eigen3} - GIT_TAG ${MUJOCO_DEP_VERSION_Eigen3}
) )
- FetchContent_GetProperties(Eigen3) FetchContent_GetProperties(Eigen3)
+ fetchcontent_getproperties(Eigen3) @@ -348,6 +391,19 @@ if(MUJOCO_TEST_PYTHON_UTIL)
if(NOT Eigen3_POPULATED)
- FetchContent_Populate(Eigen3)
+ fetchcontent_populate(Eigen3)
# Mark the library as IMPORTED as a workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/15415
add_library(Eigen3::Eigen INTERFACE IMPORTED)
set_target_properties( set_target_properties(
Eigen3::Eigen PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${eigen3_SOURCE_DIR}" Eigen3::Eigen PROPERTIES INTERFACE_INCLUDE_DIRECTORIES "${eigen3_SOURCE_DIR}"
) )
@ -422,7 +403,7 @@ index 4e3e2c8..f6143d9 100644
endif() endif()
endif() endif()
diff --git a/plugin/sdf/CMakeLists.txt b/plugin/sdf/CMakeLists.txt diff --git a/plugin/sdf/CMakeLists.txt b/plugin/sdf/CMakeLists.txt
index 3e216fc..e7e3a1e 100644 index 3e216fc4..e7e3a1eb 100644
--- a/plugin/sdf/CMakeLists.txt --- a/plugin/sdf/CMakeLists.txt
+++ b/plugin/sdf/CMakeLists.txt +++ b/plugin/sdf/CMakeLists.txt
@@ -37,7 +37,7 @@ set(MUJOCO_SDF_SRCS @@ -37,7 +37,7 @@ set(MUJOCO_SDF_SRCS
@ -435,7 +416,7 @@ index 3e216fc..e7e3a1e 100644
sdf sdf
PRIVATE ${AVX_COMPILE_OPTIONS} PRIVATE ${AVX_COMPILE_OPTIONS}
diff --git a/python/mujoco/util/CMakeLists.txt b/python/mujoco/util/CMakeLists.txt diff --git a/python/mujoco/util/CMakeLists.txt b/python/mujoco/util/CMakeLists.txt
index 666a372..d89bb49 100644 index 666a3725..d89bb499 100644
--- a/python/mujoco/util/CMakeLists.txt --- a/python/mujoco/util/CMakeLists.txt
+++ b/python/mujoco/util/CMakeLists.txt +++ b/python/mujoco/util/CMakeLists.txt
@@ -63,8 +63,8 @@ if(BUILD_TESTING) @@ -63,8 +63,8 @@ if(BUILD_TESTING)
@ -483,7 +464,7 @@ index 666a372..d89bb49 100644
gtest_add_tests(TARGET tuple_tools_test SOURCES tuple_tools_test.cc) gtest_add_tests(TARGET tuple_tools_test SOURCES tuple_tools_test.cc)
endif() endif()
diff --git a/simulate/cmake/SimulateDependencies.cmake b/simulate/cmake/SimulateDependencies.cmake diff --git a/simulate/cmake/SimulateDependencies.cmake b/simulate/cmake/SimulateDependencies.cmake
index 5141406..75ff788 100644 index 5141406c..75ff7884 100644
--- a/simulate/cmake/SimulateDependencies.cmake --- a/simulate/cmake/SimulateDependencies.cmake
+++ b/simulate/cmake/SimulateDependencies.cmake +++ b/simulate/cmake/SimulateDependencies.cmake
@@ -81,10 +81,6 @@ findorfetch( @@ -81,10 +81,6 @@ findorfetch(
@ -498,7 +479,7 @@ index 5141406..75ff788 100644
glfw glfw
EXCLUDE_FROM_ALL EXCLUDE_FROM_ALL
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 6bec911..2a16c21 100644 index 122760a9..ddd90819 100644
--- a/test/CMakeLists.txt --- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt +++ b/test/CMakeLists.txt
@@ -30,7 +30,7 @@ macro(mujoco_test name) @@ -30,7 +30,7 @@ macro(mujoco_test name)
@ -510,10 +491,10 @@ index 6bec911..2a16c21 100644
target_include_directories(${name} PRIVATE ${MUJOCO_TEST_INCLUDE}) target_include_directories(${name} PRIVATE ${MUJOCO_TEST_INCLUDE})
set_target_properties(${name} PROPERTIES BUILD_RPATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}) set_target_properties(${name} PROPERTIES BUILD_RPATH ${CMAKE_LIBRARY_OUTPUT_DIRECTORY})
# gtest_discover_tests is recommended over gtest_add_tests, but has some issues in Windows. # gtest_discover_tests is recommended over gtest_add_tests, but has some issues in Windows.
@@ -59,20 +59,20 @@ target_link_libraries( @@ -60,20 +60,20 @@ target_link_libraries(
PUBLIC absl::core_headers
absl::strings
absl::synchronization absl::synchronization
absl::flat_hash_map
absl::flat_hash_set
- gtest - gtest
- gmock - gmock
+ GTest::gtest + GTest::gtest
@ -528,11 +509,11 @@ index 6bec911..2a16c21 100644
mujoco_test(header_test) mujoco_test(header_test)
-target_link_libraries(header_test fixture gmock) -target_link_libraries(header_test fixture gmock)
+target_link_libraries(header_test fixture GTest::gmock) +target_link_libraries(fixture_test fixture GTest::gmock)
mujoco_test(pipeline_test) mujoco_test(pipeline_test)
-target_link_libraries(pipeline_test fixture gmock) -target_link_libraries(pipeline_test fixture gmock)
+target_link_libraries(pipeline_test fixture GTest::gmock) +target_link_libraries(fixture_test fixture GTest::gmock)
add_subdirectory(benchmark) add_subdirectory(benchmark)
add_subdirectory(engine) add_subdirectory(engine)

View file

@ -30,13 +30,13 @@
stdenv.mkDerivation (final: { stdenv.mkDerivation (final: {
pname = "contour"; pname = "contour";
version = "0.4.2.6429"; version = "0.4.3.6442";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "contour-terminal"; owner = "contour-terminal";
repo = "contour"; repo = "contour";
rev = "v${final.version}"; rev = "v${final.version}";
hash = "sha256-MUgGNglPojFFlGlwrF8ivu18jAnjjfs9pMqu0jLAsYg="; hash = "sha256-m3BEhGbyQm07+1/h2IRhooLPDewmSuhRHOMpWPDluiY=";
}; };
patches = [ ./dont-fix-app-bundle.diff ]; patches = [ ./dont-fix-app-bundle.diff ];

View file

@ -39,17 +39,17 @@ let
in in
buildGoModule rec { buildGoModule rec {
pname = "forgejo"; pname = "forgejo";
version = "1.21.6-0"; version = "1.21.7-0";
src = fetchFromGitea { src = fetchFromGitea {
domain = "codeberg.org"; domain = "codeberg.org";
owner = "forgejo"; owner = "forgejo";
repo = "forgejo"; repo = "forgejo";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-YvLdqNo/zGutPnRVkcxCTcX7Xua0FXUs3veQ2NBgaAA="; hash = "sha256-wYwQnZRIJSbwI+kOPedxnIdfhQ/wWxXpOpdfcFono6k=";
}; };
vendorHash = "sha256-5BznZiPZCwFEl74JVf7ujFtzsTyG6AcKvQG0LdaMKe4="; vendorHash = "sha256-Mptfd1WoUXNQkw7sa/GxIO7s5V5/9VmVBtvPCjMsa/4=";
subPackages = [ "." ]; subPackages = [ "." ];

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "ghq"; pname = "ghq";
version = "1.4.2"; version = "1.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "x-motemen"; owner = "x-motemen";
repo = "ghq"; repo = "ghq";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-ggTx5Kz9cRqOqxxzERv4altf7m1GlreGgOiYCnHyJks="; sha256 = "sha256-l+Ycts7PSKR72GsHJ1zWqpyd0BMMib/GTUv+B0x6d8M=";
}; };
vendorHash = "sha256-6ZDvU3RQ/1M4DZMFOaQsEuodldB8k+2thXNhvZlVQEg="; vendorHash = "sha256-6ZDvU3RQ/1M4DZMFOaQsEuodldB8k+2thXNhvZlVQEg=";

View file

@ -12,13 +12,13 @@
buildPythonApplication rec { buildPythonApplication rec {
pname = "git-machete"; pname = "git-machete";
version = "3.22.0"; version = "3.23.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "virtuslab"; owner = "virtuslab";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-2oEpBNMHj4qpkPp8rXEMsRRiRQeC30hQCQh7d8bOLUU="; hash = "sha256-1b8nKA6/UYiFPx7Va2GBUsGWxeOABFgyVVrYtHcKyrA=";
}; };
nativeBuildInputs = [ installShellFiles ]; nativeBuildInputs = [ installShellFiles ];

View file

@ -18,16 +18,16 @@ let
gix = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/gix"; gix = "${stdenv.hostPlatform.emulator buildPackages} $out/bin/gix";
in rustPlatform.buildRustPackage rec { in rustPlatform.buildRustPackage rec {
pname = "gitoxide"; pname = "gitoxide";
version = "0.33.0"; version = "0.34.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "Byron"; owner = "Byron";
repo = "gitoxide"; repo = "gitoxide";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-mqPaSUBb10LIo95GgqAocD9kALzcSlJyQaimb6xfMLs="; hash = "sha256-CHlLValZnO5Jd7boMWnK9bYCSjjM4Dj6xvn6tBlvP8c=";
}; };
cargoHash = "sha256-JOl/hhyuc6vqeK6/oXXMB3fGRapBsuOTaUG+BQ9QSnk="; cargoHash = "sha256-7nc6eIuY08nTeHMVwKukOdd0zP6xbUPo7NcZ8EEGUNI=";
nativeBuildInputs = [ cmake pkg-config installShellFiles ]; nativeBuildInputs = [ cmake pkg-config installShellFiles ];

View file

@ -4,7 +4,25 @@
, python3 , python3
}: }:
python3.pkgs.buildPythonApplication rec { let
python = python3.override {
packageOverrides = self: super: {
pychromecast = super.pychromecast.overridePythonAttrs (_: rec {
version = "13.1.0";
src = fetchPypi {
pname = "PyChromecast";
inherit version;
hash = "sha256-COYai1S9IRnTyasewBNtPYVjqpfgo7V4QViLm+YMJnY=";
};
postPatch = "";
});
};
};
in
python.pkgs.buildPythonApplication rec {
pname = "catt"; pname = "catt";
version = "0.12.11"; version = "0.12.11";
format = "pyproject"; format = "pyproject";
@ -22,11 +40,11 @@ python3.pkgs.buildPythonApplication rec {
}) })
]; ];
nativeBuildInputs = with python3.pkgs; [ nativeBuildInputs = with python.pkgs; [
poetry-core poetry-core
]; ];
propagatedBuildInputs = with python3.pkgs; [ propagatedBuildInputs = with python.pkgs; [
click click
ifaddr ifaddr
pychromecast pychromecast

View file

@ -12,13 +12,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "media-downloader"; pname = "media-downloader";
version = "4.2.0"; version = "4.3.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "mhogomchungu"; owner = "mhogomchungu";
repo = "media-downloader"; repo = "media-downloader";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-hQLrs4RyHUtcG03h0nCn3uMsHEskGKMVwUkcssGZQLs="; hash = "sha256-+vPGfPncb8f5c9OiBmpMvvDh3X6ZMHPbyngcDfrP9qQ=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "docker-buildx"; pname = "docker-buildx";
version = "0.12.1"; version = "0.13.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "docker"; owner = "docker";
repo = "buildx"; repo = "buildx";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-QC2mlJWjOtqYAB+YrL+s2FsJ79LuLFZGOgSVGL6WmX8="; hash = "sha256-R4+MVC8G4wNwjZtBnLFq+TBiesUYACg9c5y2CUcqHHQ=";
}; };
doCheck = false; doCheck = false;

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "amazon-ecs-agent"; pname = "amazon-ecs-agent";
version = "1.81.0"; version = "1.82.0";
src = fetchFromGitHub { src = fetchFromGitHub {
rev = "v${version}"; rev = "v${version}";
owner = "aws"; owner = "aws";
repo = pname; repo = pname;
hash = "sha256-k2YFxKHXNCKMMyBZ4HSo6bvtEAAp4rnzobDYK3Q5aCY="; hash = "sha256-joI2jNfH4++mpReVGO9V3Yc7cRpykc3F166WEGZ09HA=";
}; };
vendorHash = null; vendorHash = null;

View file

@ -7,16 +7,16 @@
buildGoModule rec { buildGoModule rec {
pname = "kraftkit"; pname = "kraftkit";
version = "0.7.3"; version = "0.7.5";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "unikraft"; owner = "unikraft";
repo = "kraftkit"; repo = "kraftkit";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-61eH2aFue/qJ7Xmu8ueQvsQ5moVpDkHe9p9bywqRwQY="; hash = "sha256-kuI1RSipPj7e8tsnThAEkL3bpmgAEKSQthubfjtklp0=";
}; };
vendorHash = "sha256-4e7g79C6BofnPXPCuquIPfGL7C9TMSdmlIq2HSrz3eY="; vendorHash = "sha256-BPpUBGWzW4jkUgy/2oqvqXBNLmglUVTFA9XuGhUE1zo=";
ldflags = [ ldflags = [
"-s" "-s"

View file

@ -20,17 +20,17 @@
buildGoModule rec { buildGoModule rec {
pname = "aaaaxy"; pname = "aaaaxy";
version = "1.5.23"; version = "1.5.42";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "divVerent"; owner = "divVerent";
repo = pname; repo = pname;
rev = "v${version}"; rev = "v${version}";
hash = "sha256-AB2MBXNWfWo8X5QTt2w8nrSG3v9qpIkMB7BUUKQtQEk="; hash = "sha256-RfjEr0oOtLcrHKQj1dYbykRbHoGoi0o7D3hjVG3siIQ=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
vendorHash = "sha256-ECKzKGMQjmZFHn/lzVzijpXlFcAKuUsiD/HVz59clAc="; vendorHash = "sha256-q/nDfh+A2eJDAaSWN4Xsgxp76AKsYIX7PNn/psBPmg0=";
buildInputs = [ buildInputs = [
alsa-lib alsa-lib

View file

@ -5,11 +5,11 @@
let let
pname = "arduino-ide"; pname = "arduino-ide";
version = "2.2.1"; version = "2.3.2";
src = fetchurl { src = fetchurl {
url = "https://github.com/arduino/arduino-ide/releases/download/${version}/arduino-ide_${version}_Linux_64bit.AppImage"; url = "https://github.com/arduino/arduino-ide/releases/download/${version}/arduino-ide_${version}_Linux_64bit.AppImage";
hash = "sha256-77uS/3ean3dWG/vDHG+ry238hiJlYub7H03f15eJu+I="; hash = "sha256-M7JKfld6DRk4hxih5MufAhW9kJ+ePDrBhE+oXFc8dYw=";
}; };
appimageContents = appimageTools.extractType2 { inherit pname version src; }; appimageContents = appimageTools.extractType2 { inherit pname version src; };

View file

@ -2,13 +2,13 @@
buildDotnetModule rec { buildDotnetModule rec {
pname = "Boogie"; pname = "Boogie";
version = "3.0.10"; version = "3.1.1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "boogie-org"; owner = "boogie-org";
repo = "boogie"; repo = "boogie";
rev = "v${version}"; rev = "v${version}";
sha256 = "sha256-0E4yAVNWJC67vX0DTQj1ZH7T6JKOgE0BDf6u0V0QvFA="; sha256 = "sha256-k3+8VlE6dRx3t+qhheHsRl+MBcnh/M1cRgfks5eLvck=";
}; };
projectFile = [ "Source/Boogie.sln" ]; projectFile = [ "Source/Boogie.sln" ];

View file

@ -7,13 +7,13 @@
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "bruteforce-salted-openssl"; pname = "bruteforce-salted-openssl";
version = "1.4.2"; version = "1.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "glv2"; owner = "glv2";
repo = "bruteforce-salted-openssl"; repo = "bruteforce-salted-openssl";
rev = version; rev = version;
hash = "sha256-ICxXdKjRP2vXdJpjn0PP0/6rw9LKju0nVOSj47TyrzY="; hash = "sha256-hXB4CUQ5pihKmahyK359cgQACrs6YH1gHmZJAuTXgQM=";
}; };
nativeBuildInputs = [ nativeBuildInputs = [

View file

@ -7,13 +7,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "cimg"; pname = "cimg";
version = "3.3.3"; version = "3.3.4";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "GreycLab"; owner = "GreycLab";
repo = "CImg"; repo = "CImg";
rev = "v.${finalAttrs.version}"; rev = "v.${finalAttrs.version}";
hash = "sha256-6rgtFBt2GcxuGWd4+/ZZzsJqr3XrnhEzJEPLgOt4G2Q="; hash = "sha256-qo/k5NpTqu+o2WUEOThozuBJVPMMy8OvIMo2DfJUE8g=";
}; };
outputs = [ "out" "doc" ]; outputs = [ "out" "doc" ];

View file

@ -7,16 +7,16 @@
}: }:
let let
openShiftVersion = "4.14.8"; openShiftVersion = "4.14.12";
okdVersion = "4.14.0-0.okd-scos-2024-01-10-151818"; okdVersion = "4.14.0-0.okd-scos-2024-01-10-151818";
microshiftVersion = "4.14.8"; microshiftVersion = "4.14.12";
podmanVersion = "4.4.4"; podmanVersion = "4.4.4";
writeKey = "$(MODULEPATH)/pkg/crc/segment.WriteKey=cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp"; writeKey = "$(MODULEPATH)/pkg/crc/segment.WriteKey=cvpHsNcmGCJqVzf6YxrSnVlwFSAZaYtp";
gitCommit = "54a6f9a15155edb2bdb70128c7c535fc69841031"; gitCommit = "c43b172866bc039a2a23d6c88aeb398635dc16ef";
gitHash = "sha256-tjrlh31J3fDiYm2+PUnVVRIxxQvJKQVLcYEnMekD4Us="; gitHash = "sha256-DVsXxgywPrrdxfmXh3JR8YpFkv1/Y2LvDZ9/2nVbclc=";
in in
buildGoModule rec { buildGoModule rec {
version = "2.32.0"; version = "2.33.0";
pname = "crc"; pname = "crc";
src = fetchFromGitHub { src = fetchFromGitHub {

View file

@ -1,6 +1,9 @@
{ lib { lib
, stdenv , stdenv
, fetchzip , fetchzip
, fetchurl
, makeDesktopItem
, copyDesktopItems
, buildFHSEnv , buildFHSEnv
, alsa-lib , alsa-lib
, freetype , freetype
@ -10,22 +13,43 @@
let let
pname = "decent-sampler"; pname = "decent-sampler";
version = "1.9.4"; version = "1.10.0";
icon = fetchurl {
url = "https://archive.org/download/ds-256/DS256.png";
hash = "sha256-SV8zY5QJ6uRSrLuGTmT1zwGoIIXCV9GD2ZNiqK+i1Bc=";
};
decent-sampler = stdenv.mkDerivation { decent-sampler = stdenv.mkDerivation {
inherit pname version; inherit pname version;
src = fetchzip { src = fetchzip {
# dropbox link: https://www.dropbox.com/sh/dwyry6xpy5uut07/AABBJ84bjTTSQWzXGG5TOQpfa\ # dropbox links: https://www.dropbox.com/sh/dwyry6xpy5uut07/AABBJ84bjTTSQWzXGG5TOQpfa\
url = "https://archive.org/download/decent-sampler-linux-static-download-mirror/Decent_Sampler-${version}-Linux-Static-x86_64.tar.gz"; url = "https://archive.org/download/decent-sampler-linux-static-download-mirror/Decent_Sampler-${version}-Linux-Static-x86_64.tar.gz";
hash = "sha256-lTp/mukCwLNyeTcBT68eqa7aD0o11Bylbd93A5VCILU="; hash = "sha256-KYCf/F2/ziuXDHim4FPZQBARiSywvQDJBzKbHua+3SM=";
}; };
nativeBuildInputs = [ copyDesktopItems ];
desktopItems = [
(makeDesktopItem {
type = "Application";
name = "decent-sampler";
desktopName = "Decent Sampler";
comment = "DecentSampler player";
icon = "decent-sampler";
exec = "decent-sampler";
categories = [ "Audio" "AudioVideo" ];
})
];
installPhase = '' installPhase = ''
runHook preInstall runHook preInstall
install -Dm755 DecentSampler $out/bin/decent-sampler install -Dm755 DecentSampler $out/bin/decent-sampler
install -Dm755 DecentSampler.so -t $out/lib/vst
install -d "$out/lib/vst3" && cp -r "DecentSampler.vst3" $out/lib/vst3
install -Dm444 ${icon} $out/share/pixmaps/decent-sampler.png
runHook postInstall runHook postInstall
''; '';
@ -34,7 +58,7 @@ let
in in
buildFHSEnv { buildFHSEnv {
inherit pname version; inherit (decent-sampler) pname version;
targetPkgs = pkgs: [ targetPkgs = pkgs: [
alsa-lib alsa-lib
@ -46,6 +70,11 @@ buildFHSEnv {
runScript = "decent-sampler"; runScript = "decent-sampler";
extraInstallCommands = ''
cp -r ${decent-sampler}/lib $out/lib
cp -r ${decent-sampler}/share $out/share
'';
meta = with lib; { meta = with lib; {
description = "An audio sample player"; description = "An audio sample player";
longDescription = '' longDescription = ''

View file

@ -13,11 +13,11 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
name = "dorion"; name = "dorion";
version = "4.1.2"; version = "4.1.3";
src = fetchurl { src = fetchurl {
url = "https://github.com/SpikeHD/Dorion/releases/download/v${finalAttrs.version }/Dorion_${finalAttrs.version}_amd64.deb"; url = "https://github.com/SpikeHD/Dorion/releases/download/v${finalAttrs.version }/Dorion_${finalAttrs.version}_amd64.deb";
hash = "sha256-hpZF83QPRcRqI0wCnIu6CsNBe8b9H0KrDyp6CDYkOfQ="; hash = "sha256-O6KXOouutrNla5dkHRQeT0kp8DQO9MLoJrIMuqam/60=";
}; };
unpackCmd = '' unpackCmd = ''

View file

@ -11,13 +11,13 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "eiwd"; pname = "eiwd";
version = "2.10-1"; version = "2.14-1";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "illiliti"; owner = "illiliti";
repo = "eiwd"; repo = "eiwd";
rev = finalAttrs.version; rev = finalAttrs.version;
hash = "sha256-AB4NBwfELy0yjzxS0rCcF641CGEdyM9tTB+ZWaM+erg="; hash = "sha256-9d7XDA98qMA6Myeik2Tpj0x6yd5VQozt+FHl0U3da50=";
fetchSubmodules = true; fetchSubmodules = true;
}; };

View file

@ -2,13 +2,13 @@
buildGoModule rec { buildGoModule rec {
pname = "fanbox-dl"; pname = "fanbox-dl";
version = "0.18.2"; version = "0.19.2";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "hareku"; owner = "hareku";
repo = "fanbox-dl"; repo = "fanbox-dl";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-hHjkV/wv+UMO4pyWDyMio3XbiyM6M02eLcT2rauvh/A="; hash = "sha256-puFFby6+e5FDWduETtI5Iflq9E65vJkg2gRdcUxpRKk=";
}; };
vendorHash = "sha256-o1DFHwSpHtbuU8BFcrk18hPRJJkeoPkYnybIz22Blfk="; vendorHash = "sha256-o1DFHwSpHtbuU8BFcrk18hPRJJkeoPkYnybIz22Blfk=";

View file

@ -10,16 +10,16 @@
buildNpmPackage rec { buildNpmPackage rec {
pname = "igir"; pname = "igir";
version = "2.2.1"; version = "2.5.0";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "emmercm"; owner = "emmercm";
repo = "igir"; repo = "igir";
rev = "v${version}"; rev = "v${version}";
hash = "sha256-MlLnnwlqFkzSZi+6OGS/ZPYRPjV7CY/piFvilwhhR9A="; hash = "sha256-7gK3NTjirlaraUWGixDdeQrCip9W3X/18mbzXYOizRs=";
}; };
npmDepsHash = "sha256-yVo2ZKu2lEOYG12Gk5GQXamprkP5jEyKlSTZdPjNWQM="; npmDepsHash = "sha256-2X0zCCHKFps3fN5X7rnOdD//D7RU9m4V9cyr3CgoXOE=";
# I have no clue why I have to do this # I have no clue why I have to do this
postPatch = '' postPatch = ''

View file

@ -5,11 +5,11 @@
stdenv.mkDerivation (finalAttrs: { stdenv.mkDerivation (finalAttrs: {
pname = "keepass"; pname = "keepass";
version = "2.55"; version = "2.56";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/keepass/KeePass-${finalAttrs.version}-Source.zip"; url = "mirror://sourceforge/keepass/KeePass-${finalAttrs.version}-Source.zip";
hash = "sha256-XZf/5b+rwASB41DP3It3g8UUPIHWEtZBXGk+Qrjw1Bc="; hash = "sha256-e6+z3M36LiS0/UonJOvD3q6+Ic31uMixL8DoML0UhEQ=";
}; };
sourceRoot = "."; sourceRoot = ".";

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