From fe8b10ec4fc8cde2035c05e06ac6080981ac40d7 Mon Sep 17 00:00:00 2001 From: Yusuf Bera Ertan Date: Sun, 1 Jan 2023 17:01:49 +0300 Subject: [PATCH] update stuff --- flake.lock | 171 +++++++++++++++++----------- flake.nix | 2 +- pkgs-set/overlays/prismlauncher.nix | 6 +- 3 files changed, 110 insertions(+), 69 deletions(-) diff --git a/flake.lock b/flake.lock index 8715fc5..77db446 100644 --- a/flake.lock +++ b/flake.lock @@ -111,11 +111,11 @@ "crane_2": { "flake": false, "locked": { - "lastModified": 1661875961, - "narHash": "sha256-f1h/2c6Teeu1ofAHWzrS8TwBPcnN+EEu+z1sRVmMQTk=", + "lastModified": 1670900067, + "narHash": "sha256-VXVa+KBfukhmWizaiGiHRVX/fuk66P8dgSFfkVN4/MY=", "owner": "ipetkov", "repo": "crane", - "rev": "d9f394e4e20e97c2a60c3ad82c2b6ef99be19e24", + "rev": "59b31b41a589c0a65e4a1f86b0e5eac68081468b", "type": "github" }, "original": { @@ -232,6 +232,7 @@ "nci", "devshell" ], + "flake-parts": "flake-parts_2", "flake-utils-pre-commit": [ "helix", "nci" @@ -248,6 +249,10 @@ "helix", "nci" ], + "nix-pypi-fetcher": [ + "helix", + "nci" + ], "nixpkgs": [ "helix", "nci", @@ -263,11 +268,11 @@ ] }, "locked": { - "lastModified": 1668851003, - "narHash": "sha256-X7RCQQynbxStZR2m7HW38r/msMQwVl3afD6UXOCtvx4=", + "lastModified": 1671323629, + "narHash": "sha256-9KHTPjIDjfnzZ4NjpE3gGIVHVHopy6weRDYO/7Y3hF8=", "owner": "nix-community", "repo": "dream2nix", - "rev": "c77e8379d8fe01213ba072e40946cbfb7b58e628", + "rev": "2d7d68505c8619410df2c6b6463985f97cbcba6e", "type": "github" }, "original": { @@ -325,11 +330,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1669643151, - "narHash": "sha256-39/l57QusriyNr426kXNqtub0ciZna+t20VKPYUAgsM=", + "lastModified": 1670426053, + "narHash": "sha256-OrFeZuwiiw+pIwhB+VaYzgUJu3CDaXkv0eYIXVDUnPs=", "owner": "elkowar", "repo": "eww", - "rev": "ec4c2d1a4f12e9c3664e9f53ad99007b4a10a16a", + "rev": "678e4dbc6b6439bf50898ae2b13fcc65900c439c", "type": "github" }, "original": { @@ -372,6 +377,24 @@ "type": "github" } }, + "flake-parts_2": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1668450977, + "narHash": "sha256-cfLhMhnvXn6x1vPm+Jow3RiFAUSCw/l1utktCw5rVA4=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "d591857e9d7dd9ddbfba0ea02b43b927c3c0f1fa", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1656928814, @@ -471,11 +494,11 @@ "rust-overlay": "rust-overlay_3" }, "locked": { - "lastModified": 1670336313, - "narHash": "sha256-aGJH6PQjMzDDzuBBHpTNIwp1NHYCWUpA00YcFbdoDow=", + "lastModified": 1672188940, + "narHash": "sha256-/YZd3qI7XCzB+09FjabAPA4zdJ1FgxDmP+9f3E9Xigk=", "owner": "helix-editor", "repo": "helix", - "rev": "af532147c97987d6170dc06a52aa3434ebf1b9d4", + "rev": "7ac72a39cbcaeda31c717418bde068f9bfc32d0e", "type": "github" }, "original": { @@ -492,11 +515,11 @@ "utils": "utils" }, "locked": { - "lastModified": 1670280307, - "narHash": "sha256-3x+0whP1nCz5adQMIsBA3L9fI/ABOpRUJdbw0AmxBnU=", + "lastModified": 1671966569, + "narHash": "sha256-jbLgfSnmLchARBNFRvCic63CFQ9LAyvlXnBpc2kwjQc=", "owner": "nix-community", "repo": "home-manager", - "rev": "2af0d07678fc15612345e0dd55337550dcf6465f", + "rev": "c55fa26ce05fee8e063db22918d05a73d430b2ea", "type": "github" }, "original": { @@ -516,11 +539,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1670358704, - "narHash": "sha256-zBClR9FjbV3So2xDoQci6aKjsnkFVtrD1Ipnd1dY1oo=", + "lastModified": 1672151321, + "narHash": "sha256-HB3UKHbhA914eqWbqFyNv48JBTuaELK8aWErRv6PEUU=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "993c382e74faddefeb62b3ab7a7281bd9a69990b", + "rev": "d64fc7d336a459f497df8f2e0aada989d4ed1e96", "type": "github" }, "original": { @@ -536,11 +559,11 @@ ] }, "locked": { - "lastModified": 1666104453, - "narHash": "sha256-gMH11FNZtnU7d+pIkwg9NmumJ6YvxyUP9Do43YKrd/E=", + "lastModified": 1672071700, + "narHash": "sha256-Z0pbBVtijv4xbL42rPzMoYFSOqALFRYDMN9iOumSEso=", "owner": "hyprwm", "repo": "contrib", - "rev": "5b21c74a3200ffdd48ed7764c7041d43c3cd5588", + "rev": "37c8121f98d76f57caa00dd7106877876e0d7483", "type": "github" }, "original": { @@ -552,11 +575,11 @@ "hyprland-protocols": { "flake": false, "locked": { - "lastModified": 1670258048, - "narHash": "sha256-Lm2sXnDVZNE+taHqsqVibvPmSdu65VHvXI507KVX4lg=", + "lastModified": 1670703428, + "narHash": "sha256-4KUW5SKR0Y9uaYGcYwy53YJ3B/sgiprCL4fRGO+mpOA=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "0dcff94fc10df2bbb66d3e1b5a1d6cfd3ada5515", + "rev": "d0d6db8cb5bef6d93ca3ad8fb2124964173396da", "type": "github" }, "original": { @@ -568,11 +591,11 @@ "hyprland-protocols_2": { "flake": false, "locked": { - "lastModified": 1670185345, - "narHash": "sha256-hxWGqlPecqEsE6nOHDV29KFBKePbY2Ipeac6lrChMKY=", + "lastModified": 1670703428, + "narHash": "sha256-4KUW5SKR0Y9uaYGcYwy53YJ3B/sgiprCL4fRGO+mpOA=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "4623a404c091e64743ba310199bb380ec52f1936", + "rev": "d0d6db8cb5bef6d93ca3ad8fb2124964173396da", "type": "github" }, "original": { @@ -619,11 +642,11 @@ ] }, "locked": { - "lastModified": 1669011203, - "narHash": "sha256-Lymj4HktNEFmVXtwI0Os7srDXHZbZW0Nzw3/+5Hf8ko=", + "lastModified": 1671430291, + "narHash": "sha256-UIc7H8F3N8rK72J/Vj5YJdV72tvDvYjH+UPsOFvlcsE=", "owner": "yusdacra", "repo": "nix-cargo-integration", - "rev": "c5133b91fc1d549087c91228bd213f2518728a4b", + "rev": "b1b0d38b8c3b0d0e6a38638d5bbe10b0bc67522c", "type": "github" }, "original": { @@ -641,11 +664,11 @@ "rust-overlay": "rust-overlay_4" }, "locked": { - "lastModified": 1670273694, - "narHash": "sha256-Rb+AIMyncKNnP0EahDg5w37v6TXlGtd2SczugSQzMQU=", + "lastModified": 1671916144, + "narHash": "sha256-TLcfy7T0Q2crxAp0jVXghJXGYzlBgjrZbOYIxGxAnN8=", "owner": "oxalica", "repo": "nil", - "rev": "101387fb2f54ebc67c894979d1ae0efac2b4ad5c", + "rev": "cac705a23380f7de79302c7d6850ddfdf29de70d", "type": "github" }, "original": { @@ -657,7 +680,7 @@ "nix-colors": { "inputs": { "base16-schemes": "base16-schemes", - "nixpkgs-lib": "nixpkgs-lib" + "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { "lastModified": 1670210028, @@ -680,11 +703,11 @@ ] }, "locked": { - "lastModified": 1666918008, - "narHash": "sha256-SqdXt8rPOj59mgIFwB+DvkzDbLWjrChw+UyVfMlS6Rg=", + "lastModified": 1671116920, + "narHash": "sha256-QmDGsUUmAGn77UTR7eQJmebl8f3IIUCtmbbAdJqKA3s=", "owner": "matthewcroughan", "repo": "nixinate", - "rev": "118c71c5111ab218d0cca3e4c77303797344b409", + "rev": "b4d17b8e2a4abc47e93e1a1c466e0286a63640d8", "type": "github" }, "original": { @@ -695,11 +718,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1670174919, - "narHash": "sha256-XdQr3BUnrvVLRFunLWrZORhwYHDG0+9jUUe0Jv1pths=", + "lastModified": 1671631481, + "narHash": "sha256-LP6NvQQNKdqDpXngECo6oCiWfYRb0KPGM5+D5lu7mPw=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "9d87bc030a0bf3f00e953dbf095a7d8e852dab6b", + "rev": "9577ab1eaf01a738b015a7a7ab2a4616e158b6cd", "type": "github" }, "original": { @@ -740,6 +763,24 @@ } }, "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1665349835, + "narHash": "sha256-UK4urM3iN80UXQ7EaOappDzcisYIuEURFRoGQ/yPkug=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "34c5293a71ffdb2fe054eb5288adc1882c1eb0b1", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs-lib_2": { "locked": { "lastModified": 1655599917, "narHash": "sha256-kjZbt5WdTrnjMxL79okg9TCoRUdADG50x/TWozbyTsE=", @@ -757,11 +798,11 @@ "nixpkgs-wayland": { "flake": false, "locked": { - "lastModified": 1670350038, - "narHash": "sha256-3iFzmg3nh83lV++6jNKLzz/wXIrRfx+h2JVRsw0viKM=", + "lastModified": 1672153978, + "narHash": "sha256-rFiIzQeL9HxvJs6gYJBl17SiPh7NMJhgPZuHX6jKmLE=", "owner": "nix-community", "repo": "nixpkgs-wayland", - "rev": "7a9e28e2fb249bc6ff31b668ccd3b005e5157aaa", + "rev": "7c3f4a240652974c38060db8b502b543b90cf734", "type": "github" }, "original": { @@ -788,11 +829,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1668905981, - "narHash": "sha256-RBQa/+9Uk1eFTqIOXBSBezlEbA3v5OkgP+qptQs1OxY=", + "lastModified": 1671359686, + "narHash": "sha256-3MpC6yZo+Xn9cPordGz2/ii6IJpP2n8LE8e/ebUXLrs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "690ffff026b4e635b46f69002c0f4e81c65dfc2e", + "rev": "04f574a1c0fde90b51bf68198e2297ca4e7cccf4", "type": "github" }, "original": { @@ -804,27 +845,27 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1669411043, - "narHash": "sha256-LfPd3+EY+jaIHTRIEOUtHXuanxm59YKgUacmSzaqMLc=", + "lastModified": 1671983799, + "narHash": "sha256-Z2Ro6hFPZHkBqkVXY5/aBUzxi5xizQGvuHQ9+T5B/ks=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5dc7114b7b256d217fe7752f1614be2514e61bb8", + "rev": "fad51abd42ca17a60fc1d4cb9382e2d79ae31836", "type": "github" }, "original": { "owner": "nixos", + "ref": "nixos-unstable", "repo": "nixpkgs", - "rev": "5dc7114b7b256d217fe7752f1614be2514e61bb8", "type": "github" } }, "nur": { "locked": { - "lastModified": 1670315682, - "narHash": "sha256-/v0RgZZIjvsFuJbJLUlzRbzSlYFXq3olgJTuJBNtcoY=", + "lastModified": 1672202773, + "narHash": "sha256-S/AoF4lM7p5NR6p5EOdzQjcnj5bQC6SYsnMjbrkspKM=", "owner": "nix-community", "repo": "NUR", - "rev": "af814db16c89385c65e758608296440555f61ccc", + "rev": "db78e77d8a1412a8f65ef29ba56f6bfc7adcc14a", "type": "github" }, "original": { @@ -900,11 +941,11 @@ ] }, "locked": { - "lastModified": 1668998422, - "narHash": "sha256-G/BklIplCHZEeDIabaaxqgITdIXtMolRGlwxn9jG2/Q=", + "lastModified": 1671416426, + "narHash": "sha256-kpSH1Jrxfk2qd0pRPJn1eQdIOseGv5JuE+YaOrqU9s4=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "68ab029c93f8f8eed4cf3ce9a89a9fd4504b2d6e", + "rev": "fbaaff24f375ac25ec64268b0a0d63f91e474b7d", "type": "github" }, "original": { @@ -925,11 +966,11 @@ ] }, "locked": { - "lastModified": 1669775522, - "narHash": "sha256-6xxGArBqssX38DdHpDoPcPvB/e79uXyQBwpBcaO/BwY=", + "lastModified": 1670552927, + "narHash": "sha256-lCE51eAGrAFS4k9W5aDGFpVtOAwQQ/rFMN80PCDh0vo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "3158e47f6b85a288d12948aeb9a048e0ed4434d6", + "rev": "a0fdafd18c9cf599fde17fbaf07dbb20fa57eecb", "type": "github" }, "original": { @@ -974,11 +1015,11 @@ "flake": false, "locked": { "host": "gitlab.freedesktop.org", - "lastModified": 1669925104, - "narHash": "sha256-xMHfW+/G9MieN/5tXHUA5/ztE8dkE093cNFTEUgcwxI=", + "lastModified": 1671723353, + "narHash": "sha256-G1jiI0SA7eiZusO+iJytErMRNbKbwqJJJGL+sNoBNoQ=", "owner": "wlroots", "repo": "wlroots", - "rev": "c8eb24d30e18c165728b8788a10716611c3b633d", + "rev": "b28a9afd4b0b86e9a66a40f6b44b69f59947b7d6", "type": "gitlab" }, "original": { @@ -997,11 +1038,11 @@ ] }, "locked": { - "lastModified": 1670202338, - "narHash": "sha256-StTfshdAoSxO+t0wRbq1I3YESLFIQWFjGJse5ICV8rk=", + "lastModified": 1671837878, + "narHash": "sha256-OmFDyktTc/l+3wHboHeFpAQgPt3r7jjqZf8MrwuUGMo=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "af840a9e0947a79a37a95a9f62062653721e43fa", + "rev": "e47f4cec698080768821b271510985ab94a37e91", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0a68ecd..3dbc6ce 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "config!!!"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs/5dc7114b7b256d217fe7752f1614be2514e61bb8"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nur.url = "github:nix-community/NUR"; home.url = "github:nix-community/home-manager/master"; diff --git a/pkgs-set/overlays/prismlauncher.nix b/pkgs-set/overlays/prismlauncher.nix index 8acd65b..706d65f 100644 --- a/pkgs-set/overlays/prismlauncher.nix +++ b/pkgs-set/overlays/prismlauncher.nix @@ -1,5 +1,5 @@ {inputs}: final: prev: { - prismlauncher = prev.prismlauncher.overrideAttrs (old: { - patches = [((toString inputs.self) + "/pkgs-set/patches/prismlauncher-offline.patch")]; - }); + # prismlauncher = prev.prismlauncher.overrideAttrs (old: { + # patches = [((toString inputs.self) + "/pkgs-set/patches/prismlauncher-offline.patch")]; + # }); }