diff --git a/nixos/maintainers/scripts/lxd/lxd-container-image.nix b/nixos/maintainers/scripts/lxd/lxd-container-image.nix
index 930ab34af385..8c0e75e84f75 100644
--- a/nixos/maintainers/scripts/lxd/lxd-container-image.nix
+++ b/nixos/maintainers/scripts/lxd/lxd-container-image.nix
@@ -20,7 +20,7 @@
};
in ''
if [ ! -e /etc/nixos/configuration.nix ]; then
- install -m 644 -D ${config} /etc/nixos/configuration.nix
+ install -m 0644 -D ${config} /etc/nixos/configuration.nix
fi
'';
diff --git a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix
index bbbdd1f3fa17..8a1c9b0d634c 100644
--- a/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix
+++ b/nixos/maintainers/scripts/lxd/lxd-virtual-machine-image.nix
@@ -20,8 +20,7 @@
};
in ''
if [ ! -e /etc/nixos/configuration.nix ]; then
- mkdir -p /etc/nixos
- cp ${config} /etc/nixos/configuration.nix
+ install -m 0644 -D ${config} /etc/nixos/configuration.nix
fi
'';
diff --git a/nixos/modules/config/xdg/portal.nix b/nixos/modules/config/xdg/portal.nix
index 2c4d07c4953c..2368ca04a49e 100644
--- a/nixos/modules/config/xdg/portal.nix
+++ b/nixos/modules/config/xdg/portal.nix
@@ -96,7 +96,7 @@ in
Sets which portal backend should be used to provide the implementation
for the requested interface. For details check {manpage}`portals.conf(5)`.
- Configs will be linked to `/etx/xdg/xdg-desktop-portal/` with the name `$desktop-portals.conf`
+ Configs will be linked to `/etc/xdg/xdg-desktop-portal/` with the name `$desktop-portals.conf`
for `xdg.portal.config.$desktop` and `portals.conf` for `xdg.portal.config.common`
as an exception.
'';
diff --git a/pkgs/applications/emulators/retroarch/hashes.json b/pkgs/applications/emulators/retroarch/hashes.json
index a8862fdbcf18..6737bef671a3 100644
--- a/pkgs/applications/emulators/retroarch/hashes.json
+++ b/pkgs/applications/emulators/retroarch/hashes.json
@@ -246,10 +246,10 @@
"src": {
"owner": "schellingb",
"repo": "dosbox-pure",
- "rev": "1c7ad4fafc5204e3aff83e2caa6020cb2fe43a2d",
- "hash": "sha256-cOamfnwLilAz2I8CKA18JvauadbObuAq4JabNcdw7EQ="
+ "rev": "1e3cb35355769467ca7be192e740eb9728ecc88c",
+ "hash": "sha256-svVpHUOPPAFMypmeaHLCQfwTAVOZajTMKyeKvWLZlcc="
},
- "version": "unstable-2024-05-20"
+ "version": "unstable-2024-06-03"
},
"easyrpg": {
"fetcher": "fetchFromGitHub",
@@ -348,10 +348,10 @@
"src": {
"owner": "libretro",
"repo": "gambatte-libretro",
- "rev": "238b195bca073bc1a2032c4e92c097d157e521f8",
- "hash": "sha256-i9+a1kVlJ6EPaCOMkuIZgujNEg6MwPRM3mHnhconWHo="
+ "rev": "f0d83f0eff4ad91471f90acd098d078eea0a67b3",
+ "hash": "sha256-zcqFVPotOu5gDwzgWzn0lpzhcTwQUm81UpA5FtCrz1M="
},
- "version": "unstable-2024-05-17"
+ "version": "unstable-2024-06-02"
},
"genesis-plus-gx": {
"fetcher": "fetchFromGitHub",
@@ -814,10 +814,10 @@
"src": {
"owner": "libretro",
"repo": "swanstation",
- "rev": "d5169ed204838b622551c82b3c20df376324870f",
- "hash": "sha256-ixLd2xdy6r5irNEhBDbdMpvRR7clnHr1LrTywuqkr84="
+ "rev": "7a27436548128c00e70b08dde63c52118e2a6228",
+ "hash": "sha256-u7D044lKNAH4aAaY/Ol7BR3dNeusX4wirIMdUEGw2oM="
},
- "version": "unstable-2024-05-27"
+ "version": "unstable-2024-05-30"
},
"tgbdual": {
"fetcher": "fetchFromGitHub",
diff --git a/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix b/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix
index b4e60fdcaba8..36bc02c43f7d 100644
--- a/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix
+++ b/pkgs/applications/emulators/retroarch/retroarch-joypad-autoconfig.nix
@@ -6,13 +6,13 @@
stdenvNoCC.mkDerivation rec {
pname = "retroarch-joypad-autoconfig";
- version = "1.18.1";
+ version = "1.19.0";
src = fetchFromGitHub {
owner = "libretro";
repo = "retroarch-joypad-autoconfig";
rev = "v${version}";
- hash = "sha256-eWfSqHusTri1HQUkSxY/iAceF/9PFVMC0rhLu/4W35k=";
+ hash = "sha256-iwxTMwGHix2K5UyjBWFamyo3nVULxwbIF+djyQWz5L0=";
};
makeFlags = [
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 62465e5efd2f..bfb40dc9bc2d 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -18,15 +18,15 @@
let
isQt6 = lib.versions.major qtbase.version == "6";
pdfjs = let
- version = "4.0.269";
+ version = "4.2.67";
in
fetchzip {
url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip";
- hash = "sha256-8gwJUxygcdvERDni/k6WIx3tzk7yb+qHZ4NsfkP0VDo=";
+ hash = "sha256-7kfT3+ZwoGqZ5OwkO9h3DIuBFd0v8fRlcufxoBdcy8c=";
stripRoot = false;
};
- version = "3.1.0";
+ version = "3.2.0";
in
python3.pkgs.buildPythonApplication {
@@ -34,7 +34,7 @@ python3.pkgs.buildPythonApplication {
inherit version;
src = fetchurl {
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/qutebrowser-${version}.tar.gz";
- hash = "sha256-UA3MHMoI1rC4FPowbiII4lM1rL4OLPmZ+1GRbg9LLl8=";
+ hash = "sha256-4eGRG5VWI2rKpZ0NGYbWFHlvs2Zz0TljwhZYzWSh8DM=";
};
# Needs tox
diff --git a/pkgs/applications/version-management/glab/default.nix b/pkgs/applications/version-management/glab/default.nix
index 2d704143bfda..9f3e08464dd3 100644
--- a/pkgs/applications/version-management/glab/default.nix
+++ b/pkgs/applications/version-management/glab/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "glab";
- version = "1.40.0";
+ version = "1.41.0";
src = fetchFromGitLab {
owner = "gitlab-org";
repo = "cli";
rev = "v${version}";
- hash = "sha256-setvszKdG2EQUlVJNbo7gPKE4b7lfdGT30MC82Kk2/s=";
+ hash = "sha256-DvIp7eMBWKWQ5VW9MW391xnUz8o1KNz1mkJtu7YVILo=";
};
- vendorHash = "sha256-vx4dNFM0PfapRQxz9ef1vNs4RiZlZDNhcKlo87gjGTs=";
+ vendorHash = "sha256-WM19Kx2b31e4/iA92U9FUuF8R1DMvbKotE2D9HpLQpQ=";
ldflags = [
"-s"
diff --git a/pkgs/by-name/oi/oils-for-unix/package.nix b/pkgs/by-name/oi/oils-for-unix/package.nix
index f477d66d8a07..316ba4a15030 100644
--- a/pkgs/by-name/oi/oils-for-unix/package.nix
+++ b/pkgs/by-name/oi/oils-for-unix/package.nix
@@ -51,9 +51,6 @@ stdenv.mkDerivation rec {
"--readline=${readline-all}"
];
- # Stripping breaks the bundles by removing the zip file from the end.
- dontStrip = true;
-
meta = {
description = "A Unix shell with JSON-compatible structured data. It's our upgrade path from bash to a better language and runtime.";
homepage = "https://www.oilshell.org/";
diff --git a/pkgs/by-name/pk/pkcrack/package.nix b/pkgs/by-name/pk/pkcrack/package.nix
index 2f3f16e07411..5cbe977c38ec 100644
--- a/pkgs/by-name/pk/pkcrack/package.nix
+++ b/pkgs/by-name/pk/pkcrack/package.nix
@@ -5,11 +5,11 @@
stdenv.mkDerivation (finalAttrs: {
pname = "pkcrack";
- version = "1.2.2";
+ version = "1.2.3";
src = fetchurl {
url = "https://www.unix-ag.uni-kl.de/~conrad/krypto/pkcrack/pkcrack-${finalAttrs.version}.tar.gz";
- hash = "sha256-TS3Bk/+kNCrC7TpjEf33cK5qB3Eiaz70U9yo0D5DiVo=";
+ hash = "sha256-j0n6OHlio3oUyavVSQFnIaY0JREFv0uDfMcvC61BPTg=";
};
sourceRoot = "pkcrack-${finalAttrs.version}/src";
diff --git a/pkgs/by-name/pr/protege/enforce-plugin-versions.patch b/pkgs/by-name/pr/protege/enforce-plugin-versions.patch
new file mode 100644
index 000000000000..1df4594f2c99
--- /dev/null
+++ b/pkgs/by-name/pr/protege/enforce-plugin-versions.patch
@@ -0,0 +1,43 @@
+diff --git a/pom.xml b/pom.xml
+index 839bed04..4cb5f392 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -358,6 +358,30 @@
+ 11
+
+
++
++
++ org.apache.maven.plugins
++ maven-install-plugin
++ 3.1.1
++
++
++
++ org.apache.maven.plugins
++ maven-site-plugin
++ 3.12.1
++
++
++
++ org.apache.maven.plugins
++ maven-deploy-plugin
++ 3.1.1
++
++
++
++ org.apache.maven.plugins
++ maven-jar-plugin
++ 3.3.0
++
+
+
+ org.apache.maven.plugins
+@@ -476,6 +494,7 @@
+
+ 3.6.3
+
++
+
+
+
diff --git a/pkgs/by-name/pr/protege/package.nix b/pkgs/by-name/pr/protege/package.nix
new file mode 100644
index 000000000000..f6d22a08e2f5
--- /dev/null
+++ b/pkgs/by-name/pr/protege/package.nix
@@ -0,0 +1,93 @@
+{ lib
+, fetchFromGitHub
+, copyDesktopItems
+, iconConvTools
+, makeDesktopItem
+, makeWrapper
+, jdk11
+, maven
+}:
+
+let
+ mvn = maven.override { jdk = jdk11; };
+in
+mvn.buildMavenPackage rec {
+ pname = "protege";
+ version = "5.6.4";
+
+ src = fetchFromGitHub {
+ owner = "protegeproject";
+ repo = "protege";
+ rev = version;
+ hash = "sha256-Q3MHa7nCeF31n7JPltcemFBc/sJwGA9Ev0ymjQhY/U0=";
+ };
+
+ mvnHash = "sha256-kemP2gDv1CYuaoK0fwzBxdLTusarPasf2jCDQj/HPYE=";
+
+ patches = [
+ # Pin built-in Maven plugins to avoid checksum variations on Maven updates
+ ./enforce-plugin-versions.patch
+ # Avoid building platform-dependent builds which embed their own JREs
+ ./platform-independent-only.patch
+ ];
+
+ nativeBuildInputs = [
+ copyDesktopItems
+ iconConvTools
+ jdk11
+ makeWrapper
+ ];
+
+ installPhase = ''
+ runHook preInstall
+
+ mkdir -p $out/bin $out/share/protege
+
+ # Copy the application directory whole into the output, as it is used by the
+ # launcher script as a reference point to look for default configuration
+ mv protege-desktop/target/protege-${version}-platform-independent/Protege-${version} $out/Protege
+
+ # Place a wrapper for the launcher script into a default /bin location
+ makeWrapper $out/Protege/run.sh $out/bin/protege \
+ --set JAVA_HOME ${jdk11.home}
+
+ # Link all jars from within the standard /share/protege directory
+ ln -s -t $out/share/protege $out/Protege/bundles/*
+
+ # Generate and copy icons to where they can be found
+ icoFileToHiColorTheme $out/Protege/app/Protege.ico protege $out
+
+ runHook postInstall
+ '';
+
+ desktopItems = [
+ (makeDesktopItem {
+ name = pname;
+ desktopName = "Protege Desktop";
+ genericName = "Ontology Editor";
+ icon = "protege";
+ comment = meta.description;
+ categories = [ "Development" ];
+ exec = "protege";
+ })
+ ];
+
+ meta = {
+ homepage = "https://protege.stanford.edu/";
+ downloadPage = "https://protege.stanford.edu/software.php#desktop-protege";
+ description = "A free and open-source OWL 2 ontology editor";
+ longDescription = ''
+ Protégé Desktop is a feature rich ontology editing environment with full
+ support for the OWL 2 Web Ontology Language, and direct in-memory
+ connections to description logic reasoners.
+ '';
+ maintainers = with lib.maintainers; [ nessdoor ];
+ license = with lib.licenses; [ bsd2 ];
+ # TODO Protege is able to run on Darwin as well, but I (@nessdoor) had no
+ # way of testing it nor any experience in packaging Darwin apps, so I
+ # will leave the task to someone who has the right tools and knowledge.
+ platforms = lib.platforms.unix;
+ mainProgram = "protege";
+ sourceProvenance = with lib.sourceTypes; [ fromSource binaryBytecode ];
+ };
+}
diff --git a/pkgs/by-name/pr/protege/platform-independent-only.patch b/pkgs/by-name/pr/protege/platform-independent-only.patch
new file mode 100644
index 000000000000..d0f489372f2e
--- /dev/null
+++ b/pkgs/by-name/pr/protege/platform-independent-only.patch
@@ -0,0 +1,24 @@
+diff --git a/protege-desktop/pom.xml b/protege-desktop/pom.xml
+index 2f599708..60059308 100644
+--- a/protege-desktop/pom.xml
++++ b/protege-desktop/pom.xml
+@@ -110,9 +110,6 @@
+
+
+ src/main/assembly/protege-platform-independent.xml
+- src/main/assembly/protege-os-x.xml
+- src/main/assembly/protege-win.xml
+- src/main/assembly/protege-linux.xml
+
+
+
+@@ -165,9 +162,6 @@
+
+
+ src/main/assembly/protege-platform-independent.xml
+- src/main/assembly/protege-os-x.xml
+- src/main/assembly/protege-win.xml
+- src/main/assembly/protege-linux.xml
+
+
+
diff --git a/pkgs/by-name/ra/radicale/package.nix b/pkgs/by-name/ra/radicale/package.nix
index d3637df36b07..64d85ea2b939 100644
--- a/pkgs/by-name/ra/radicale/package.nix
+++ b/pkgs/by-name/ra/radicale/package.nix
@@ -6,14 +6,14 @@
python3.pkgs.buildPythonApplication rec {
pname = "radicale";
- version = "3.2.0";
+ version = "3.2.1";
pyproject = true;
src = fetchFromGitHub {
owner = "Kozea";
repo = "Radicale";
rev = "v${version}";
- hash = "sha256-RxC8VOfdTXJZiAroDHTKjJqGWu65Z5uyb4WK1LOqubQ=";
+ hash = "sha256-OUwznn71xl8oWkw90fT1NYYZOuD83k+B5zLhygp1VQQ=";
};
postPatch = ''