colin/nix-files
1
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

nixpkgs: 2023-10-26 -> 2023-10-29; sops-nix; uninsane-dot-org

Browse Source 
```
• Updated input 'nixpkgs-unpatched':
    'github:nixos/nixpkgs/63678e9f3d3afecfeafa0acead6239cdb447574c' (2023-10-26)
  → 'github:nixos/nixpkgs/0cbe9f69c234a7700596e943bfae7ef27a31b735' (2023-10-29)
• Updated input 'sops-nix':
    'github:Mic92/sops-nix/014e44d334a39481223a5d163530d4c4ca2e75cb' (2023-10-25)
  → 'github:Mic92/sops-nix/632c3161a6cc24142c8e3f5529f5d81042571165' (2023-10-29)
• Updated input 'sops-nix/nixpkgs-stable':
    'github:NixOS/nixpkgs/fb000224952bf7749a9e8b3779104ef7ea4465c8' (2023-10-21)
  → 'github:NixOS/nixpkgs/d87c5d8c41c9b3b39592563242f3a448b5cc4bc9' (2023-10-29)
• Updated input 'uninsane-dot-org':
    'git+https://git.uninsane.org/colin/uninsane?ref=refs/heads/master&rev=dea3e5cdd747ac321447ef00fa1e51423676aeda' (2023-10-08)
  → 'git+https://git.uninsane.org/colin/uninsane?ref=refs/heads/master&rev=2419750ca98fc04af42c91e50c49a29c68d465d2' (2023-10-30)
```
This commit is contained in:
Colin 2023-10-31 09:21:03 +00:00
parent 68de71084b
commit c5ad11a243
3 changed files with 20 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
flake.lock
View File

@ -36,11 +36,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1697929210,
"narHash": "sha256-RkQZif6QhswEwv7484mrKfIU8XmIWm+ED6llbr4IyxM=",
"lastModified": 1698544399,
"narHash": "sha256-vhRmPyEyoPkrXF2iykBsWHA05MIaOSmMRLMF7Hul6+s=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "fb000224952bf7749a9e8b3779104ef7ea4465c8",
"rev": "d87c5d8c41c9b3b39592563242f3a448b5cc4bc9",
"type": "github"
},
"original": {
@ -52,11 +52,11 @@
},
"nixpkgs-unpatched": {
"locked": {
"lastModified": 1698318101,
"narHash": "sha256-gUihHt3yPD7bVqg+k/UVHgngyaJ3DMEBchbymBMvK1E=",
"lastModified": 1698611440,
"narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "63678e9f3d3afecfeafa0acead6239cdb447574c",
"rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735",
"type": "github"
},
"original": {
@ -82,11 +82,11 @@
"nixpkgs-stable": "nixpkgs-stable"
},
"locked": {
"lastModified": 1698273636,
"narHash": "sha256-swsqg/ckSVJnravx7ie9NFQSKIH27owtlk0wh4+xStk=",
"lastModified": 1698548647,
"narHash": "sha256-7c03OjBGqnwDW0FBaBc+NjfEBxMkza+dxZGJPyIzfFE=",
"owner": "Mic92",
"repo": "sops-nix",
"rev": "014e44d334a39481223a5d163530d4c4ca2e75cb",
"rev": "632c3161a6cc24142c8e3f5529f5d81042571165",
"type": "github"
},
"original": {
@ -118,11 +118,11 @@
]
},
"locked": {
"lastModified": 1696795380,
"narHash": "sha256-NHWAUp7D66uPevRZ87f1VPvDZQinW113xMCDv8VzZVE=",
"lastModified": 1698634059,
"narHash": "sha256-+Oyv6vDyCtBzab/5cTG0nUrHD9gj7KgGfD4D1Rn4fCk=",
"ref": "refs/heads/master",
"rev": "dea3e5cdd747ac321447ef00fa1e51423676aeda",
"revCount": 209,
"rev": "2419750ca98fc04af42c91e50c49a29c68d465d2",
"revCount": 210,
"type": "git",
"url": "https://git.uninsane.org/colin/uninsane"
},

21
nixpatches/list.nix
View File

@ -23,27 +23,6 @@ let
// (if title != null then { name = title; } else {})
);
in [
# (fetchpatch' {
# # nope: something else broke mesa
# title = "mesa: 23.1.8 -> 23.1.9";
# nixpkgsCommit = "58fdb93d6f5fd794406ea5152a8641e7247b8242";
# revert = true;
# hash = "sha256-1Q31YZbQVC4KIRM7lYhEj50uBDpGM0SlWVCrIB5gGzQ=";
# })
# (fetchpatch' {
# # nope: something else broke prawcore
# title = "python311Packages.prawcore: 2.3.0 -> 2.4.0";
# prUrl = "https://github.com/NixOS/nixpkgs/pull/258535";
# revert = true;
# hash = "sha256-PdV6435gBoAifZplz4kZ/AsVsPk7RFhULZLHxU9Wgow=";
# })
(fetchpatch' {
# merged 2023/10/26; fixes servo build
title = "iproute2: stateless configuration";
prUrl = "https://github.com/NixOS/nixpkgs/pull/262767";
hash = "sha256-JdWl+tYn9Dwa4d59a8TURJvZdf02tmsnqcZD1WkkgqQ=";
})
(fetchpatch' {
title = "gsound: enable introspection/vala when cross compiled";
prUrl = "https://github.com/NixOS/nixpkgs/pull/263107";

11
pkgs/additional/fractal-nixified/default.nix
View File

@ -37,10 +37,13 @@
let mkConfigured = { optimize }:
let
# `optimize` option applies only to the top-level build; not fractal's dependencies.
# opt-level=0: builds in 1min, 105M binary
# opt-level=1: builds in 2.25hr, 75M binary
# opt-level=2: builds in 2.25hr
# opt-level=3: builds in 2.25hr, 68-70M binary
# as of 2023/10/29:
# - opt-level=0: builds in 1min, 105M binary
# - opt-level=1: builds in 2.25hr, 75M binary
# - opt-level=2: builds in 2.25hr
# - opt-level=3: builds in 2.25hr, 68-70M binary
# as of 2023/10/30:
# - opt-level=3: builds in 5min, 71M binary
optFlags = if optimize then "-C opt-level=3" else "-C opt-level=0";
cargoNix = import ./Cargo.nix {
inherit pkgs;