switch to nixos-unstable. some notes:

- fluffychat doesn't build, so disabled (that's a known issue with the
  active flutter work).
- everything else builds, lappy boots OOTB fine.
        - brower works
        - vim works
        - Element starts
        - Sublime Music works
        - Discord works (verrry slow to load -- maybe just a first update thing)
This commit is contained in:
2022-09-18 18:01:21 -07:00
parent 3669a05db5
commit f9c8563506
6 changed files with 12 additions and 45 deletions

8
flake.lock generated
View File

@@ -54,16 +54,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1663587673, "lastModified": 1663357389,
"narHash": "sha256-4C4R/PV8+HjkgVd1Db8AuvHwhQp5vllVqOQEl6YDh3o=", "narHash": "sha256-oYA2nVRSi6yhCBqS5Vz465Hw+3BQOVFEhfbfy//3vTs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "20dc478985d6545df53f0153f4af125eb014083d", "rev": "da6a05816e7fa5226c3f61e285ef8d9dfc868f3c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-22.05", "ref": "nixos-unstable",
"type": "indirect" "type": "indirect"
} }
}, },

View File

@@ -4,7 +4,8 @@
{ {
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-22.05"; # nixpkgs.url = "nixpkgs/nixos-22.05";
nixpkgs.url = "nixpkgs/nixos-unstable";
mobile-nixos = { mobile-nixos = {
url = "github:nixos/mobile-nixos"; url = "github:nixos/mobile-nixos";
flake = false; flake = false;

View File

@@ -31,6 +31,8 @@ in
sane.allocations.sshd-gid = mkId 2001; # 997 sane.allocations.sshd-gid = mkId 2001; # 997
sane.allocations.polkituser-gid = mkId 2002; # 998 sane.allocations.polkituser-gid = mkId 2002; # 998
sane.allocations.systemd-coredump-gid = mkId 2003; # 996 sane.allocations.systemd-coredump-gid = mkId 2003; # 996
sane.allocations.nscd-uid = mkId 2004;
sane.allocations.nscd-gid = mkId 2004;
# found on graphical machines # found on graphical machines
sane.allocations.nm-iodine-uid = mkId 2101; # desko/moby/lappy sane.allocations.nm-iodine-uid = mkId 2101; # desko/moby/lappy

View File

@@ -53,7 +53,7 @@ let
emote # TODO: package [smile](https://github.com/mijorus/smile) for probably a better mobile experience. emote # TODO: package [smile](https://github.com/mijorus/smile) for probably a better mobile experience.
evince # works on phosh evince # works on phosh
fluffychat # fluffychat
foliate foliate
font-manager font-manager
gimp # broken on phosh gimp # broken on phosh

View File

@@ -98,6 +98,8 @@ in
users.groups.polkituser.gid = config.sane.allocations.polkituser-gid; users.groups.polkituser.gid = config.sane.allocations.polkituser-gid;
users.groups.sshd.gid = config.sane.allocations.sshd-gid; users.groups.sshd.gid = config.sane.allocations.sshd-gid;
users.groups.systemd-coredump.gid = config.sane.allocations.systemd-coredump-gid; users.groups.systemd-coredump.gid = config.sane.allocations.systemd-coredump-gid;
users.users.nscd.uid = config.sane.allocations.nscd-uid;
users.groups.nscd.gid = config.sane.allocations.nscd-gid;
# guarantee determinism in uid/gid generation for users: # guarantee determinism in uid/gid generation for users:
assertions = let assertions = let

View File

@@ -1,57 +1,19 @@
fetchpatch: [ fetchpatch: [
# phosh: allow fractional scaling
(fetchpatch {
url = "https://github.com/NixOS/nixpkgs/pull/175872.diff";
sha256 = "sha256-mEmqhe8DqlyCxkFWQKQZu+2duz69nOkTANh9TcjEOdY=";
})
# for raspberry pi: allow building u-boot for rpi 4{,00} # for raspberry pi: allow building u-boot for rpi 4{,00}
# TODO: remove after upstreamed: https://github.com/NixOS/nixpkgs/pull/176018 # TODO: remove after upstreamed: https://github.com/NixOS/nixpkgs/pull/176018
# (it's a dupe of https://github.com/NixOS/nixpkgs/pull/112677 ) # (it's a dupe of https://github.com/NixOS/nixpkgs/pull/112677 )
./02-rpi4-uboot.patch ./02-rpi4-uboot.patch
# # flutter.dart: 2.16.1 -> 2.16.2
# (fetchpatch {
# url = "https://github.com/NixOS/nixpkgs/pull/172873.diff";
# sha256 = "sha256-HGYk83XOhFe1wWNCKNdF6s/7laWJ0Jisb8bDJcHVlsQ=";
# })
# # Flutter: 2.10.1->3.0.4
# (fetchpatch {
# url = "https://github.com/NixOS/nixpkgs/pull/173200.diff";
# sha256 = "sha256-g1tZdLTrAJx3ijgabqz8XInC20PQM3FYRENQ7c6NfQw=";
# })
# # dart: 2.17.3 -> 2.18.0
# (fetchpatch {
# url = "https://github.com/NixOS/nixpkgs/pull/189841.diff";
# sha256 = "sha256-E3rTNex7PiFHsLgtb0x9/Q/naqDYD1vFuGyduV4Z6qY=";
# })
# # # Flutter: 3.0.4->3.3.2, flutter.dart: 2.17.5->2.18.1 # # # Flutter: 3.0.4->3.3.2, flutter.dart: 2.17.5->2.18.1
# # (fetchpatch { # # (fetchpatch {
# # url = "https://github.com/NixOS/nixpkgs/pull/189338.diff"; # # url = "https://github.com/NixOS/nixpkgs/pull/189338.diff";
# # sha256 = "sha256-MppSk1D3qQT8Z4lzEZ93UexoidT8yqM7ASPec4VvxCI="; # # sha256 = "sha256-MppSk1D3qQT8Z4lzEZ93UexoidT8yqM7ASPec4VvxCI=";
# # }) # # })
# enable aarch64 support for flutter's dart package # enable aarch64 support for flutter's dart package
./10-flutter-arm64.patch # ./10-flutter-arm64.patch
# whalebird: support aarch64
(fetchpatch {
url = "https://github.com/NixOS/nixpkgs/pull/176476.diff";
sha256 = "sha256-126DljM06hqPZ3fjLZ3LBZR64nFbeTfzSazEu72d4y8=";
})
# TODO: upstream # TODO: upstream
./07-duplicity-rich-url.patch ./07-duplicity-rich-url.patch
# zecwallet-lite: init at 1.7.13
(fetchpatch {
url = "https://github.com/NixOS/nixpkgs/pull/180960.diff";
sha256 = "sha256-HVVj/T3yQtjYBoxXpoPiG9Zar/eik9IoDVDhTOehBdY=";
})
# makemkv: 1.16.7 -> 1.17.1
(fetchpatch {
url = "https://github.com/NixOS/nixpkgs/pull/188342.diff";
sha256 = "sha256-3M4DpvXf5Us70FX5geE0L1Ns23Iw2NG82YNlwSd+WzI=";
})
] ]