artemist/nixos-config
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: artemist:689bc35c19d7bb9553ba354924d67b08578fd137
Branches Tags
artemist:unified
...
compare: artemist:22e96bdb57cdd792c685fda8b9af93a3ca2c3322
Branches Tags
artemist:unified

2 commits
689bc35c19 ... 22e96bdb57

Author SHA1 Message Date
Artemis Tosini 22e96bdb57
fix dino build 2024-05-05 23:12:36 +00:00
Artemis Tosini f38136b2fe
flake.lock: Update 
Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/9036fe9ef8e15a819fa76f47a8b1f287903fb848' (2024-05-02)
  → 'github:nix-community/home-manager/3dfe05aa9b5646995ace887931fa60269a039777' (2024-05-05)
• Updated input 'jovian':
    'github:jovian-experiments/jovian-nixos/68b6bfacf67fcb1660c024b8dcd9376af38bbafe' (2024-05-03)
  → 'github:jovian-experiments/jovian-nixos/d0799ebebfb37fd2df6409dc8da622738c5930bb' (2024-05-04)
• Updated input 'lix':
    'git+ssh://git@lix.systems/lix-project/lix?ref=refs/heads/main&rev=549d609a7bce2b4ac28808a76a72d7f3743b9c76' (2024-05-03)
  → 'git+ssh://git@git.lix.systems/lix-project/lix?ref=refs/heads/main&rev=7cffd7a3b550deb3b2780780fd0226cbc649da9b' (2024-05-05)
• Updated input 'lix-module':
    'git+ssh://git@lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=f87998884022cabbec27218c0d97e9f7da51b4de' (2024-05-04)
  → 'git+ssh://git@git.lix.systems/lix-project/nixos-module?ref=refs/heads/main&rev=e31baf57680bab449ab5b40179cc4a08a99f5314' (2024-05-05)
• Updated input 'lix-module/flakey-profile':
    'github:lf-/flakey-profile/3b32c4a71f89b874fe0be2dc125eacb9c3473204' (2024-03-25)
  → 'github:lf-/flakey-profile/243c903fd8eadc0f63d205665a92d4df91d42d9d' (2024-04-12)
• Updated input 'nix-index-database':
    'github:nix-community/nix-index-database/941c4973c824509e0356be455d89613611f76c8a' (2024-04-28)
  → 'github:nix-community/nix-index-database/a362555e9dbd4ecff3bb98969bbdb8f79fe87f10' (2024-05-05)
• Updated input 'nixos-hardware':
    'github:nixos/nixos-hardware/3f017311191fe6d501ca2496a835d012f656ee9c' (2024-05-03)
  → 'github:nixos/nixos-hardware/753176b57b3fcddb140c1c012868e62c025120bd' (2024-05-05)
• Updated input 'nixpkgs':
    'github:nixos/nixpkgs/63c3a29ca82437c87573e4c6919b09a24ea61b0f' (2024-05-02)
  → 'github:nixos/nixpkgs/25865a40d14b3f9cf19f19b924e2ab4069b09588' (2024-05-05)
 2024-05-05 22:37:03 +00:00
4 changed files with 52 additions and 33 deletions
Show stats Expand all files Collapse all files

16
externals/patches/fix-compile-new-vala-c.diff vendored Normal file
View file

