gador/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Vladimír Čunát
2025-10-21 09:57:22 +02:00
parent 5ee8efde22 931a44a89f
commit aa271cc9a4
45 changed files with 212 additions and 315 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/by-name/co/cosmic-applets/package.nix
+3 -3
View File
@@ -20,17 +20,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-applets";
version = "1.0.0-beta.1.1";
version = "1.0.0-beta.2";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-applets";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-uUcEwa9rGHLzmlutmLl/e38ZqybfYMU0Dhe+FsT5V/E=";
hash = "sha256-Vs6sNf6nbOqxlHq3NTFyRltiWVdPmumvuAq8nlWZEkc=";
};
cargoHash = "sha256-RnkyIlTJMxMGu+EsmZwvSIapSqdng+t8bqMVsDXprlU=";
cargoHash = "sha256-uTKHCrgy3URLvqO96CJ0jORZF9/KPDf59iEsdrK1tY4=";
nativeBuildInputs = [
just
pkgs/by-name/co/cosmic-applibrary/package.nix
+3 -3
View File
@@ -11,17 +11,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-applibrary";
version = "1.0.0-beta.1.1";
version = "1.0.0-beta.2";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-applibrary";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-LVNOUOVeX8QpTbUG3bOhMkdrjkF3M0sZg+agSQyWAfA=";
hash = "sha256-Y0fohkNV9C78rGK+uoofQBDdK6Fb7XzmAdY1SorKFxA=";
};
cargoHash = "sha256-f5uMgscentTlcPXFSan1kKcKh1nk88/3kQPTSuc0wz4=";
cargoHash = "sha256-s2YiB4U/pVAul2YC5/6bCVwKd18odoTAua4YhUJDN3U=";
nativeBuildInputs = [
just
pkgs/by-name/co/cosmic-bg/package.nix
+2 -2
View File
@@ -13,14 +13,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-bg";
version = "1.0.0-beta.1.1";
version = "1.0.0-beta.2";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-bg";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-t5tY7Axiz39lCDhDC/lKSRCURfHspeaP49kNXJvCLC4=";
hash = "sha256-mF6W/RND9cNfS27lQNZRcXY4OUMS+UUMMcEalBQ59Yg=";
};
postPatch = ''
pkgs/by-name/co/cosmic-comp/package.nix
+3 -3
View File
@@ -20,17 +20,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-comp";
version = "1.0.0-beta.1.1";
version = "1.0.0-beta.2";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-comp";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-RHeQk1yBNnDN/efuDDWNLn9O7FQTYLBsbs+h+gxi+Xo=";
hash = "sha256-VMM26rSO1ldM5WgoSJ5z89UgEK2GFNyDbqwdN53p8J8=";
};
cargoHash = "sha256-Jaw2v+02lA5wWRAhRNW/lcLnTI7beJIZ43dqcJ60EP0=";
cargoHash = "sha256-hqw5nGKP0nw00qQoHyrcryVg2Kkdnx6yyJIERbh3DFE=";
separateDebugInfo = true;
pkgs/by-name/co/cosmic-edit/package.nix
+3 -3
View File
@@ -16,17 +16,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-edit";
version = "1.0.0-beta.1.1";
version = "1.0.0-beta.2";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-edit";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-Zd/vTNZt9tPXryOwo2U68FtIul7xiRcz5N4Heuyicoc=";
hash = "sha256-AIx7lZSWApdNMETVxTXmAeMcDlPFitG5lLlhAi+NUF0=";
};
cargoHash = "sha256-YfD06RAQPZRwapd0fhNsZ0tx+0JMNDXiPJIWwDhmG0M=";
cargoHash = "sha256-RwBrZ6cgr/7qmZZ+680otWQSWZyW04QE/102l+bKtpc=";
postPatch = ''
substituteInPlace justfile --replace-fail '#!/usr/bin/env' "#!$(command -v env)"
pkgs/by-name/co/cosmic-files/package.nix
+3 -3
View File
@@ -12,17 +12,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-files";
version = "1.0.0-beta.1.1";
version = "1.0.0-beta.2";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-files";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-pSjmsWsGGhjCekMTX8iiNVbF5X33zg5YVDWtemjIDWU=";
hash = "sha256-D4oyuNSGMGRLRkPmKYIXUCTZh94QJuUYBbpiLA4szKk=";
};
cargoHash = "sha256-7RANj+aXdmBVO66QDgcNrrU4qEGK4Py4+ZctYWU1OO8=";
cargoHash = "sha256-GLO5d+NRaKIlc7K1CZ0YH9kp6Q0rVfh0sJRjMLqPTBY=";
nativeBuildInputs = [
just
pkgs/by-name/co/cosmic-greeter/package.nix
+6 -4
View File
@@ -19,20 +19,22 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-greeter";
version = "1.0.0-beta.1.1";
version = "1.0.0-beta.2";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-greeter";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-rMZ+UbHarnvPaVAI5XeBfLduWEZHthguRSKLv3d/Eo0=";
hash = "sha256-Q4JrqyZbqdRk9nYk+u61CCHIucUOP4VjNALJRGaCfn4=";
};
cargoHash = "sha256-qioWGfg+cMaRNX6H6IWdcAU2py7oq9eNaxzKWw0H4R4=";
env.VERGEN_GIT_COMMIT_DATE = "2025-09-16";
env.VERGEN_GIT_SHA = finalAttrs.src.tag;
env = {
VERGEN_GIT_COMMIT_DATE = "2025-10-14";
VERGEN_GIT_SHA = finalAttrs.src.tag;
};
cargoBuildFlags = [ "--all" ];
pkgs/by-name/co/cosmic-icons/package.nix
+1 -1
View File
@@ -9,7 +9,7 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "cosmic-icons";
version = "1.0.0-beta.1.1";
version = "1.0.0-beta.2";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
pkgs/by-name/co/cosmic-idle/package.nix
+1 -1
View File
@@ -16,7 +16,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-idle";
version = "1.0.0-beta.1.1";
version = "1.0.0-beta.2";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
pkgs/by-name/co/cosmic-initial-setup/disable-language-page.patch
-74
View File
@@ -1,74 +0,0 @@
diff --git a/src/main.rs b/src/main.rs
index a0e8f2e..07cf8b9 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -194,19 +194,19 @@ impl Application for App {
}
}
- page::Message::Language(message) => {
- if let Some(page) =
- self.pages.get_mut(&TypeId::of::<page::language::Page>())
- {
- return page
- .as_any()
- .downcast_mut::<page::language::Page>()
- .unwrap()
- .update(message)
- .map(Message::PageMessage)
- .map(cosmic::Action::App);
- }
- }
+ // page::Message::Language(message) => {
+ // if let Some(page) =
+ // self.pages.get_mut(&TypeId::of::<page::language::Page>())
+ // {
+ // return page
+ // .as_any()
+ // .downcast_mut::<page::language::Page>()
+ // .unwrap()
+ // .update(message)
+ // .map(Message::PageMessage)
+ // .map(cosmic::Action::App);
+ // }
+ // }
page::Message::Layout(message) => {
if let Some(page) = self.pages.get_mut(&TypeId::of::<page::layout::Page>())
diff --git a/src/page/mod.rs b/src/page/mod.rs
index 389728c..937a1b3 100644
--- a/src/page/mod.rs
+++ b/src/page/mod.rs
@@ -4,7 +4,7 @@ use std::any::{Any, TypeId};
pub mod appearance;
pub mod keyboard;
-pub mod language;
+// pub mod language;
pub mod launcher;
pub mod layout;
pub mod location;
@@ -34,10 +34,10 @@ pub fn pages(mode: AppMode) -> IndexMap<TypeId, Box<dyn Page>> {
if let AppMode::NewInstall { create_user } = mode {
pages.insert(TypeId::of::<wifi::Page>(), Box::new(wifi::Page::default()));
- pages.insert(
- TypeId::of::<language::Page>(),
- Box::new(language::Page::new()),
- );
+ // pages.insert(
+ // TypeId::of::<language::Page>(),
+ // Box::new(language::Page::new()),
+ // );
pages.insert(
TypeId::of::<keyboard::Page>(),
@@ -95,7 +95,7 @@ pub fn pages(mode: AppMode) -> IndexMap<TypeId, Box<dyn Page>> {
pub enum Message {
Appearance(appearance::Message),
Keyboard(keyboard::Message),
- Language(language::Message),
+ // Language(language::Message),
Layout(layout::Message),
Location(location::Message),
SetTheme(cosmic::Theme),
pkgs/by-name/co/cosmic-initial-setup/disable-timezone-page.patch
-64
View File
@@ -1,64 +0,0 @@
diff --git a/src/main.rs b/src/main.rs
index a0e8f2e..b6ff8dc 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -221,7 +221,7 @@ impl Application for App {
}
}
- page::Message::Location(message) => {
+ /* page::Message::Location(message) => {
if let Some(page) =
self.pages.get_mut(&TypeId::of::<page::location::Page>())
{
@@ -233,7 +233,7 @@ impl Application for App {
.map(Message::PageMessage)
.map(cosmic::Action::App);
}
- }
+ } */
page::Message::User(message) => {
if let Some(page) = self.pages.get_mut(&TypeId::of::<page::user::Page>()) {
diff --git a/src/page/mod.rs b/src/page/mod.rs
index 389728c..38ced5e 100644
--- a/src/page/mod.rs
+++ b/src/page/mod.rs
@@ -7,7 +7,7 @@ pub mod keyboard;
pub mod language;
pub mod launcher;
pub mod layout;
-pub mod location;
+// pub mod location;
pub mod new_apps;
pub mod new_shortcuts;
pub mod user;
@@ -48,10 +48,10 @@ pub fn pages(mode: AppMode) -> IndexMap<TypeId, Box<dyn Page>> {
pages.insert(TypeId::of::<user::Page>(), Box::new(user::Page::default()));
}
- pages.insert(
+ /* pages.insert(
TypeId::of::<location::Page>(),
Box::new(location::Page::new()),
- );
+ ); */
}
pages.insert(
@@ -97,7 +97,7 @@ pub enum Message {
Keyboard(keyboard::Message),
Language(language::Message),
Layout(layout::Message),
- Location(location::Message),
+ // Location(location::Message),
SetTheme(cosmic::Theme),
User(user::Message),
Welcome(welcome::Message),
@@ -150,4 +150,4 @@ pub trait Page {
fn view(&self) -> Element<'_, Message> {
widget::text::body("TODO").into()
}
-}
+}
\ No newline at end of file
pkgs/by-name/co/cosmic-initial-setup/package.nix
+8 -15
View File
@@ -3,8 +3,8 @@
stdenv,
rustPlatform,
fetchFromGitHub,
fetchpatch2,
just,
killall,
libcosmicAppHook,
libinput,
openssl,
@@ -14,13 +14,13 @@
}:
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-initial-setup";
version = "1.0.0-beta.1.1";
version = "1.0.0-beta.2";
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-initial-setup";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-kjJqGNcIlnzEsfA4eQ9D23ZGgRcmWQyWheAlwpjfALA=";
hash = "sha256-sgtZioUvBDSqlBVWbqGc2iVpZKF0fn/Mr1qo1qlzdlA=";
};
cargoHash = "sha256-orwK9gcFXK4/+sfwRubcz0PP6YAFqsENRHnlSLttLxM=";
@@ -41,23 +41,12 @@ rustPlatform.buildRustPackage (finalAttrs: {
];
buildInputs = [
killall
libinput
openssl
udev
];
# These are not needed for NixOS
patches = [
./disable-language-page.patch
./disable-timezone-page.patch
# TODO: Remove in next update
(fetchpatch2 {
name = "fix-layout-and-themes-page.patch";
url = "https://patch-diff.githubusercontent.com/raw/pop-os/cosmic-initial-setup/pull/53.diff?full_index=1";
hash = "sha256-081qyQnPhh+FRPU/JKJVCK+l3SKjHAIV5b6/7WN6lb8=";
})
];
postPatch = ''
# Installs in $out/etc/xdg/autostart instead of /etc/xdg/autostart
substituteInPlace justfile \
@@ -66,6 +55,10 @@ rustPlatform.buildRustPackage (finalAttrs: {
"autostart-dst := prefix / 'etc' / 'xdg' / 'autostart' / desktop-entry"
'';
preFixup = ''
libcosmicAppWrapperArgs+=(--prefix PATH : ${lib.makeBinPath [ killall ]})
'';
dontUseJustBuild = true;
dontUseJustCheck = true;
pkgs/by-name/co/cosmic-launcher/package.nix
+3 -3
View File
@@ -11,17 +11,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-launcher";
version = "1.0.0-beta.1.1";
version = "1.0.0-beta.2";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-launcher";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-vAuWH9qmstPcfPvcKoM/2VjGxAfdtO9hhOPaZ5Ft4Y0=";
hash = "sha256-V4FShr8kTf3lsYpPoU3hfeLgR4iQXmo+BxNOBko8pN0=";
};
cargoHash = "sha256-57rkCufJPWm844/iMIfULfaGR9770q8VgZgnqCM57Zg=";
cargoHash = "sha256-bW6XtdK+AZiuwfzBUWmUi00RJXeuzgzGKoL35lyDBfM=";
nativeBuildInputs = [
just
pkgs/by-name/co/cosmic-notifications/package.nix
+2 -2
View File
@@ -12,14 +12,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-notifications";
version = "1.0.0-beta.1.1";
version = "1.0.0-beta.2";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-notifications";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-wgOjaiKJ1KYdYsynQV5+KKGhdneELiLTHYqjMEWaxt0=";
hash = "sha256-HMs08kAS+dC8GsznmQveZczwYtlSKxS4MU3BEKLgxjY=";
};
cargoHash = "sha256-CL8xvj57yq0qzK3tyYh3YXh+fM4ZDsmL8nP1mcqTqeQ=";
pkgs/by-name/co/cosmic-osd/package.nix
+3 -3
View File
@@ -13,17 +13,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-osd";
version = "1.0.0-beta.1.1";
version = "1.0.0-beta.2";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-osd";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-tsP4dlHmzuf5QgByDWbuigMrpgnJAjuNsYwWDSutCoI=";
hash = "sha256-xGVB1RGbraTUORcEE5I70wxwnUpe/itMQyNaxCh1bfY=";
};
cargoHash = "sha256-YcNvvK+Zf8nSS5YjS5iaoipogstiyBdNY7LhWPsz9xQ=";
cargoHash = "sha256-v6/lWqGG3uFSFgw77M0kGM+cK9wSiuaGaciPqz/wFIQ=";
nativeBuildInputs = [
libcosmicAppHook
pkgs/by-name/co/cosmic-panel/package.nix
+2 -2
View File
@@ -11,14 +11,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-panel";
version = "1.0.0-beta.1.1";
version = "1.0.0-beta.2";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-panel";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-gSTvF6Zcixh5/uYZuUiCIdBlXJj31+lISBwLujTuOfo=";
hash = "sha256-d21/ydBbT/lWudx9+hEDu7PlbIbORr3tqWcvMzenxr8=";
};
cargoHash = "sha256-8KOl581VmsfE7jiVFXy3ZDIfAqnaJuiDd7paqiFI/mk=";
pkgs/by-name/co/cosmic-player/package.nix
+3 -3
View File
@@ -18,17 +18,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-player";
version = "1.0.0-beta.1.1";
version = "1.0.0-beta.2";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-player";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-oTTVVQkSkON5NTgO5+eUD2wVpiW5MvW3MZyeyqqc3qk=";
hash = "sha256-jf9KSgA94SL6JX7Nh1BQiumOYBJjjt5O5DRCjeBHovo=";
};
cargoHash = "sha256-DodFIfthiGFSvXWfPsPjFhNY6G7z3lb6pfc5HtUXhMo=";
cargoHash = "sha256-fnX5BkzRAetKxHZ9XyWdmG6TSxFqGJsmg16zlpYG9Ag=";
nativeBuildInputs = [
just
pkgs/by-name/co/cosmic-randr/package.nix
+1 -1
View File
@@ -12,7 +12,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-randr";
version = "1.0.0-beta.1.1";
version = "1.0.0-beta.2";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
pkgs/by-name/co/cosmic-screenshot/package.nix
+2 -2
View File
@@ -10,14 +10,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-screenshot";
version = "1.0.0-beta.1.1";
version = "1.0.0-beta.2";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-screenshot";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-TKR8EDXZwKKC1WSZhlcf5U6tiM4cWCdb24U74vVKTaU=";
hash = "sha256-ZvbYb3gkA5cLcIulUQID8lj9USu6EurPUUMEdaGnZak=";
};
cargoHash = "sha256-O8fFeg1TkKCg+QbTnNjsH52xln4+ophh/BW/b4zQs9o=";
pkgs/by-name/co/cosmic-session/package.nix
+1 -1
View File
@@ -12,7 +12,7 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-session";
version = "1.0.0-beta.1.1";
version = "1.0.0-beta.2";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
pkgs/by-name/co/cosmic-settings-daemon/package.nix
+2 -2
View File
@@ -15,14 +15,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-settings-daemon";
version = "1.0.0-beta.1.1";
version = "1.0.0-beta.2";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-settings-daemon";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-tHG/VoaP1tcns6AyedkkVUpWFlcOclWijsHYQ3vOIjs=";
hash = "sha256-CtHy8qy7CatbErNZKu1pLFC9aUWLj0r87+lvRB16oSE=";
};
postPatch = ''
pkgs/by-name/co/cosmic-settings/package.nix
+3 -3
View File
@@ -27,17 +27,17 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-settings";
version = "1.0.0-beta.1.1";
version = "1.0.0-beta.2";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-settings";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-Yn5CSp/vsLMbkcQ7mCDw/ErgkSCyEvkwNvWqupVUkZ4=";
hash = "sha256-ziA9dy3wZHhpgBNgjC/Uq8M7R5B62k3PGzFiC+rrPpI=";
};
cargoHash = "sha256-dHyUTV5txSLWEDE7Blplz8CBvyuUmYNNr1kbifujHKk=";
cargoHash = "sha256-mMfKY+ouszbN2rEf6zvv1Sc1FEZ/ZVuQ6RXGMBFDwIE=";
nativeBuildInputs = [
cmake
pkgs/by-name/co/cosmic-store/package.nix
+3 -3
View File
@@ -15,17 +15,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-store";
version = "1.0.0-beta.1.1";
version = "1.0.0-beta.2";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-store";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-KlXFFoUEa0YTQDEJHMrbWOIEsSnXvJNzzaEFYR83t9s=";
hash = "sha256-t27WA/q+RFyjGpmpgJCGmen67h4NMAkyHbObpaJiSz4=";
};
cargoHash = "sha256-xdNYQB/zmndnMAkstwJ6Z2uk0fXli3gIYHchUq/3u6k=";
cargoHash = "sha256-7FvelbsXa3ya6EY2irfCxwjAr9o3VWJ9/vJutFTjYpQ=";
nativeBuildInputs = [
just
pkgs/by-name/co/cosmic-term/package.nix
+3 -3
View File
@@ -15,17 +15,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-term";
version = "1.0.0-beta.1.1";
version = "1.0.0-beta.2";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-term";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-1kQuPMaLXq+V1fTplXKoXAVOtyuD4Sh8diljHgTDbdI=";
hash = "sha256-Gf5C135I3MBxyYBvgbOcY4USa75BeD7sPhFjq5BIM1s=";
};
cargoHash = "sha256-mpuVSHb9YcDZB+eyyD+5ZNzUeEgx8T25IFjsD/Q/quU=";
cargoHash = "sha256-qXAgmVsjhr3aqEQRGjsK2JM8YwpkRK5Y+XYJRSZ8Swc=";
nativeBuildInputs = [
just
pkgs/by-name/co/cosmic-wallpapers/package.nix
+1 -1
View File
@@ -7,7 +7,7 @@
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "cosmic-wallpapers";
version = "1.0.0-beta.1.1";
version = "1.0.0-beta.2";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
pkgs/by-name/co/cosmic-workspaces-epoch/package.nix
+2 -2
View File
@@ -14,14 +14,14 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "cosmic-workspaces-epoch";
version = "1.0.0-beta.1.1";
version = "1.0.0-beta.2";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "cosmic-workspaces-epoch";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-gcS8Q9SR7Dj1FH2Dtdd6jUMX8u5kHJBMvlgqJGw+rjA=";
hash = "sha256-WHMOA7fNPIAwaQmzqyo+XlBYl+13cz0LrRpT0GUa8Vs=";
};
cargoHash = "sha256-BE6s2dmbgXlFXrtd8b9k2LltLnegLzWbIUlaEQvv+5o=";
pkgs/by-name/di/discord-rich-presence-plex/package.nix
+62
View File
@@ -0,0 +1,62 @@
{
lib,
python3Packages,
python3,
fetchFromGitHub,
makeWrapper,
}:
python3Packages.buildPythonApplication rec {
pname = "discord-rich-presence-plex";
version = "2.16.0";
format = "other";
src = fetchFromGitHub {
owner = "phin05";
repo = "discord-rich-presence-plex";
tag = "v${version}";
hash = "sha256-e1r0w72IOEY5XsjANkAHbfPYEf1B8n6KYVLMWFSLs0g=";
};
nativeBuildInputs = [
makeWrapper
];
dontBuild = true;
dontUseSetuptoolsBuild = true;
dontUseSetuptoolsCheck = true;
dependencies = with python3Packages; [
requests
pillow
plexapi
pyyaml
websocket-client
];
installPhase = ''
runHook preInstall
mkdir -p $out/lib/discord-rich-presence-plex
cp -r * $out/lib/discord-rich-presence-plex/
mkdir -p $out/bin
makeWrapper ${lib.getExe python3} \
$out/bin/discord-rich-presence-plex \
--add-flags "$out/lib/discord-rich-presence-plex/main.py" \
--prefix PYTHONPATH : "$out/lib/discord-rich-presence-plex:$PYTHONPATH" \
--set DRPP_NO_PIP_INSTALL "true"
runHook postInstall
'';
# No tests
doCheck = false;
meta = {
homepage = "https://github.com/phin05/discord-rich-presence-plex";
changelog = "https://github.com/phin05/discord-rich-presence-plex/releases/tag/v${version}";
license = lib.licenses.gpl3Only;
description = "Displays your Plex status on Discord using Rich Presence";
maintainers = with lib.maintainers; [ hogcycle ];
mainProgram = "discord-rich-presence-plex";
};
}
pkgs/by-name/fi/filebrowser/package.nix
+2 -2
View File
@@ -8,7 +8,7 @@
nixosTests,
}:
let
version = "2.44.0";
version = "2.44.1";
pnpm = pnpm_9;
@@ -16,7 +16,7 @@ let
owner = "filebrowser";
repo = "filebrowser";
rev = "v${version}";
hash = "sha256-j7V1POuF6cFpnq6UgBseHe6GxypOoj2rYrN6k2nIF8w=";
hash = "sha256-ln7Dst+sN99c3snPU7DrIGpwKBz/e4Lz+uOknmm6sxg=";
};
frontend = buildNpmPackage rec {
pkgs/by-name/li/libdnf/package.nix
+2 -2
View File
@@ -25,7 +25,7 @@
stdenv.mkDerivation rec {
pname = "libdnf";
version = "0.74.0";
version = "0.75.0";
outputs = [
"out"
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
owner = "rpm-software-management";
repo = "libdnf";
tag = version;
hash = "sha256-NAnE8VPz2j7h/gB1A4FDwG/x7ki7QEmBjcfvOb6/+VY=";
hash = "sha256-ujkJVeI6wgapTW1DBIhj4F/rXJFBb+KdREpc5jfU124=";
};
nativeBuildInputs = [
pkgs/by-name/li/lincity-ng/package.nix
+8 -15
View File
@@ -1,22 +1,19 @@
{
stdenv,
SDL2,
SDL2_gfx,
SDL2_image,
SDL2_mixer,
SDL2_ttf,
cmake,
fetchFromGitHub,
fmt,
lib,
libGL,
libGLU,
libwebp,
libtiff,
libX11,
libxml2,
libxmlxx5,
libxslt,
physfs_2,
pkg-config,
xorgproto,
zlib,
@@ -24,47 +21,42 @@
include-what-you-use,
}:
let
# https://github.com/lincity-ng/lincity-ng/issues/25
physfs = physfs_2;
in
stdenv.mkDerivation (finalAttrs: {
pname = "lincity-ng";
version = "2.13.1";
version = "2.14.2";
src = fetchFromGitHub {
owner = "lincity-ng";
repo = "lincity-ng";
tag = "lincity-ng-${finalAttrs.version}";
hash = "sha256-ACJVhMq2IEJNrbAdmkgHxQV0uKSXpwR8a/5jcrQS+oI=";
hash = "sha256-HW+bB9xnrok8tWKIJJUt3Qgo5e9HmI6NZORG4PazmEM=";
};
hardeningDisable = [ "format" ];
strictDeps = true;
nativeBuildInputs = [
cmake
pkg-config
gettext
include-what-you-use
libxml2
libxslt
];
buildInputs = [
fmt
SDL2
SDL2_gfx
SDL2_image
SDL2_mixer
SDL2_ttf
libGL
libGLU
libX11
libwebp
libtiff
libxmlxx5
libxml2
libxslt
physfs
xorgproto
zlib
];
@@ -81,6 +73,7 @@ stdenv.mkDerivation (finalAttrs: {
";
meta = {
homepage = "https://github.com/lincity-ng/lincity-ng";
description = "City building game";
mainProgram = "lincity-ng";
license = lib.licenses.gpl2Plus;
pkgs/by-name/li/lint-staged/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildNpmPackage rec {
pname = "lint-staged";
version = "16.2.4";
version = "16.2.5";
src = fetchFromGitHub {
owner = "okonet";
repo = "lint-staged";
rev = "v${version}";
hash = "sha256-r4BJVY4PoBItIpCOQO5eTVyOGnIqV1fJ/cbrNyjvhAs=";
hash = "sha256-9SsdcF294v6/PAsz/cJXsqUbloSy24HHG7z7bCKUHaw=";
};
npmDepsHash = "sha256-0lVx2s58XFa9xj2fiP6P5jCfVeUZ8pFkmdy/J6yDK9A=";
npmDepsHash = "sha256-/hknNGUG02jFEYfYNM/eShiNptktJcc4XGAG3klfryA=";
dontNpmBuild = true;
pkgs/by-name/mo/mountain-duck/package.nix
+2 -2
View File
@@ -6,11 +6,11 @@
}:
stdenvNoCC.mkDerivation (finalAttrs: {
pname = "mountain-duck";
version = "5.0.2.28022";
version = "5.0.4.28064";
src = fetchurl {
url = "https://dist.mountainduck.io/Mountain%20Duck-${finalAttrs.version}.zip";
sha256 = "sha256-QismxRiDN6AfzaR8/WZq4O9Wj7knMXhGtIWjkhg/rAQ=";
sha256 = "sha256-f69DBNj15dxkNxmFtoxA3d/bSpagpOX7l84fE4a/VWw=";
};
dontUnpack = true;
pkgs/by-name/my/myks/package.nix
+3 -3
View File
@@ -10,16 +10,16 @@
buildGoModule rec {
pname = "myks";
version = "4.11.4";
version = "5.0.0";
src = fetchFromGitHub {
owner = "mykso";
repo = "myks";
tag = "v${version}";
hash = "sha256-1tJPYLo14LPwd7mtNTvr6YMGz0s+K6aN9Hung/N9lrM=";
hash = "sha256-W1k65a67/77f8NBGOzHV4eVzoICnynxNeIYAefq+Fzo=";
};
vendorHash = "sha256-k/EeQdThF8pgeY9RI012kjlEZkVVcnanL6L8UBrQTUI=";
vendorHash = "sha256-+YMR9Y5iSkpcHEg1IlSN3kB3fZAx5WNcOU71LXHhVV0=";
subPackages = ".";
pkgs/by-name/op/open62541/package.nix
+2 -2
View File
@@ -33,13 +33,13 @@ in
stdenv.mkDerivation (finalAttrs: {
pname = "open62541";
version = "1.4.13";
version = "1.4.14";
src = fetchFromGitHub {
owner = "open62541";
repo = "open62541";
rev = "v${finalAttrs.version}";
hash = "sha256-y4yxdO55fMmkP+nCU6ToabvAPi6hgXHiDXpF3tNEHNw=";
hash = "sha256-+gE1wlxAyUVgHnDhkHEu9IwCCIKDuAHUzkThuDgdzdE=";
fetchSubmodules = true;
};
pkgs/by-name/qv/qview/package.nix
+27 -18
View File
@@ -2,42 +2,51 @@
lib,
stdenv,
fetchFromGitHub,
libsForQt5,
qt6,
nix-update-script,
kdePackages,
x11Support ? true,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "qview";
version = "7.1";
src = fetchFromGitHub {
owner = "jurplel";
repo = "qView";
rev = version;
tag = finalAttrs.version;
hash = "sha256-EcXhwJcgBLdXa/FQ5LuENlzwnLw4Gt2BGlBO1p5U8tI=";
};
qmakeFlags = lib.optionals (!x11Support) [ "CONFIG+=NO_X11" ];
nativeBuildInputs = [
libsForQt5.qmake
libsForQt5.wrapQtAppsHook
qt6.qmake
qt6.wrapQtAppsHook
];
buildInputs = [
libsForQt5.qtbase
libsForQt5.qttools
libsForQt5.qtimageformats
libsForQt5.qtsvg
]
++ lib.optionals x11Support [ libsForQt5.qtx11extras ];
qt6.qtbase
qt6.qttools
qt6.qtimageformats
qt6.qtsvg
kdePackages.kimageformats
];
meta = with lib; {
qmakeFlags = [
# See https://github.com/NixOS/nixpkgs/issues/214765
"QT_TOOL.lrelease.binary=${lib.getDev qt6.qttools}/bin/lrelease"
]
++ lib.optionals (!x11Support) [ "CONFIG+=NO_X11" ];
passthru.updateScript = nix-update-script { };
meta = {
description = "Practical and minimal image viewer";
mainProgram = "qview";
changelog = "https://github.com/jurplel/qView/releases/tag/${finalAttrs.version}";
homepage = "https://interversehq.com/qview/";
license = licenses.gpl3Plus;
maintainers = with maintainers; [ acowley ];
platforms = platforms.all;
license = lib.licenses.gpl3Plus;
maintainers = with lib.maintainers; [ acowley ];
platforms = lib.platforms.all;
};
}
})
pkgs/by-name/tr/trufflehog/package.nix
+3 -3
View File
@@ -8,16 +8,16 @@
buildGoModule rec {
pname = "trufflehog";
version = "3.90.9";
version = "3.90.11";
src = fetchFromGitHub {
owner = "trufflesecurity";
repo = "trufflehog";
tag = "v${version}";
hash = "sha256-XxFgki6haUbfHkhOMuYJW8zNBsJ6a8Rir7s6GqLTbho=";
hash = "sha256-X2mqmUjdKHIp/w393hLvD6k7LTBIY9FEb1fI+SckIe4=";
};
vendorHash = "sha256-pP8dT211fq/y5Z0poLqJngCY45ba1vJilmkpgnCUHhY=";
vendorHash = "sha256-XTjKaRNqSnyLVag5/nBMmKZ6XeTDmd03ujeeMCJCB9Y=";
nativeBuildInputs = [ makeWrapper ];
pkgs/by-name/va/vacuum-tube/package.nix
+3
View File
@@ -1,4 +1,5 @@
{
stdenv,
buildNpmPackage,
fetchFromGitHub,
lib,
@@ -68,5 +69,7 @@ buildNpmPackage rec {
mainProgram = "VacuumTube";
license = lib.licenses.mit;
maintainers = with lib.maintainers; [ theCapypara ];
# https://github.com/NixOS/nixpkgs/pull/453698#issuecomment-3422020307
broken = stdenv.hostPlatform.isDarwin;
};
}
pkgs/by-name/xd/xdg-desktop-portal-cosmic/package.nix
+3 -3
View File
@@ -17,17 +17,17 @@
rustPlatform.buildRustPackage (finalAttrs: {
pname = "xdg-desktop-portal-cosmic";
version = "1.0.0-beta.1.1";
version = "1.0.0-beta.2";
# nixpkgs-update: no auto update
src = fetchFromGitHub {
owner = "pop-os";
repo = "xdg-desktop-portal-cosmic";
tag = "epoch-${finalAttrs.version}";
hash = "sha256-EkhOa1Tircgyta98Zf4ZaV/tR4zZh4/bU35xjn3xU8c=";
hash = "sha256-3FmNaT9tfDttINSbkwEaNW5i5hk9jH+fmMAg0UagttA=";
};
cargoHash = "sha256-uJKwwESkzqweM4JunnMIsDE8xhCyjFFZs1GiJAwnbG8=";
cargoHash = "sha256-gaDVt/0QPFZHnt9veUo5bvZECxKZcIrja/QdLBn/Xi4=";
separateDebugInfo = true;
pkgs/by-name/ze/zed-editor/package.nix
+3 -3
View File
@@ -101,7 +101,7 @@ let
in
rustPlatform.buildRustPackage (finalAttrs: {
pname = "zed-editor";
version = "0.208.5";
version = "0.208.6";
outputs = [
"out"
@@ -114,7 +114,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
owner = "zed-industries";
repo = "zed";
tag = "v${finalAttrs.version}";
hash = "sha256-6B0A6cMCTFGYRrAekTjHo667WcS9aTZbrjaGxKP6QfA=";
hash = "sha256-EzfeLSalC4pTtaiDWXYib5jDDKGVZ+PzFjgMjIGrUDg=";
};
postPatch = ''
@@ -134,7 +134,7 @@ rustPlatform.buildRustPackage (finalAttrs: {
rm -r $out/git/*/candle-book/
'';
cargoHash = "sha256-wOhzHMh1nhWTpzzw7phOmhHMV4h7S+e+2SUkK4RK2b8=";
cargoHash = "sha256-PxreCKshDvzLQzPvNpGyNz3jOPIDiz7JHy/9nEujnKg=";
nativeBuildInputs = [
cmake
pkgs/development/libraries/qt-5/5.15/default.nix
+3 -36
View File
@@ -349,42 +349,6 @@ let
qtxmlpatterns = callPackage ../modules/qtxmlpatterns.nix { };
env = callPackage ../qt-env.nix { };
full =
callPackage ({ env, qtbase }: env "qt-full-${qtbase.version}") { }
# `with self` is ok to use here because having these spliced is unnecessary
(
with self;
[
qt3d
qtcharts
qtconnectivity
qtdeclarative
qtdoc
qtgraphicaleffects
qtimageformats
qtlocation
qtmultimedia
qtquickcontrols
qtquickcontrols2
qtscript
qtsensors
qtserialport
qtsvg
qttools
qttranslations
qtvirtualkeyboard
qtwebchannel
qtwebengine
qtwebsockets
qtwebview
qtx11extras
qtxmlpatterns
qtlottie
qtdatavis3d
]
++ lib.optional (!stdenv.hostPlatform.isDarwin) qtwayland
++ lib.optional (stdenv.hostPlatform.isDarwin) qtmacextras
);
qmake = callPackage (
{ qtbase }:
@@ -419,6 +383,9 @@ let
++ lib.optional stdenv.hostPlatform.isLinux qtwayland.dev;
} ../hooks/wrap-qt-apps-hook.sh
) { };
}
// lib.optionalAttrs config.allowAliases {
full = throw "libsForQt5.full has been removed. Please use individual packages instead."; # Added 2025-10-18
};
baseScope = makeScopeWithSplicing' {
pkgs/development/libraries/qt-6/modules/qtdeclarative/default.nix
+6
View File
@@ -42,6 +42,12 @@ qtModule {
url = "https://invent.kde.org/qt/qt/qtdeclarative/-/commit/2b7f93da38d41ffaeb5322a7dca40ec26fc091a1.diff";
hash = "sha256-AOXey18lJlswpZ8tpTTZeFb0VE9k1louXy8TPPGNiA4=";
})
# Fix another common crash
# https://bugreports.qt.io/browse/QTBUG-139626
(fetchpatch {
url = "https://invent.kde.org/qt/qt/qtdeclarative/-/commit/0de0b0ffdb44d73c605e20f00934dfb44bdf7ad9.diff";
hash = "sha256-DCoaSxH1MgywGXmmK21LLzCBi2KAmJIv5YKpFS6nw7M=";
})
];
cmakeFlags = [
pkgs/development/python-modules/iamdata/default.nix
+2 -2
View File
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "iamdata";
version = "0.1.202510191";
version = "0.1.202510201";
pyproject = true;
src = fetchFromGitHub {
owner = "cloud-copilot";
repo = "iam-data-python";
tag = "v${version}";
hash = "sha256-sMKlZGaEkzoOhpAOsKBqSUDRe6j7iL2sBivABSCAEA8=";
hash = "sha256-E9yFns1sRSyiFqQA3jXTSvMK7a7nj/UfUFUzh1PlUhM=";
};
build-system = [ hatchling ];
pkgs/games/dwarf-fortress/df.lock.json
+13 -13
View File
@@ -1,28 +1,28 @@
{
"game": {
"latest": {
"linux": "52.04",
"linux": "52.05",
"darwin": "0.47.05"
},
"versions": {
"52.04": {
"52.05": {
"df": {
"version": "52.04",
"version": "52.05",
"urls": {
"linux": {
"url": "https://www.bay12games.com/dwarves/df_52_04_linux.tar.bz2",
"outputHash": "sha256-x/v4yWuojnbea0N7KUAINBdhPBjl0DoWy8Pi/eDCpec="
"url": "https://www.bay12games.com/dwarves/df_52_05_linux.tar.bz2",
"outputHash": "sha256-LPbkt9s/Lx/0tvN5bac6d0r7+nr4P+u3xmDNo+EXHkw="
}
}
},
"hack": {
"version": "52.04-r1",
"version": "52.05-r2",
"git": {
"url": "https://github.com/DFHack/dfhack.git",
"revision": "52.04-r1",
"outputHash": "sha256-DPW+fvurUYnwfGrEqV3JEN1TfllOJPHqGIlNJ3Wha90="
"revision": "52.05-r2",
"outputHash": "sha256-wv/4sRAIkb90uStGJ6eMdd/cAMVX5Uqtoe0BR+CDy7s="
},
"xmlRev": "7b691d256f9427036e7ff24fa795a0f9334739e7"
"xmlRev": "df0ec27701a2aeaa1ccfb81323f4be55b78e1c10"
}
},
"51.13": {
@@ -116,12 +116,12 @@
}
},
"therapist": {
"version": "42.1.18",
"maxDfVersion": "52.03",
"version": "42.1.20",
"maxDfVersion": "52.05",
"git": {
"url": "https://github.com/Dwarf-Therapist/Dwarf-Therapist.git",
"revision": "v42.1.18",
"outputHash": "sha256-RdBUpVkjvsNjTowHpQ2FQUCtJiwfqls4dnoUIwKoXGg="
"revision": "v42.1.20",
"outputHash": "sha256-nKMQSDrxhqRRaCDUK7GbexFHdxeD/P9c2UDkiMdWsyU="
}
}
}
pkgs/top-level/aliases.nix
+1
View File
@@ -2260,6 +2260,7 @@ mapAliases {
qt-video-wlr = throw "'qt-video-wlr' has been removed, as it depends on KDE Gear 5, which has reached EOL"; # Added 2025-08-20
qt515 = qt5; # Added 2022-11-24
qt5ct = throw "'qt5ct' has been renamed to/replaced by 'libsForQt5.qt5ct'"; # Converted to throw 2024-10-17
qt5Full = throw "qt5Full has been removed. Please use individual packages instead."; # Added 2025-10-18
qt6ct = qt6Packages.qt6ct; # Added 2023-03-07
qtchan = throw "'qtchan' has been removed due to lack of maintenance upstream"; # Added 2025-07-01
qtcurve = throw "'qtcurve' has been renamed to/replaced by 'libsForQt5.qtcurve'"; # Converted to throw 2024-10-17
pkgs/top-level/all-packages.nix
-1
View File
@@ -8482,7 +8482,6 @@ with pkgs;
plasma5Packages = libsForQt5;
qtEnv = qt5.env;
qt5Full = qt5.full;
qt6 = recurseIntoAttrs (callPackage ../development/libraries/qt-6 { });