@ -0,0 +1,16 @@
diff --git a/plugins/gpgme-vala/vapi/gpgme_public.vapi b/plugins/gpgme-vala/vapi/gpgme_public.vapi
index bcf12569..b32efd03 100644
--- a/plugins/gpgme-vala/vapi/gpgme_public.vapi
+++ b/plugins/gpgme-vala/vapi/gpgme_public.vapi
@@ -22,9 +22,9 @@ public class Key {
public string issuer_name;
public string chain_id;
public Validity owner_trust;
- [CCode(array_null_terminated = true)]
+ [CCode(array_length = false, array_null_terminated = true)]
public SubKey[] subkeys;
- [CCode(array_null_terminated = true)]
+ [CCode(array_length = false, array_null_terminated = true)]
public UserID[] uids;
public KeylistMode keylist_mode;
// public string fpr; // requires gpgme >= 1.7.0

60
flake.lock
View file

@ -224,11 +224,11 @@
},
"flakey-profile": {
"locked": {
"lastModified": 1711325813,
"narHash": "sha256-ygJR5VikyCfK0CUJHboOKJVr6s9HQ1RXcvFEFnv+KIk=",
"lastModified": 1712898590,
"narHash": "sha256-FhGIEU93VHAChKEXx905TSiPZKga69bWl1VB37FK//I=",
"owner": "lf-",
"repo": "flakey-profile",
"rev": "3b32c4a71f89b874fe0be2dc125eacb9c3473204",
"rev": "243c903fd8eadc0f63d205665a92d4df91d42d9d",
"type": "github"
},
"original": {
@ -314,11 +314,11 @@
]
},
"locked": {
"lastModified": 1714679908,
"narHash": "sha256-KzcXzDvDJjX34en8f3Zimm396x6idbt+cu4tWDVS2FI=",
"lastModified": 1714931954,
"narHash": "sha256-QXpLmgmisNK2Zgpnu9DiO9ScrKJuJ4zmiMTNpObVIuk=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "9036fe9ef8e15a819fa76f47a8b1f287903fb848",
"rev": "3dfe05aa9b5646995ace887931fa60269a039777",
"type": "github"
},
"original": {
@ -335,11 +335,11 @@
]
},
"locked": {
"lastModified": 1714720101,
"narHash": "sha256-Dxlj52coLzQZVV4a9IMMc/2xU5FIpj0iaHBigPwoNjM=",
"lastModified": 1714803703,
"narHash": "sha256-4m9wG6mZR0I2d7itErhpY0JqSHomNnUdoKfkjnYp+wI=",
"owner": "jovian-experiments",
"repo": "jovian-nixos",
"rev": "68b6bfacf67fcb1660c024b8dcd9376af38bbafe",
"rev": "d0799ebebfb37fd2df6409dc8da622738c5930bb",
"type": "github"
},
"original": {
@ -380,17 +380,17 @@
"lix": {
"flake": false,
"locked": {
"lastModified": 1714774053,
"narHash": "sha256-RaiwQCGFhC1WtieS2N3FotIlKSowq+R6ETyY6nZnPh8=",
"lastModified": 1714941614,
"narHash": "sha256-wk5OThx1xx0QsclCq3Tnc4m+CVx1BsCx/pms8xkamZk=",
"ref": "refs/heads/main",
"rev": "549d609a7bce2b4ac28808a76a72d7f3743b9c76",
"revCount": 15471,
"rev": "7cffd7a3b550deb3b2780780fd0226cbc649da9b",
"revCount": 15499,
"type": "git",
"url": "ssh://git@lix.systems/lix-project/lix"
"url": "ssh://git@git.lix.systems/lix-project/lix"
},
"original": {
"type": "git",
"url": "ssh://git@lix.systems/lix-project/lix"
"url": "ssh://git@git.lix.systems/lix-project/lix"
}
},
"lix-module": {
@ -407,17 +407,17 @@
]
},
"locked": {
"lastModified": 1714781637,
"narHash": "sha256-GWUKGPNykeqVEw/z3VriyOoqnZ0ZxT8iehnUoJljAEU=",
"lastModified": 1714868057,
"narHash": "sha256-Q9vGkxmuarySjPKO6yixjZ0tkaVIQS2wU9FpCpDA7+I=",
"ref": "refs/heads/main",
"rev": "f87998884022cabbec27218c0d97e9f7da51b4de",
"revCount": 56,
"rev": "e31baf57680bab449ab5b40179cc4a08a99f5314",
"revCount": 62,
"type": "git",
"url": "ssh://git@lix.systems/lix-project/nixos-module"
"url": "ssh://git@git.lix.systems/lix-project/nixos-module"
},
"original": {
"type": "git",
"url": "ssh://git@lix.systems/lix-project/nixos-module"
"url": "ssh://git@git.lix.systems/lix-project/nixos-module"
}
},
"nix-index-database": {
@ -427,11 +427,11 @@
]
},
"locked": {
"lastModified": 1714273701,
"narHash": "sha256-bmoeZ5zMSSO/e8P51yjrzaxA9uzA3SZAEFvih6S3LFo=",
"lastModified": 1714878592,
"narHash": "sha256-E68C03sYRsYFsK7wiGHUIJm8IsyPRALOrFoTL0glXnI=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "941c4973c824509e0356be455d89613611f76c8a",
"rev": "a362555e9dbd4ecff3bb98969bbdb8f79fe87f10",
"type": "github"
},
"original": {
@ -442,11 +442,11 @@
},
"nixos-hardware": {
"locked": {
"lastModified": 1714746424,
"narHash": "sha256-Jdyw7VcM+jQ0uSXgjFj8UdXZ229yOvPNlYkKyKyHA4s=",
"lastModified": 1714885415,
"narHash": "sha256-LG+2IVqVi1fy724rSDAkgqae+f47fGGko4cJhtkN8PE=",
"owner": "nixos",
"repo": "nixos-hardware",
"rev": "3f017311191fe6d501ca2496a835d012f656ee9c",
"rev": "753176b57b3fcddb140c1c012868e62c025120bd",
"type": "github"
},
"original": {
@ -457,11 +457,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1714635257,
"narHash": "sha256-4cPymbty65RvF1DWQfc+Bc8B233A1BWxJnNULJKQ1EY=",
"lastModified": 1714906307,
"narHash": "sha256-UlRZtrCnhPFSJlDQE7M0eyhgvuuHBTe1eJ9N9AQlJQ0=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "63c3a29ca82437c87573e4c6919b09a24ea61b0f",
"rev": "25865a40d14b3f9cf19f19b924e2ab4069b09588",
"type": "github"
},
"original": {

4
flake.nix
View file

@ -33,11 +33,11 @@
inputs.flake-utils.follows = "utils";
};
lix = {
url = "git+ssh://git@lix.systems/lix-project/lix";
url = "git+ssh://git@git.lix.systems/lix-project/lix";
flake = false;
};
lix-module = {
url = "git+ssh://git@lix.systems/lix-project/nixos-module";
url = "git+ssh://git@git.lix.systems/lix-project/nixos-module";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "utils";
inputs.lix.follows = "lix";

5
sets/packages.nix
View file

@ -93,7 +93,10 @@
yubikey-manager
# GUI tools
dino
# TODO: temporary nixpkgs fix
(dino.overrideAttrs (old: {
patches = [ ../externals/patches/fix-compile-new-vala-c.diff ];
}))
evince
gimp
gnome3.eog